46347 2010-09-23 06:37:51 -0700 [Qt] Remove setDeviceSize methods 2010-10-06 07:38:24 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P3 Major --- 31552 1 kenneth webkit-unassigned ademar hausmann kling oldest_to_newest 283601 0 kenneth 2010-09-23 06:37:51 -0700 These methods are not in 2.0 and we do not want them in 2.1. Instead the viewport meta tag stuff should use QDesktopServices to get the device size. device-width is the width of the device when in portrait and the device-height is the width of the device when in landscape. It would be nice to have some environment variables to overwrite the values when testing mobile browsers on the desktop. 283610 1 kenneth 2010-09-23 06:55:11 -0700 QDesktopWidget should have what we need. We just need to make sure that the geometry gives the actual screen geometry and doesn't subtract things like the cellphone status area. 285550 2 68928 kenneth 2010-09-27 10:39:39 -0700 Created attachment 68928 Patch 285948 3 kenneth 2010-09-27 17:31:26 -0700 Fixed (after conversation on irc) version landed in r68457 289559 4 hausmann 2010-10-05 06:29:16 -0700 <cherry-pick-for-backport: r68457> 289560 5 hausmann 2010-10-05 06:29:33 -0700 <cherry-pick-for-backport: r69104> 290288 6 ademar 2010-10-06 07:38:11 -0700 Revision r68457 cherry-picked into qtwebkit-2.1 with commit b2d63cf <http://gitorious.org/webkit/qtwebkit/commit/b2d63cf> Revision r69104 cherry-picked into qtwebkit-2.1 with commit 69b269b <http://gitorious.org/webkit/qtwebkit/commit/69b269b> 68928 2010-09-27 10:39:39 -0700 2010-09-27 15:36:53 -0700 Patch 0001-Qt-Remove-setDeviceSize-methods.patch text/plain 9084 kenneth RnJvbSA4NTIxODZjYTU1YTJjZjk4OTJhOTkzNDVkYjZkZTRjYWNjZWIyM2M5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aC5j aHJpc3RpYW5zZW5Ab3BlbmJvc3NhLm9yZz4KRGF0ZTogTW9uLCAyNyBTZXAgMjAxMCAxNDozODox NCAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVtb3ZlIHNldERldmljZVNpemUgbWV0aG9k cwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MzQ3CgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KClJlbW92ZSBvdXIgc2V0RGV2aWNlSGVpZ2h0KCkgQVBJIGFu ZCBvYnRhaW4gaXQgYXV0b21hdGljYWxseSBmcm9tIHRoZQpzeXN0ZW0uIEFsc28gZm9yIHRlc3Rp bmcgcHVycG9zZXMsIG1ha2UgaXQgcG9zc2libGUgdG8gb3ZlcnJpZGUgdGhlCnZhbHVlcyB2aWEg dHdvIG5ld2x5IGludHJvZHVjZWQgZW52aXJvbm1lbnQgdmFyaWFibGVzLgoKKiBBcGkvcWdyYXBo aWNzd2Vidmlldy5jcHA6CiogQXBpL3FncmFwaGljc3dlYnZpZXcuaDoKKiBBcGkvcXdlYnBhZ2Uu Y3BwOgooZ2V0aW50ZW52KToKKHF1ZXJ5RGV2aWNlU2l6ZUZvclNjcmVlbkNvbnRhaW5pbmdXaWRn ZXQpOgooUVdlYlBhZ2U6OnZpZXdwb3J0Q29uZmlndXJhdGlvbkZvclNpemUpOgoqIFdlYkNvcmVT dXBwb3J0L1BhZ2VDbGllbnRRdC5jcHA6CihXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lk Z2V0Ojp3aW5kb3dSZWN0KToKKiBzeW1iaWFuL2VhYmkvUXRXZWJLaXR1LmRlZjoKLS0tCiBXZWJL aXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwICAgICAgICB8ICAgMTkgLS0tLS0tLS0tLQog V2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmggICAgICAgICAgfCAgICA0IC0tCiBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICB8ICAgNTUgKysrKysrKysrKysr KysrKysrKysrKysrKystLS0KIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgIHwgICAyMSArKysrKysrKysrKwogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGll bnRRdC5jcHAgfCAgICAzIC0tCiBXZWJLaXQvcXQvc3ltYmlhbi9lYWJpL1F0V2ViS2l0dS5kZWYg ICAgICB8ICAgIDIgLQogNiBmaWxlcyBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCAzMyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3Bw IGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCA3ZjY2ZDk4Li4zODM2 ZTM0IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTc1LDcgKzc1LDYgQEAgcHVi bGljOgogICAgIFFHcmFwaGljc1dlYlZpZXcqIHE7CiAgICAgUVdlYlBhZ2UqIHBhZ2U7CiAgICAg Ym9vbCByZXNpemVzVG9Db250ZW50czsKLSAgICBRU2l6ZSBkZXZpY2VTaXplOwogCiAgICAgLy8g SnVzdCBhIGNvbnZlbmllbmNlIHRvIGF2b2lkIHVzaW5nIHBhZ2UtPmNsaWVudC0+b3ZlcmxheSBh bHdheXMKICAgICBRU2hhcmVkUG9pbnRlcjxRR3JhcGhpY3NJdGVtT3ZlcmxheT4gb3ZlcmxheTsK QEAgLTU1NSwyNCArNTU0LDYgQEAgUUljb24gUUdyYXBoaWNzV2ViVmlldzo6aWNvbigpIGNvbnN0 CiB9CiAKIC8qIQotICAgIFxwcm9wZXJ0eSBRR3JhcGhpY3NXZWJWaWV3OjpkZXZpY2VTaXplCi0g ICAgXGJyaWVmIHRoZSBzaXplIG9mIHRoZSBkZXZpY2UgdXNpbmcgdGhlIHdlYiB2aWV3Ci0KLSAg ICBUaGUgZGV2aWNlIHNpemUgaXMgdXNlZCBieSB0aGUgRE9NIHdpbmRvdyBvYmplY3QgbWV0aG9k cwotICAgIG90aGVySGVpZ2h0KCksIG90aGVyV2lkdGgoKSBhcyB3ZWxsIGFzIGEgcGFnZSBmb3Ig dGhlIHZpZXdwb3J0Ci0gICAgbWV0YSB0YWcgYXR0cmlidXRlcyBkZXZpY2Utd2lkdGggYW5kIGRl dmljZS1oZWlnaHQuCi0qLwotdm9pZCBRR3JhcGhpY3NXZWJWaWV3OjpzZXREZXZpY2VTaXplKGNv bnN0IFFTaXplJiBzaXplKQotewotICAgIGQtPmRldmljZVNpemUgPSBzaXplOwotfQotCi1RU2l6 ZSBRR3JhcGhpY3NXZWJWaWV3OjpkZXZpY2VTaXplKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZC0+ ZGV2aWNlU2l6ZTsKLX0KLQotLyohCiAgICAgXHByb3BlcnR5IFFHcmFwaGljc1dlYlZpZXc6Onpv b21GYWN0b3IKICAgICBcYnJpZWYgdGhlIHpvb20gZmFjdG9yIGZvciB0aGUgdmlldwogKi8KZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oIGIvV2ViS2l0L3F0L0Fw aS9xZ3JhcGhpY3N3ZWJ2aWV3LmgKaW5kZXggNzdmMDM1OS4uODYyMGFjNSAxMDA2NDQKLS0tIGEv V2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xZ3Jh cGhpY3N3ZWJ2aWV3LmgKQEAgLTQxLDcgKzQxLDYgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUUdy YXBoaWNzV2ViVmlldyA6IHB1YmxpYyBRR3JhcGhpY3NXaWRnZXQgewogICAgIFFfUFJPUEVSVFko UVN0cmluZyB0aXRsZSBSRUFEIHRpdGxlIE5PVElGWSB0aXRsZUNoYW5nZWQpCiAgICAgUV9QUk9Q RVJUWShRSWNvbiBpY29uIFJFQUQgaWNvbiBOT1RJRlkgaWNvbkNoYW5nZWQpCiAgICAgUV9QUk9Q RVJUWShxcmVhbCB6b29tRmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklURSBzZXRab29tRmFjdG9y KQotICAgIFFfUFJPUEVSVFkoUVNpemUgZGV2aWNlU2l6ZSBSRUFEIGRldmljZVNpemUgV1JJVEUg c2V0RGV2aWNlU2l6ZSkKIAogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwgUkVBRCB1cmwgV1JJVEUg c2V0VXJsIE5PVElGWSB1cmxDaGFuZ2VkKQogCkBAIC02NSw5ICs2NCw2IEBAIHB1YmxpYzoKICAg ICBxcmVhbCB6b29tRmFjdG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRab29tRmFjdG9yKHFyZWFs KTsKIAotICAgIFFTaXplIGRldmljZVNpemUoKSBjb25zdDsKLSAgICB2b2lkIHNldERldmljZVNp emUoY29uc3QgUVNpemUmKTsKLQogICAgIGJvb2wgaXNNb2RpZmllZCgpIGNvbnN0OwogCiAgICAg dm9pZCBsb2FkKGNvbnN0IFFVcmwmIHVybCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3 ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IDU3MzUwMGUuLjhj MGU2ZTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJxd2VicGFnZS5oIgorCiAjaW5jbHVkZSAicXdlYnZpZXcuaCIKICNp bmNsdWRlICJxd2ViZnJhbWUuaCIKICNpbmNsdWRlICJxd2VicGFnZV9wLmgiCkBAIC05NCw2ICs5 NSw3IEBACiAjaW5jbHVkZSA8UUJhc2ljVGltZXI+CiAjaW5jbHVkZSA8UUJpdEFycmF5PgogI2lu Y2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRlIDxRRGVza3RvcFdpZGdldD4KICNpbmNsdWRlIDxRRHJh Z0VudGVyRXZlbnQ+CiAjaW5jbHVkZSA8UURyYWdMZWF2ZUV2ZW50PgogI2luY2x1ZGUgPFFEcmFn TW92ZUV2ZW50PgpAQCAtMjMzOCwxOSArMjM0MCw2MiBAQCB2b2lkIFFXZWJQYWdlOjpzZXRWaWV3 cG9ydFNpemUoY29uc3QgUVNpemUgJnNpemUpIGNvbnN0CiAgICAgfQogfQogCitzdGF0aWMgaW50 IGdldGludGVudihjb25zdCBjaGFyKiB2YXJpYWJsZSkKK3sKKyAgICBib29sIG9rOworICAgIGlu dCB2YWx1ZSA9IHFnZXRlbnYodmFyaWFibGUpLnRvSW50KCZvayk7CisgICAgcmV0dXJuIChvaykg PyB2YWx1ZSA6IC0xOworfQorCitzdGF0aWMgUVNpemUgcXVlcnlEZXZpY2VTaXplRm9yU2NyZWVu Q29udGFpbmluZ1dpZGdldChjb25zdCBRV2lkZ2V0KiB3aWRnZXQpCit7CisgICAgUURlc2t0b3BX aWRnZXQqIGRlc2t0b3AgPSBRQXBwbGljYXRpb246OmRlc2t0b3AoKTsKKyAgICBpZiAoIWRlc2t0 b3ApCisgICAgICAgIHJldHVybiBRU2l6ZSgpOworCisgICAgLy8gUmV0dXJucyB0aGUgYXZhaWxh YmxlIGdlb21ldHJ5IG9mIHRoZSBzY3JlZW4gd2hpY2ggY29udGFpbnMgd2lkZ2V0LgorICAgIC8v IE5PVEU6IHRoaXMgbXVzdCBiZSB0aGUgdGhlIGZ1bGwgc2NyZWVuIHNpemUgaW5jbHVkaW5nIGFu eSBmaXhlZCBzdGF0dXMgYXJlYXMgZXRjLgorICAgIFFTaXplIHNpemUgPSBkZXNrdG9wLT5hdmFp bGFibGVHZW9tZXRyeSh3aWRnZXQpLnNpemUoKTsKKworICAgIC8vIFRoaXMgbXVzdCBiZSBpbiBw b3J0cmFpdCBtb2RlLCBhZGp1c3QgaWYgbm90LgorICAgIGlmIChzaXplLndpZHRoKCkgPiBzaXpl LmhlaWdodCgpKSB7CisgICAgICAgIGludCB3aWR0aCA9IHNpemUud2lkdGgoKTsKKyAgICAgICAg c2l6ZS5zZXRXaWR0aChzaXplLmhlaWdodCgpKTsKKyAgICAgICAgc2l6ZS5zZXRIZWlnaHQod2lk dGgpOworICAgIH0KKworICAgIHJldHVybiBzaXplOworfQorCisvKiEKKyAgICBDb21wdXRlcyB0 aGUgb3B0aW1hbCB2aWV3cG9ydCBjb25maWd1cmF0aW9uIGdpdmVuIHRoZSBcYSBhdmFpbGFibGVT aXplLCB3aGVuCisgICAgdXNlciBpbnRlcmZhY2UgY29tcG9uZW50cyBhcmUgZGlzcmVnYXJkZWQu CisKKyAgICBUaGUgY29uZmlndXJhdGlvbiBpcyBhbHNvIGRlcGVuZGVudCBvbiB0aGUgZGV2aWNl IHNjcmVlbiBzaXplIHdoaWNoIGlzIG9idGFpbmVkCisgICAgYXV0b21hdGljYWxseS4gRm9yIHRl c3RpbmcgcHVycG9zZXMgdGhlIHNpemUgY2FuIGJlIG92ZXJyaWRkZW4gYnkgc2V0dGluZyB0d28K KyAgICBlbnZpcm9ubWVudCB2YXJpYWJsZXMgUVRXRUJLSVRfREVWSUNFX1dJRFRIIGFuZCBRVFdF QktJVF9ERVZJQ0VfSEVJR0hULCB3aGljaAorICAgIGJvdGggbmVlZHMgdG8gYmUgc2V0LgorKi8K KwogUVdlYlBhZ2U6OlZpZXdwb3J0Q29uZmlndXJhdGlvbiBRV2ViUGFnZTo6dmlld3BvcnRDb25m aWd1cmF0aW9uRm9yU2l6ZShRU2l6ZSBhdmFpbGFibGVTaXplKSBjb25zdAogewogICAgIHN0YXRp YyBpbnQgZGVza3RvcFdpZHRoID0gOTgwOwogICAgIHN0YXRpYyBpbnQgZGV2aWNlRFBJID0gMTYw OwogCi0gICAgRmxvYXRSZWN0IHJlY3QgPSBkLT5wYWdlLT5jaHJvbWUoKS0+d2luZG93UmVjdCgp OworICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvbiByZXN1bHQ7CiAKLSAgICBpbnQgZGV2aWNlV2lk dGggPSByZWN0LndpZHRoKCk7Ci0gICAgaW50IGRldmljZUhlaWdodCA9IHJlY3QuaGVpZ2h0KCk7 CisgICAgaW50IGRldmljZVdpZHRoID0gZ2V0aW50ZW52KCJRVFdFQktJVF9ERVZJQ0VfV0lEVEgi KTsKKyAgICBpbnQgZGV2aWNlSGVpZ2h0ID0gZ2V0aW50ZW52KCJRVFdFQktJVF9ERVZJQ0VfSEVJ R0hUIik7CiAKLSAgICBXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24gY29uZiA9IFdlYkNv cmU6OmZpbmRDb25maWd1cmF0aW9uRm9yVmlld3BvcnREYXRhKG1haW5GcmFtZSgpLT5kLT52aWV3 cG9ydEFyZ3VtZW50cygpLCBkZXNrdG9wV2lkdGgsIGRldmljZVdpZHRoLCBkZXZpY2VIZWlnaHQs IGRldmljZURQSSwgYXZhaWxhYmxlU2l6ZSk7CisgICAgLy8gQm90aCBlbnZpcm9ubWVudCB2YXJp YWJsZXMgbmVlZCB0byBiZSBzZXQgLSBvciB0aGV5IHdpbGwgYmUgaWdub3JlZC4KKyAgICBpZiAo ZGV2aWNlV2lkdGggPCAwICYmIGRldmljZUhlaWdodCA8IDApIHsKKyAgICAgICAgUVNpemUgc2l6 ZSA9IHF1ZXJ5RGV2aWNlU2l6ZUZvclNjcmVlbkNvbnRhaW5pbmdXaWRnZXQoKGQtPmNsaWVudCkg PyBkLT5jbGllbnQtPm93bmVyV2lkZ2V0KCkgOiAwKTsKKyAgICAgICAgZGV2aWNlV2lkdGggPSBz aXplLndpZHRoKCk7CisgICAgICAgIGRldmljZUhlaWdodCA9IHNpemUuaGVpZ2h0KCk7CisgICAg fQogCi0gICAgVmlld3BvcnRDb25maWd1cmF0aW9uIHJlc3VsdDsKKyAgICBXZWJDb3JlOjpWaWV3 cG9ydENvbmZpZ3VyYXRpb24gY29uZiA9IFdlYkNvcmU6OmZpbmRDb25maWd1cmF0aW9uRm9yVmll d3BvcnREYXRhKG1haW5GcmFtZSgpLT5kLT52aWV3cG9ydEFyZ3VtZW50cygpLAorICAgICAgICAg ICAgZGVza3RvcFdpZHRoLCBkZXZpY2VXaWR0aCwgZGV2aWNlSGVpZ2h0LCBkZXZpY2VEUEksIGF2 YWlsYWJsZVNpemUpOwogCiAgICAgcmVzdWx0Lm1faXNWYWxpZCA9IHRydWU7CiAgICAgcmVzdWx0 Lm1fc2l6ZSA9IGNvbmYubGF5b3V0Vmlld3BvcnQ7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hh bmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAxYjJjNzgxLi5lNzIwMmU0IDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNCBAQAorMjAxMC0wOS0yNyAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxr ZW5uZXRoLmNocmlzdGlhbnNlbkBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVtb3ZlIHNldERldmljZVNpemUgbWV0 aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYz NDcKKworICAgICAgICBSZW1vdmUgb3VyIHNldERldmljZUhlaWdodCgpIEFQSSBhbmQgb2J0YWlu IGl0IGF1dG9tYXRpY2FsbHkgZnJvbSB0aGUKKyAgICAgICAgc3lzdGVtLiBBbHNvIGZvciB0ZXN0 aW5nIHB1cnBvc2VzLCBtYWtlIGl0IHBvc3NpYmxlIHRvIG92ZXJyaWRlIHRoZQorICAgICAgICB2 YWx1ZXMgdmlhIHR3byBuZXdseSBpbnRyb2R1Y2VkIGVudmlyb25tZW50IHZhcmlhYmxlcy4KKwor ICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBBcGkvcWdyYXBo aWNzd2Vidmlldy5oOgorICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChnZXRp bnRlbnYpOgorICAgICAgICAocXVlcnlEZXZpY2VTaXplRm9yU2NyZWVuQ29udGFpbmluZ1dpZGdl dCk6CisgICAgICAgIChRV2ViUGFnZTo6dmlld3BvcnRDb25maWd1cmF0aW9uRm9yU2l6ZSk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6OndpbmRvd1JlY3QpOgorICAgICAgICAqIHN5 bWJpYW4vZWFiaS9RdFdlYktpdHUuZGVmOgorCiAyMDEwLTA5LTI3ICBCZW5qYW1pbiBQb3VsYWlu ICA8YmVuamFtaW4ucG91bGFpbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5k cmVhcyBLbGluZy4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xp ZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHAKaW5k ZXggNjJmNDhmZi4uODNmMGY0OCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L1BhZ2VDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGll bnRRdC5jcHAKQEAgLTMxOCw5ICszMTgsNiBAQCBRU3R5bGUqIFBhZ2VDbGllbnRRR3JhcGhpY3NX aWRnZXQ6OnN0eWxlKCkgY29uc3QKIAogUVJlY3RGIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OndpbmRvd1JlY3QoKSBjb25zdAogewotICAgIGlmICghdmlldy0+ZGV2aWNlU2l6ZSgpLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIFFSZWN0RihRUmVjdChRUG9pbnQoMCwgMCksIHZpZXctPmRl dmljZVNpemUoKSkpOwotCiAgICAgaWYgKCF2aWV3LT5zY2VuZSgpKQogICAgICAgICByZXR1cm4g UVJlY3RGKCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9zeW1iaWFuL2VhYmkvUXRXZWJLaXR1 LmRlZiBiL1dlYktpdC9xdC9zeW1iaWFuL2VhYmkvUXRXZWJLaXR1LmRlZgppbmRleCA4MjkxMTk3 Li4yYjkxN2UxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvc3ltYmlhbi9lYWJpL1F0V2ViS2l0dS5k ZWYKKysrIGIvV2ViS2l0L3F0L3N5bWJpYW4vZWFiaS9RdFdlYktpdHUuZGVmCkBAIC03OTksNyAr Nzk5LDYgQEAgRVhQT1JUUwogCV9aTjhRV2ViUGFnZTIzYWxsb3dHZW9sb2NhdGlvblJlcXVlc3RF UDlRV2ViRnJhbWUgQCA3OTggTk9OQU1FCiAJX1pOOFFXZWJQYWdlMjN2aWV3cG9ydENoYW5nZVJl cXVlc3RlZEVSS05TXzEzVmlld3BvcnRIaW50c0UgQCA3OTkgTk9OQU1FIEFCU0VOVAogCV9aTksx NVFXZWJTY3JpcHRXb3JsZDV3b3JsZEV2IEAgODAwIE5PTkFNRQotCV9aTjE2UUdyYXBoaWNzV2Vi VmlldzEzc2V0RGV2aWNlU2l6ZUVSSzVRU2l6ZSBAIDgwMSBOT05BTUUKIAlfWk4yM0R1bXBSZW5k ZXJUcmVlU3VwcG9ydFF0MTJwYWdlUHJvcGVydHlFUDlRV2ViRnJhbWVSSzdRU3RyaW5naSBAIDgw MiBOT05BTUUKIAlfWk4yM0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0MTZpc1BhZ2VCb3hWaXNpYmxl RVA5UVdlYkZyYW1laSBAIDgwMyBOT05BTUUKIAlfWk4yM0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0 MTZyZXN1bWVBbmltYXRpb25zRVA5UVdlYkZyYW1lIEAgODA0IE5PTkFNRQpAQCAtODExLDcgKzgx MCw2IEBAIEVYUE9SVFMKIAlfWk44UVdlYlBhZ2UyM2NoZWNrUGVybWlzc2lvbkZyb21Vc2VyRVA5 UVdlYkZyYW1lTlNfMTZQZXJtaXNzaW9uRG9tYWluRVJOU18xNlBlcm1pc3Npb25Qb2xpY3lFIEAg ODEwIE5PTkFNRQogCV9aTjhRV2ViUGFnZTI1cmVxdWVzdFBlcm1pc3Npb25Gcm9tVXNlckVQOVFX ZWJGcmFtZU5TXzE2UGVybWlzc2lvbkRvbWFpbkUgQCA4MTEgTk9OQU1FCiAJX1pOOFFXZWJQYWdl MjdjYW5jZWxSZXF1ZXN0c0ZvclBlcm1pc3Npb25FUDlRV2ViRnJhbWVOU18xNlBlcm1pc3Npb25E b21haW5FIEAgODEyIE5PTkFNRQotCV9aTksxNlFHcmFwaGljc1dlYlZpZXcxMGRldmljZVNpemVF diBAIDgxMyBOT05BTUUKIAlfWk4yM0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0MTR2aWV3cG9ydEFz VGV4dEVQOFFXZWJQYWdlUks1UVNpemUgQCA4MTQgTk9OQU1FCiAJX1pOMjNEdW1wUmVuZGVyVHJl ZVN1cHBvcnRRdDMyc2ltdWxhdGVEZXNrdG9wTm90aWZpY2F0aW9uQ2xpY2tFUks3UVN0cmluZyBA IDgxNSBOT05BTUUKIAlfWk44UVdlYlBhZ2UyM3ZpZXdwb3J0Q2hhbmdlUmVxdWVzdGVkRXYgQCA4 MTYgTk9OQU1FCi0tIAoxLjcuMQoK