104416 2012-12-07 16:34:02 -0800 [Qt][EFL][WK2] Resizing the window doesn't always result in right content position 2012-12-11 06:12:54 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103105 1 kenneth kenneth dongseong.hwang joone lucas.de.marchi noam yael oldest_to_newest 786287 0 kenneth 2012-12-07 16:34:02 -0800 Load the fixed-position manual test. Scroll to the bottom. When I resize the window it doesn't set the right position and sometimes we even get position out of bounds (like use the fixed element test and scroll to bottom and then resize). 786627 1 yael 2012-12-08 14:34:01 -0800 Adding Qt to the title. I see the same problem in Qt's MiniBrowser. 786920 2 yael 2012-12-09 18:13:21 -0800 Swapping the order of translate and scale in EwkViewImpl::transformFromScene, EwkViewImpl::displayTimerFired and not scaling EwkViewImpl::m_pagePosition in PageViewportControllerClientEfl::setViewportPosition is fixing the issue for EFL. The order of translate and scale was swapped in r136000. I will upload a proper patch tomorrow, after better understanding the implications of this swap. 787227 3 yael 2012-12-10 05:50:27 -0800 Resetting assignee. Kenneth is working on this. 787387 4 178565 kenneth 2012-12-10 08:59:05 -0800 Created attachment 178565 Patch This fixes it, but it would be nice to have it tested with Qt to make sure it doesn't affect pinch zooming etc. 787866 5 dongseong.hwang 2012-12-10 17:12:45 -0800 Great! Qt runs well with this patch. I tested in your scrolling test: http://www.dorothybrowser.com/test/webkitTest/css3/fixedelement.html However, I can not test pinch zoom. I just resized qt window. 788297 6 178771 kenneth 2012-12-11 04:03:51 -0800 Created attachment 178771 Patch 788381 7 kenneth 2012-12-11 06:12:54 -0800 Landed in 137304 178565 2012-12-10 08:59:05 -0800 2012-12-11 04:03:45 -0800 Patch wip-patch.diff text/plain 4732 kenneth ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVy LmNwcAppbmRleCAwNGIzYjlhLi4zNmUyMzVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCkBAIC00OCw4ICs0OCw4IEBAIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQ YWdlUHJveHkqIHByb3h5LCBQYWdlCiAgICAgLCBtX2hhc1N1c3BlbmRlZENvbnRlbnQoZmFsc2Up CiAgICAgLCBtX2hhZFVzZXJJbnRlcmFjdGlvbihmYWxzZSkKICAgICAsIG1fZWZmZWN0aXZlU2Nh bGUoMSkKLSAgICAsIG1fY29udGVudHNQb3NpdGlvbklzTG9ja2VkKGZhbHNlKQotICAgICwgbV9l ZmZlY3RpdmVTY2FsZUlzTG9ja2VkKGZhbHNlKQorICAgICwgbV9wZW5kaW5nUG9zaXRpb25DaGFu Z2UoZmFsc2UpCisgICAgLCBtX3BlbmRpbmdTY2FsZUNoYW5nZShmYWxzZSkKIHsKICAgICAvLyBJ bml0aWFsaXppbmcgVmlld3BvcnQgUmF3IEF0dHJpYnV0ZXMgdG8gYXZvaWQgcmFuZG9tIG5lZ2F0 aXZlIG9yIGluZmluaXR5IHNjYWxlIGZhY3RvcnMKICAgICAvLyBpZiB0aGVyZSBpcyBhIHJhY2Ug Y29uZGl0aW9uIGJldHdlZW4gdGhlIGZpcnN0IGxheW91dCBhbmQgc2V0dGluZyB0aGUgdmlld3Bv cnQgYXR0cmlidXRlcyBmb3IgdGhlIGZpcnN0IHRpbWUuCkBAIC0xODMsMTcgKzE4MywyMyBAQCB2 b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZFJlbmRlckZyYW1lKGNvbnN0IEludFNpemUm IGNvbnRlbnRzU2l6ZSwgY29uc3QgSQogICAgIC8vIEFsbCBwb3NpdGlvbiBhbmQgc2NhbGUgY2hh bmdlcyByZXN1bHRpbmcgZnJvbSBhIHdlYiBwcm9jZXNzIGV2ZW50IHNob3VsZAogICAgIC8vIGdv IHRocm91Z2ggaGVyZSB0byBiZSBhcHBsaWVkIG9uIHRoZSB2aWV3cG9ydCB0byBhdm9pZCBzaG93 aW5nIGluY29tcGxldGUKICAgICAvLyB0aWxlcyB0byB0aGUgdXNlciBkdXJpbmcgYSBmZXcgbWls bGlzZWNvbmRzLgotICAgIGlmIChtX2VmZmVjdGl2ZVNjYWxlSXNMb2NrZWQpIHsKKworICAgIGlm IChtX3BlbmRpbmdTY2FsZUNoYW5nZSkgeworICAgICAgICBtX3BlbmRpbmdTY2FsZUNoYW5nZSA9 IGZhbHNlOwogICAgICAgICBtX2NsaWVudC0+c2V0Q29udGVudHNTY2FsZShtX2VmZmVjdGl2ZVNj YWxlLCBmYWxzZSk7Ci0gICAgICAgIG1fZWZmZWN0aXZlU2NhbGVJc0xvY2tlZCA9IGZhbHNlOwor CisgICAgICAgIC8vIFRoZSBzY2FsZSBjaGFuZ2VkLCB3ZSBoYXZlIHRvIHJlLXBpeGVsIGFsaWdu LgorICAgICAgICBtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSA9IHRydWU7CisgICAgICAgIEZsb2F0 UG9pbnQgY3VycmVudERpc2NyZXRlUG9zID0gcm91bmRlZEludFBvaW50KG1fY29udGVudHNQb3Np dGlvbik7CisgICAgICAgIEZsb2F0UG9pbnQgcGl4ZWxBbGlnbmVkUG9zID0gcGl4ZWxBbGlnbmVk RmxvYXRQb2ludChjdXJyZW50RGlzY3JldGVQb3MpOworICAgICAgICBtX2NvbnRlbnRzUG9zaXRp b24gPSBib3VuZENvbnRlbnRzUG9zaXRpb24ocGl4ZWxBbGlnbmVkUG9zKTsKICAgICB9Ci0gICAg aWYgKG1fY29udGVudHNQb3NpdGlvbklzTG9ja2VkKSB7Ci0gICAgICAgIEZsb2F0UG9pbnQgY29u dGVudHNQb3MgPSBib3VuZENvbnRlbnRzUG9zaXRpb24obV9jb250ZW50c1Bvc2l0aW9uKTsKLSAg ICAgICAgLy8gVGhlcmUgbWlnaHQgYmUgcmVuZGVyZWQgZnJhbWVzIG5vdCBjb3ZlcmluZyBvdXIg cmVxdWVzdGVkIHBvc2l0aW9uIHlldCwgd2FpdCBmb3IgaXQuCi0gICAgICAgIGlmIChGbG9hdFJl Y3QoY29udGVudHNQb3MsIHZpc2libGVDb250ZW50c1NpemUoKSkuaW50ZXJzZWN0cyhjb3ZlcmVk UmVjdCkpIHsKLSAgICAgICAgICAgIG1fY2xpZW50LT5zZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnRl bnRzUG9zKTsKLSAgICAgICAgICAgIG1fY29udGVudHNQb3NpdGlvbklzTG9ja2VkID0gZmFsc2U7 Ci0gICAgICAgIH0KKworICAgIC8vIFRoZXJlIG1pZ2h0IGJlIHJlbmRlcmVkIGZyYW1lcyBub3Qg Y292ZXJpbmcgb3VyIHJlcXVlc3RlZCBwb3NpdGlvbiB5ZXQsIHdhaXQgZm9yIGl0LgorICAgIEZs b2F0UmVjdCBlbmRWaXNpYmxlQ29udGVudFJlY3QobV9jb250ZW50c1Bvc2l0aW9uLCB2aXNpYmxl Q29udGVudHNTaXplKCkpOworICAgIGlmIChtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSAmJiBlbmRW aXNpYmxlQ29udGVudFJlY3QuaW50ZXJzZWN0cyhjb3ZlcmVkUmVjdCkpIHsKKyAgICAgICAgbV9j bGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24obV9jb250ZW50c1Bvc2l0aW9uKTsKKyAgICAgICAg bV9wZW5kaW5nUG9zaXRpb25DaGFuZ2UgPSBmYWxzZTsKICAgICB9CiB9CiAKQEAgLTI0NSw5ICsy NTEsOSBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZENoYW5nZVZpZXdwb3J0U2l6 ZShjb25zdCBGbG9hdFNpemUmIG5ld1NpemUpCiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6ZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9u LCBmbG9hdCBzY2FsZSwgY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKIHsKLSAg ICBpZiAoIW1fY29udGVudHNQb3NpdGlvbklzTG9ja2VkKQorICAgIGlmICghbV9wZW5kaW5nUG9z aXRpb25DaGFuZ2UpCiAgICAgICAgIG1fY29udGVudHNQb3NpdGlvbiA9IHBvc2l0aW9uOwotICAg IGlmICghbV9lZmZlY3RpdmVTY2FsZUlzTG9ja2VkKQorICAgIGlmICghbV9wZW5kaW5nU2NhbGVD aGFuZ2UpCiAgICAgICAgIG1fZWZmZWN0aXZlU2NhbGUgPSBzY2FsZTsKIAogICAgIHN5bmNWaXNp YmxlQ29udGVudHModHJhamVjdG9yeVZlY3Rvcik7CkBAIC0yNzksNiArMjg1LDEzIEBAIHZvaWQg UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKGNvbnN0 IFdlYkNvcmU6OlZpZXdwb3J0CiAgICAgICAgIFdlYkNvcmU6OnJlc3RyaWN0U2NhbGVGYWN0b3JU b0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmlidXRlcyk7CiAKICAgICB1 cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCh0cnVlKTsKKworICAgIC8vIEFzIHRoZSB2aWV3cG9ydCBh dHRyaWJ1dGVzIGFyZSBjYWxjdWxhdGVkIHdoZW4gbG9hZGluZyBwYWdlcywgYWZ0ZXIgbG9hZCwg b3IgYWZ0ZXIKKyAgICAvLyB2aWV3cG9ydCByZXNpemUsIGl0IGlzIGltcG9ydGFudCB0aGF0IHdl IGluZm9ybSB0aGUgY2xpZW50IG9mIHRoZSBuZXcgc2NhbGUgYW5kCisgICAgLy8gcG9zaXRpb24s IHNvIHRoYXQgdGhlIGNvbnRlbnQgY2FuIGJlIHBvc2l0aW9uZWQgY29ycmVjdGx5IGFuZCBwaXhl bCBhbGlnbmVkLgorICAgIG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlID0gdHJ1ZTsKKyAgICBtX3Bl bmRpbmdTY2FsZUNoYW5nZSA9IHRydWU7CisKICAgICBtX2NsaWVudC0+ZGlkQ2hhbmdlVmlld3Bv cnRBdHRyaWJ1dGVzKCk7CiB9CiAKQEAgLTMxMCwxNCArMzIzLDE0IEBAIHZvaWQgUGFnZVZpZXdw b3J0Q29udHJvbGxlcjo6cmVzdW1lQ29udGVudCgpCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXI6OmFwcGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKGZsb2F0IHNjYWxlKQogewogICAg IG1fZWZmZWN0aXZlU2NhbGUgPSBzY2FsZTsKLSAgICBtX2VmZmVjdGl2ZVNjYWxlSXNMb2NrZWQg PSB0cnVlOworICAgIG1fcGVuZGluZ1NjYWxlQ2hhbmdlID0gdHJ1ZTsKICAgICBzeW5jVmlzaWJs ZUNvbnRlbnRzKCk7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6YXBwbHlQb3Np dGlvbkFmdGVyUmVuZGVyaW5nQ29udGVudHMoY29uc3QgRmxvYXRQb2ludCYgcG9zKQogewogICAg IG1fY29udGVudHNQb3NpdGlvbiA9IHBvczsKLSAgICBtX2NvbnRlbnRzUG9zaXRpb25Jc0xvY2tl ZCA9IHRydWU7CisgICAgbV9wZW5kaW5nUG9zaXRpb25DaGFuZ2UgPSB0cnVlOwogICAgIHN5bmNW aXNpYmxlQ29udGVudHMoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlVmlld3BvcnRDb250cm9sbGVyLmgKaW5kZXggMTQwMjE1ZC4uMGY0NjEyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCkBAIC0x MTAsOCArMTEwLDggQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fY2xpZW50Q29u dGVudHNTaXplOwogICAgIGZsb2F0IG1fZWZmZWN0aXZlU2NhbGU7IC8vIFNob3VsZCBhbHdheXMg YmUgY3NzU2NhbGUgKiBkZXZpY2VQaXhlbFJhdGlvLgogCi0gICAgYm9vbCBtX2NvbnRlbnRzUG9z aXRpb25Jc0xvY2tlZDsKLSAgICBib29sIG1fZWZmZWN0aXZlU2NhbGVJc0xvY2tlZDsKKyAgICBi b29sIG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlOworICAgIGJvb2wgbV9wZW5kaW5nU2NhbGVDaGFu Z2U7CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IG1fbGFzdEZyYW1lQ292ZXJlZFJlY3Q7CiB9Owog Cg== 178771 2012-12-11 04:03:51 -0800 2012-12-11 06:13:02 -0800 Patch bug-104416-20121211130111.patch text/plain 6315 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWZjZDU1YzIzZmNlZmZl NTc5NjlhMTIxNGU0MzY0ZGJjZGVjNGEzNi4uYWE0MzBmNzZlZmVhODhhNjBjYmQyZTRkMGVkMDVl NzU5YTY2MjViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEyLTExICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdW0VGTF1bV0syXSBSZXNpemluZyB0aGUgd2luZG93IGRvZXNuJ3QgYWx3YXlzIHJlc3VsdCBp biByaWdodCBjb250ZW50IHBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDQ0MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgdGhlIGNsaWVudCBpcyBub3RpZmllZCBhYm91dCBw b3NpdGlvbiBhbmQgc2NhbGUgY2hhbmdlZCBkb25lIGJ5IHVzLgorICAgICAgICBSZW5hbWUgdGhl IG1fKklzTG9ja2VkIHRvIG1fcGVuZGluZypDaGFuZ2UgYXMgdGhhdCBtYWtlcyB0aGUgY29kZSBt b3JlIG9idmlvdXMuCisKKyAgICAgICAgUGF0Y2ggdmVyaWZpZWQgd2l0aCBib3RoIFF0IGFuZCBF RkwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRy b2xsZXIpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRSZW5k ZXJGcmFtZSk6IE5vdGlmeSBjbGllbnQgYW5kIHBpeGVsIGFsaWduLgorICAgICAgICAoV2ViS2l0 OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VDb250ZW50c1Zpc2liaWxpdHkpOgor ICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9y dEF0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjph cHBseVNjYWxlQWZ0ZXJSZW5kZXJpbmdDb250ZW50cyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VW aWV3cG9ydENvbnRyb2xsZXI6OmFwcGx5UG9zaXRpb25BZnRlclJlbmRlcmluZ0NvbnRlbnRzKToK KyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oOgorICAgICAgICAo UGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisKIDIwMTItMTItMTAgIEVkdWFyZG8gTGltYSBNaXRl diAgPGVsaW1hQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRXhwb3NlIEhpdFRlc3RSZXN1 bHQ6OnNjcm9sbGJhcigpIGNvbmRpdGlvbiBpbiBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAppbmRleCBkYWQxMDk3ZGY0MGE0 YWMxZGU1Nzg4ZGIwNGY4MzNmYmQ1ZDlhYzg1Li4yZTI5MWMzYWU0NDJkMjdiNGQyYmNiNWFiMTAw N2JjMmQ2YWY0NDliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZp ZXdwb3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VW aWV3cG9ydENvbnRyb2xsZXIuY3BwCkBAIC00OCw4ICs0OCw4IEBAIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQYWdlUHJveHkqIHByb3h5 LCBQYWdlCiAgICAgLCBtX2hhc1N1c3BlbmRlZENvbnRlbnQoZmFsc2UpCiAgICAgLCBtX2hhZFVz ZXJJbnRlcmFjdGlvbihmYWxzZSkKICAgICAsIG1fZWZmZWN0aXZlU2NhbGUoMSkKLSAgICAsIG1f Y29udGVudHNQb3NpdGlvbklzTG9ja2VkKGZhbHNlKQotICAgICwgbV9lZmZlY3RpdmVTY2FsZUlz TG9ja2VkKGZhbHNlKQorICAgICwgbV9wZW5kaW5nUG9zaXRpb25DaGFuZ2UoZmFsc2UpCisgICAg LCBtX3BlbmRpbmdTY2FsZUNoYW5nZShmYWxzZSkKIHsKICAgICAvLyBJbml0aWFsaXppbmcgVmll d3BvcnQgUmF3IEF0dHJpYnV0ZXMgdG8gYXZvaWQgcmFuZG9tIG5lZ2F0aXZlIG9yIGluZmluaXR5 IHNjYWxlIGZhY3RvcnMKICAgICAvLyBpZiB0aGVyZSBpcyBhIHJhY2UgY29uZGl0aW9uIGJldHdl ZW4gdGhlIGZpcnN0IGxheW91dCBhbmQgc2V0dGluZyB0aGUgdmlld3BvcnQgYXR0cmlidXRlcyBm b3IgdGhlIGZpcnN0IHRpbWUuCkBAIC0xODMsMTcgKzE4MywyMyBAQCB2b2lkIFBhZ2VWaWV3cG9y dENvbnRyb2xsZXI6OmRpZFJlbmRlckZyYW1lKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwg Y29uc3QgSQogICAgIC8vIEFsbCBwb3NpdGlvbiBhbmQgc2NhbGUgY2hhbmdlcyByZXN1bHRpbmcg ZnJvbSBhIHdlYiBwcm9jZXNzIGV2ZW50IHNob3VsZAogICAgIC8vIGdvIHRocm91Z2ggaGVyZSB0 byBiZSBhcHBsaWVkIG9uIHRoZSB2aWV3cG9ydCB0byBhdm9pZCBzaG93aW5nIGluY29tcGxldGUK ICAgICAvLyB0aWxlcyB0byB0aGUgdXNlciBkdXJpbmcgYSBmZXcgbWlsbGlzZWNvbmRzLgotICAg IGlmIChtX2VmZmVjdGl2ZVNjYWxlSXNMb2NrZWQpIHsKKworICAgIGlmIChtX3BlbmRpbmdTY2Fs ZUNoYW5nZSkgeworICAgICAgICBtX3BlbmRpbmdTY2FsZUNoYW5nZSA9IGZhbHNlOwogICAgICAg ICBtX2NsaWVudC0+c2V0Q29udGVudHNTY2FsZShtX2VmZmVjdGl2ZVNjYWxlKTsKLSAgICAgICAg bV9lZmZlY3RpdmVTY2FsZUlzTG9ja2VkID0gZmFsc2U7CisKKyAgICAgICAgLy8gVGhlIHNjYWxl IGNoYW5nZWQsIHdlIGhhdmUgdG8gcmUtcGl4ZWwgYWxpZ24uCisgICAgICAgIG1fcGVuZGluZ1Bv c2l0aW9uQ2hhbmdlID0gdHJ1ZTsKKyAgICAgICAgRmxvYXRQb2ludCBjdXJyZW50RGlzY3JldGVQ b3MgPSByb3VuZGVkSW50UG9pbnQobV9jb250ZW50c1Bvc2l0aW9uKTsKKyAgICAgICAgRmxvYXRQ b2ludCBwaXhlbEFsaWduZWRQb3MgPSBwaXhlbEFsaWduZWRGbG9hdFBvaW50KGN1cnJlbnREaXNj cmV0ZVBvcyk7CisgICAgICAgIG1fY29udGVudHNQb3NpdGlvbiA9IGJvdW5kQ29udGVudHNQb3Np dGlvbihwaXhlbEFsaWduZWRQb3MpOwogICAgIH0KLSAgICBpZiAobV9jb250ZW50c1Bvc2l0aW9u SXNMb2NrZWQpIHsKLSAgICAgICAgRmxvYXRQb2ludCBjb250ZW50c1BvcyA9IGJvdW5kQ29udGVu dHNQb3NpdGlvbihtX2NvbnRlbnRzUG9zaXRpb24pOwotICAgICAgICAvLyBUaGVyZSBtaWdodCBi ZSByZW5kZXJlZCBmcmFtZXMgbm90IGNvdmVyaW5nIG91ciByZXF1ZXN0ZWQgcG9zaXRpb24geWV0 LCB3YWl0IGZvciBpdC4KLSAgICAgICAgaWYgKEZsb2F0UmVjdChjb250ZW50c1BvcywgdmlzaWJs ZUNvbnRlbnRzU2l6ZSgpKS5pbnRlcnNlY3RzKGNvdmVyZWRSZWN0KSkgewotICAgICAgICAgICAg bV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24oY29udGVudHNQb3MpOwotICAgICAgICAgICAg bV9jb250ZW50c1Bvc2l0aW9uSXNMb2NrZWQgPSBmYWxzZTsKLSAgICAgICAgfQorCisgICAgLy8g VGhlcmUgbWlnaHQgYmUgcmVuZGVyZWQgZnJhbWVzIG5vdCBjb3ZlcmluZyBvdXIgcmVxdWVzdGVk IHBvc2l0aW9uIHlldCwgd2FpdCBmb3IgaXQuCisgICAgRmxvYXRSZWN0IGVuZFZpc2libGVDb250 ZW50UmVjdChtX2NvbnRlbnRzUG9zaXRpb24sIHZpc2libGVDb250ZW50c1NpemUoKSk7CisgICAg aWYgKG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlICYmIGVuZFZpc2libGVDb250ZW50UmVjdC5pbnRl cnNlY3RzKGNvdmVyZWRSZWN0KSkgeworICAgICAgICBtX2NsaWVudC0+c2V0Vmlld3BvcnRQb3Np dGlvbihtX2NvbnRlbnRzUG9zaXRpb24pOworICAgICAgICBtX3BlbmRpbmdQb3NpdGlvbkNoYW5n ZSA9IGZhbHNlOwogICAgIH0KIH0KIApAQCAtMjQ1LDkgKzI1MSw5IEBAIHZvaWQgUGFnZVZpZXdw b3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKGNvbnN0IEZsb2F0U2l6ZSYgbmV3 U2l6ZSkKIAogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VDb250ZW50c1Zp c2liaWxpdHkoY29uc3QgRmxvYXRQb2ludCYgcG9zaXRpb24sIGZsb2F0IHNjYWxlLCBjb25zdCBG bG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjdG9yKQogewotICAgIGlmICghbV9jb250ZW50c1Bvc2l0 aW9uSXNMb2NrZWQpCisgICAgaWYgKCFtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSkKICAgICAgICAg bV9jb250ZW50c1Bvc2l0aW9uID0gcG9zaXRpb247Ci0gICAgaWYgKCFtX2VmZmVjdGl2ZVNjYWxl SXNMb2NrZWQpCisgICAgaWYgKCFtX3BlbmRpbmdTY2FsZUNoYW5nZSkKICAgICAgICAgbV9lZmZl Y3RpdmVTY2FsZSA9IHNjYWxlOwogCiAgICAgc3luY1Zpc2libGVDb250ZW50cyh0cmFqZWN0b3J5 VmVjdG9yKTsKQEAgLTI3OSw2ICsyODUsMTMgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVy OjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnQKICAg ICAgICAgV2ViQ29yZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNjYWxlSWZOb3RVc2Vy U2NhbGFibGUobV9yYXdBdHRyaWJ1dGVzKTsKIAogICAgIHVwZGF0ZU1pbmltdW1TY2FsZVRvRml0 KHRydWUpOworCisgICAgLy8gQXMgdGhlIHZpZXdwb3J0IGF0dHJpYnV0ZXMgYXJlIGNhbGN1bGF0 ZWQgd2hlbiBsb2FkaW5nIHBhZ2VzLCBhZnRlciBsb2FkLCBvciBhZnRlcgorICAgIC8vIHZpZXdw b3J0IHJlc2l6ZSwgaXQgaXMgaW1wb3J0YW50IHRoYXQgd2UgaW5mb3JtIHRoZSBjbGllbnQgb2Yg dGhlIG5ldyBzY2FsZSBhbmQKKyAgICAvLyBwb3NpdGlvbiwgc28gdGhhdCB0aGUgY29udGVudCBj YW4gYmUgcG9zaXRpb25lZCBjb3JyZWN0bHkgYW5kIHBpeGVsIGFsaWduZWQuCisgICAgbV9wZW5k aW5nUG9zaXRpb25DaGFuZ2UgPSB0cnVlOworICAgIG1fcGVuZGluZ1NjYWxlQ2hhbmdlID0gdHJ1 ZTsKKwogICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKIH0KIApA QCAtMzEwLDE0ICszMjMsMTQgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpyZXN1bWVD b250ZW50KCkKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6YXBwbHlTY2FsZUFmdGVyUmVu ZGVyaW5nQ29udGVudHMoZmxvYXQgc2NhbGUpCiB7CiAgICAgbV9lZmZlY3RpdmVTY2FsZSA9IHNj YWxlOwotICAgIG1fZWZmZWN0aXZlU2NhbGVJc0xvY2tlZCA9IHRydWU7CisgICAgbV9wZW5kaW5n U2NhbGVDaGFuZ2UgPSB0cnVlOwogICAgIHN5bmNWaXNpYmxlQ29udGVudHMoKTsKIH0KIAogdm9p ZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjphcHBseVBvc2l0aW9uQWZ0ZXJSZW5kZXJpbmdDb250 ZW50cyhjb25zdCBGbG9hdFBvaW50JiBwb3MpCiB7CiAgICAgbV9jb250ZW50c1Bvc2l0aW9uID0g cG9zOwotICAgIG1fY29udGVudHNQb3NpdGlvbklzTG9ja2VkID0gdHJ1ZTsKKyAgICBtX3BlbmRp bmdQb3NpdGlvbkNoYW5nZSA9IHRydWU7CiAgICAgc3luY1Zpc2libGVDb250ZW50cygpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIu aAppbmRleCAxNDAyMTVkNmJiYTgzNTEyN2ZmMjFiODU1MDQyYzk4MWEyZDUwYjY3Li4wZjQ2MTI1 YTQzMWM4ZWQxZjU2YjYzMzE2YTViNmQ2NThlOTMxM2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTExMCw4ICsxMTAsOCBA QCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFNpemUgbV9jbGllbnRDb250ZW50c1NpemU7CiAg ICAgZmxvYXQgbV9lZmZlY3RpdmVTY2FsZTsgLy8gU2hvdWxkIGFsd2F5cyBiZSBjc3NTY2FsZSAq IGRldmljZVBpeGVsUmF0aW8uCiAKLSAgICBib29sIG1fY29udGVudHNQb3NpdGlvbklzTG9ja2Vk OwotICAgIGJvb2wgbV9lZmZlY3RpdmVTY2FsZUlzTG9ja2VkOworICAgIGJvb2wgbV9wZW5kaW5n UG9zaXRpb25DaGFuZ2U7CisgICAgYm9vbCBtX3BlbmRpbmdTY2FsZUNoYW5nZTsKICAgICBXZWJD b3JlOjpGbG9hdFJlY3QgbV9sYXN0RnJhbWVDb3ZlcmVkUmVjdDsKIH07CiAK