110727 2013-02-24 23:29:23 -0800 [chromium] Remove WebLayerTreeView::setViewportSize call 2013-03-03 23:58:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aelias aelias aelias buildbot dglazkov jamesr jochen piman rniwa webkit.review.bot oldest_to_newest 840726 0 aelias 2013-02-24 23:29:23 -0800 [chromium] Remove WebLayerTreeView::setViewportSize call 840729 1 190001 aelias 2013-02-24 23:33:33 -0800 Created attachment 190001 Patch 840738 2 aelias 2013-02-24 23:44:40 -0800 https://codereview.chromium.org/12328080/ will land before this one. 840761 3 190001 buildbot 2013-02-25 00:30:24 -0800 Comment on attachment 190001 Patch Attachment 190001 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16752009 New failing tests: svg/as-image/img-preserveAspectRatio-support-2.html 840784 4 190001 webkit.review.bot 2013-02-25 01:04:05 -0800 Comment on attachment 190001 Patch Attachment 190001 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16678054 New failing tests: compositing/backface-visibility/backface-visibility-hierarchical-transform.html animations/3d/matrix-transform-type-animation.html animations/3d/state-at-end-event-transform.html compositing/nested-direct-image-compositing.html compositing/direct-image-compositing.html compositing/backface-visibility/backface-visibility-non3d.html animations/additive-transform-animations.html animations/3d/replace-filling-transform.html compositing/backface-visibility/backface-visibility-3d.html compositing/clip-change.html compositing/text-on-large-layer.html compositing/layers-inside-overflow-scroll.html compositing/animation/state-at-end-event-transform-layer.html compositing/sibling-positioning.html compositing/generated-content.html compositing/fixed-position-changed-in-composited-layer.html compositing/self-painting-layers.html compositing/text-on-scaled-layer.html compositing/absolute-position-changed-with-composited-parent-layer.html compositing/absolute-position-changed-in-composited-layer.html compositing/flat-with-transformed-child.html compositing/scrollbar-painting.html compositing/preserve-3d-toggle.html compositing/fixed-position-scroll-offset-history-restore.html compositing/backface-visibility/backface-visibility-image.html compositing/compositing-visible-descendant.html compositing/fixed-position-changed-within-composited-parent-layer.html compositing/backface-visibility/backface-visibility-simple.html compositing/backface-visibility/backface-visibility-webgl.html compositing/text-on-scaled-surface.html 841470 5 190001 jamesr 2013-02-25 18:02:15 -0800 Comment on attachment 190001 Patch This part looks fine, but you'll have to sort out the issues on the chromium-side patch and make sure that lands *and* rolls into Source/WebKit/chromium/DEPS before this part can land. 843673 6 190641 aelias 2013-02-27 20:34:41 -0800 Created attachment 190641 Patch Make DumpRenderTree call setViewportSize 843679 7 190641 jamesr 2013-02-27 20:51:21 -0800 Comment on attachment 190641 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190641&action=review > Tools/DumpRenderTree/chromium/WebViewHost.cpp:940 > + m_layerTreeView->setViewportSize(webWidget()->size(), deviceViewportSize); Hmm, this is a bit of a bummer. any way to avoid this? 843689 8 aelias 2013-02-27 21:09:12 -0800 No way to avoid it comes to mind, since my patches are moving the responsibility to call this to the embedder. DumpRenderTree is another embedder so it needs a call. I could've left the responsibility to call it in WebKit, in which case it would need to be informed of the physical backing size via an API change. But it doesn't need to know about this for anything else, and it's nice and clean for every coordinate given to WebKit to be in DIP pixels. 844231 9 jamesr 2013-02-28 11:00:27 -0800 (In reply to comment #8) > No way to avoid it comes to mind, since my patches are moving the responsibility to call this to the embedder. DumpRenderTree is another embedder so it needs a call. > > I could've left the responsibility to call it in WebKit, in which case it would need to be informed of the physical backing size via an API change. But it doesn't need to know about this for anything else, and it's nice and clean for every coordinate given to WebKit to be in DIP pixels. Does the viewport ever change in DRT? If the answer is no (which I think it is) then we should pass this out as a construction-time parameter. We shouldn't have exposed API in Platform that's only called from DRT 844745 10 aelias 2013-02-28 20:04:33 -0800 I see, you prefer it only exposed in webkit_support.h. Unfortunately, some layout tests do call window.resize and break if I try doing setting only at construction time, such as compositing/transitions/transform-on-large-layer.html 844810 11 jamesr 2013-02-28 22:07:17 -0800 Yeah, I'd like to get rid of it from WebLayerTreeView completely if we don't want WebKit to be setting this generally. But don't let that hold you up here. We can fix it up later for DRT or just wait until DRT goes D-E-D. 846078 12 190641 aelias 2013-03-03 14:12:57 -0800 Comment on attachment 190641 Patch Source/WebKit/chromium/DEPS rolled past 185621, landing this half. 846081 13 190641 webkit.review.bot 2013-03-03 14:17:48 -0800 Comment on attachment 190641 Patch Clearing flags on attachment: 190641 Committed r144581: <http://trac.webkit.org/changeset/144581> 846082 14 webkit.review.bot 2013-03-03 14:17:52 -0800 All reviewed patches have been landed. Closing bug. 846168 15 jochen 2013-03-03 23:16:33 -0800 This change regressed >500 tests on content_shell 846171 16 aelias 2013-03-03 23:32:47 -0800 I have a follow-up fix https://codereview.chromium.org/12374078/ that should hopefully fix them. 846179 17 aelias 2013-03-03 23:51:15 -0800 I confirmed https://codereview.chromium.org/12374078/ fixed the content_shell failures. 846180 18 jochen 2013-03-03 23:58:53 -0800 (In reply to comment #17) > I confirmed https://codereview.chromium.org/12374078/ fixed the content_shell failures. Thank you! 190001 2013-02-24 23:33:33 -0800 2013-02-27 20:34:39 -0800 Patch bug-110727-20130224232950.patch text/plain 3344 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGEyMjA1YjZjNDBhZTZmYjA0NGQ4ZWNmYTdiMDE0MTliMzkzZGQ3ZWQuLmU3NzMyN2U0MDcwMmRl N2ZlNTRkMWIyN2Q0NzZhMjRiZGU1OThmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTMtMDItMjQgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgV2ViTGF5ZXJUcmVlVmlldzo6 c2V0Vmlld3BvcnRTaXplIGNhbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMDcyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFmdGVyIGh0dHBzOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMTIzMjgw ODAgbGFuZHMsCisgICAgICAgIHNldFZpZXdwb3J0U2l6ZSBpcyBjYWxsZWQgZnJvbSB0aGUgQ2hy b21pdW0gc2lkZS4gVGhlIG11bHRpcGxpY2F0aW9uCisgICAgICAgIGJ5IGRldmljZVNjYWxlRmFj dG9yIGhlcmUgd2FzIHByb25lIHRvIG9mZi1ieS1vbmUgZXJyb3JzLgorICAgICAgICBUaGUgbGF5 b3V0U2l6ZSgpIGZ1bmN0aW9uIHdhcyBvbmx5IHVzZWQgaGVyZSBzbyBkZWxldGUgaXQgYXMgd2Vs bC4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjp1cGRhdGVMYXllclRyZWVWaWV3cG9ydCk6CisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmg6CisgICAgICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTMtMDItMjIgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxNDM3MzQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKaW5kZXggM2JhMDFlZWQ4OGY5MDVmOWY0YTBmODcyOTYxZGU3M2I4ZGViM2I3Yi4u NjJiNTUzZDljNDI1MjI3NmM2OTdmNTIwNDYzYjFjMjM4ZTVhMWM1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMzE1NSwyMCArMzE1NSw2IEBAIElu dFNpemUgV2ViVmlld0ltcGw6OmNvbnRlbnRzU2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJvb3Qt PmRvY3VtZW50UmVjdCgpLnNpemUoKTsKIH0KIAotSW50U2l6ZSBXZWJWaWV3SW1wbDo6bGF5b3V0 U2l6ZSgpIGNvbnN0Ci17Ci0gICAgaWYgKCFpc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQoKSkKLSAg ICAgICAgcmV0dXJuIG1fc2l6ZTsKLQotICAgIEludFNpemUgY29udGVudFNpemUgPSBjb250ZW50 c1NpemUoKTsKLQotICAgIGlmIChmaXhlZExheW91dFNpemUoKS53aWR0aCA+PSBjb250ZW50U2l6 ZS53aWR0aCgpKQotICAgICAgICByZXR1cm4gZml4ZWRMYXlvdXRTaXplKCk7Ci0KLSAgICBmbG9h dCBhc3BlY3RSYXRpbyA9IHN0YXRpY19jYXN0PGZsb2F0PihtX3NpemUuaGVpZ2h0KSAvIG1fc2l6 ZS53aWR0aDsKLSAgICByZXR1cm4gSW50U2l6ZShjb250ZW50U2l6ZS53aWR0aCgpLCBjb250ZW50 U2l6ZS53aWR0aCgpICogYXNwZWN0UmF0aW8pOwotfQotCiB2b2lkIFdlYlZpZXdJbXBsOjpjb21w dXRlUGFnZVNjYWxlRmFjdG9yTGltaXRzKCkKIHsKICAgICBpZiAoIW1haW5GcmFtZSgpIHx8ICFw YWdlKCkgfHwgIXBhZ2UoKS0+bWFpbkZyYW1lKCkgfHwgIXBhZ2UoKS0+bWFpbkZyYW1lKCktPnZp ZXcoKSkKQEAgLTQzMTMsMTUgKzQyOTksNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVMYXll clRyZWVWaWV3cG9ydCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIEZyYW1lVmlldyogdmlldyA9 IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKLQotICAgIEludFNpemUgbGF5b3V0Vmlld3Bv cnRTaXplID0gbGF5b3V0U2l6ZSgpOwotICAgIEludFNpemUgZGV2aWNlVmlld3BvcnRTaXplID0g bV9zaXplOwotICAgIGlmIChtX3dlYlNldHRpbmdzLT5hcHBseURldmljZVNjYWxlRmFjdG9ySW5D b21wb3NpdG9yKCkpCi0gICAgICAgIGRldmljZVZpZXdwb3J0U2l6ZS5zY2FsZShkZXZpY2VTY2Fs ZUZhY3RvcigpKTsKLQotICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0LT5zZXRWaWV3cG9y dChkZXZpY2VWaWV3cG9ydFNpemUsIHZpZXctPmNvbnRlbnRzU2l6ZSgpLCB2aWV3LT5zY3JvbGxQ b3NpdGlvbigpLCB2aWV3LT5zY3JvbGxPcmlnaW4oKSk7Ci0KLSAgICBtX2xheWVyVHJlZVZpZXct PnNldFZpZXdwb3J0U2l6ZShsYXlvdXRWaWV3cG9ydFNpemUsIGRldmljZVZpZXdwb3J0U2l6ZSk7 CisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3QtPnNldFZpZXdwb3J0KG1fc2l6ZSwgdmll dy0+Y29udGVudHNTaXplKCksIHZpZXctPnNjcm9sbFBvc2l0aW9uKCksIHZpZXctPnNjcm9sbE9y aWdpbigpKTsKICAgICBtX2xheWVyVHJlZVZpZXctPnNldFBhZ2VTY2FsZUZhY3RvckFuZExpbWl0 cyhwYWdlU2NhbGVGYWN0b3IoKSwgbV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yLCBtX21heGltdW1Q YWdlU2NhbGVGYWN0b3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAppbmRleCBjNDY1NWVkMzAyOWJkZWFlMWY1YTExODA2YzNhODg4NzczMWI1ZjJkLi43Njc2 ODI2YzJlMDc2MDEyZmI5OTk1ODAwN2U1NzRlODA2NmRjOTNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTQ1OSw3ICs0NTksNiBAQCBwdWJsaWM6CiAgICAg fQogCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBkaXBTaXplKCkgY29uc3Q7Ci0gICAgV2ViQ29yZTo6 SW50U2l6ZSBsYXlvdXRTaXplKCkgY29uc3Q7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBzY2FsZWRT aXplKGZsb2F0KSBjb25zdDsKIAogICAgIC8vIFNldCB0aGUgZGlzcG9zaXRpb24gZm9yIGhvdyB0 aGlzIHdlYnZpZXcgaXMgdG8gYmUgaW5pdGlhbGx5IHNob3duLgo= 190641 2013-02-27 20:34:41 -0800 2013-03-03 14:17:47 -0800 Patch bug-110727-20130227203054.patch text/plain 7022 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDE3ZjdlMTI2ODM5ZTk0MGFjZGI3MzY0MGFlNmI2M2M2Nzk1ODM0ZTkuLjM3MTA0ODlkM2IyNGU0 NzZhYTkxNjgyNzMzOWFlZGIzYjdmODBjMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTMtMDItMjcgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgV2ViTGF5ZXJUcmVlVmlldzo6 c2V0Vmlld3BvcnRTaXplIGNhbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMDcyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFmdGVyIGh0dHBzOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMTIzMjgw ODAgbGFuZHMsCisgICAgICAgIHNldFZpZXdwb3J0U2l6ZSBpcyBjYWxsZWQgZnJvbSB0aGUgQ2hy b21pdW0gc2lkZS4gVGhlIG11bHRpcGxpY2F0aW9uCisgICAgICAgIGJ5IGRldmljZVNjYWxlRmFj dG9yIGhlcmUgd2FzIHByb25lIHRvIG9mZi1ieS1vbmUgZXJyb3JzLgorICAgICAgICBUaGUgbGF5 b3V0U2l6ZSgpIGZ1bmN0aW9uIHdhcyBvbmx5IHVzZWQgaGVyZSBzbyBkZWxldGUgaXQgYXMgd2Vs bC4KKworICAgICAgICBEdW1wUmVuZGVyVHJlZSBXZWJWaWV3SG9zdCBtdXN0IG5vdyBjYWxsIHRo aXMgbWV0aG9kIGFzIHdlbGwuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dXBkYXRlTGF5ZXJUcmVlVmlld3BvcnQpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEz LTAyLTIzICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Q2hyb21pdW1dIFdlYktpdDo6aW5pdGlhbGl6ZSBzaG91bGQgdGFrZSBhIFBsYXRmb3JtKiBub3cg dGhhdCBXZWJLaXRQbGF0Zm9ybVN1cHBvcnQgaXMgZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBhZDNlZDQxZTMzM2I2ODQwZDMzNWFiMjZiYzhi MDYxODk4NWNkN2M2Li41M2U2NWY2NmI5ZTU2YmYxOGYyY2IyZWVlMWExYTRhODI1MTdmYTRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0zMTU3LDIw ICszMTU3LDYgQEAgSW50U2l6ZSBXZWJWaWV3SW1wbDo6Y29udGVudHNTaXplKCkgY29uc3QKICAg ICByZXR1cm4gcm9vdC0+ZG9jdW1lbnRSZWN0KCkuc2l6ZSgpOwogfQogCi1JbnRTaXplIFdlYlZp ZXdJbXBsOjpsYXlvdXRTaXplKCkgY29uc3QKLXsKLSAgICBpZiAoIWlzRml4ZWRMYXlvdXRNb2Rl RW5hYmxlZCgpKQotICAgICAgICByZXR1cm4gbV9zaXplOwotCi0gICAgSW50U2l6ZSBjb250ZW50 U2l6ZSA9IGNvbnRlbnRzU2l6ZSgpOwotCi0gICAgaWYgKGZpeGVkTGF5b3V0U2l6ZSgpLndpZHRo ID49IGNvbnRlbnRTaXplLndpZHRoKCkpCi0gICAgICAgIHJldHVybiBmaXhlZExheW91dFNpemUo KTsKLQotICAgIGZsb2F0IGFzcGVjdFJhdGlvID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fc2l6ZS5o ZWlnaHQpIC8gbV9zaXplLndpZHRoOwotICAgIHJldHVybiBJbnRTaXplKGNvbnRlbnRTaXplLndp ZHRoKCksIGNvbnRlbnRTaXplLndpZHRoKCkgKiBhc3BlY3RSYXRpbyk7Ci19Ci0KIHZvaWQgV2Vi Vmlld0ltcGw6OmNvbXB1dGVQYWdlU2NhbGVGYWN0b3JMaW1pdHMoKQogewogICAgIGlmICghbWFp bkZyYW1lKCkgfHwgIXBhZ2UoKSB8fCAhcGFnZSgpLT5tYWluRnJhbWUoKSB8fCAhcGFnZSgpLT5t YWluRnJhbWUoKS0+dmlldygpKQpAQCAtNDMyMSwxNSArNDMwNyw3IEBAIHZvaWQgV2ViVmlld0lt cGw6OnVwZGF0ZUxheWVyVHJlZVZpZXdwb3J0KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgRnJh bWVWaWV3KiB2aWV3ID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpOwotCi0gICAgSW50U2l6 ZSBsYXlvdXRWaWV3cG9ydFNpemUgPSBsYXlvdXRTaXplKCk7Ci0gICAgSW50U2l6ZSBkZXZpY2VW aWV3cG9ydFNpemUgPSBtX3NpemU7Ci0gICAgaWYgKG1fd2ViU2V0dGluZ3MtPmFwcGx5RGV2aWNl U2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkKLSAgICAgICAgZGV2aWNlVmlld3BvcnRTaXplLnNj YWxlKGRldmljZVNjYWxlRmFjdG9yKCkpOwotCi0gICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhv c3QtPnNldFZpZXdwb3J0KGRldmljZVZpZXdwb3J0U2l6ZSwgdmlldy0+Y29udGVudHNTaXplKCks IHZpZXctPnNjcm9sbFBvc2l0aW9uKCksIHZpZXctPnNjcm9sbE9yaWdpbigpKTsKLQotICAgIG1f bGF5ZXJUcmVlVmlldy0+c2V0Vmlld3BvcnRTaXplKGxheW91dFZpZXdwb3J0U2l6ZSwgZGV2aWNl Vmlld3BvcnRTaXplKTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC0+c2V0Vmlld3Bv cnQobV9zaXplLCB2aWV3LT5jb250ZW50c1NpemUoKSwgdmlldy0+c2Nyb2xsUG9zaXRpb24oKSwg dmlldy0+c2Nyb2xsT3JpZ2luKCkpOwogICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0UGFnZVNjYWxl RmFjdG9yQW5kTGltaXRzKHBhZ2VTY2FsZUZhY3RvcigpLCBtX21pbmltdW1QYWdlU2NhbGVGYWN0 b3IsIG1fbWF4aW11bVBhZ2VTY2FsZUZhY3Rvcik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGNjNGI5NjZlZDY3ZTc5OGE0YTIyZDg4YzFiZGViOGFl M2VhODM2Y2MuLmU5NGIyZjgzN2U3OWFjNTA3MmVkYzhlODVmYmFkZmZhNmQwYzk2YTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtNDU5LDcgKzQ1OSw2IEBA IHB1YmxpYzoKICAgICB9CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIGRpcFNpemUoKSBjb25zdDsK LSAgICBXZWJDb3JlOjpJbnRTaXplIGxheW91dFNpemUoKSBjb25zdDsKICAgICBXZWJDb3JlOjpJ bnRTaXplIHNjYWxlZFNpemUoZmxvYXQpIGNvbnN0OwogCiAgICAgLy8gU2V0IHRoZSBkaXNwb3Np dGlvbiBmb3IgaG93IHRoaXMgd2VidmlldyBpcyB0byBiZSBpbml0aWFsbHkgc2hvd24uCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjEyYWMwYTdh ZjI0MDAwNTYyZmVlYzUyNGMzOWI0MjFhMTUzNjRjNS4uOGNkMzMyMDQ5ODBlNDM5MDIyZGE1MzIw MzEwOGNlMzRiYzNkYTk5NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAyLTI3ICBBbGV4YW5kcmUgRWxpYXMg IDxhZWxpYXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIFdlYkxh eWVyVHJlZVZpZXc6OnNldFZpZXdwb3J0U2l6ZSBjYWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA3MjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciBodHRwczovL2NvZGVyZXZpZXcuY2hyb21p dW0ub3JnLzEyMzI4MDgwIGxhbmRzLAorICAgICAgICBzZXRWaWV3cG9ydFNpemUgaXMgY2FsbGVk IGZyb20gdGhlIENocm9taXVtIHNpZGUuIFRoZSBtdWx0aXBsaWNhdGlvbgorICAgICAgICBieSBk ZXZpY2VTY2FsZUZhY3RvciBoZXJlIHdhcyBwcm9uZSB0byBvZmYtYnktb25lIGVycm9ycy4KKyAg ICAgICAgVGhlIGxheW91dFNpemUoKSBmdW5jdGlvbiB3YXMgb25seSB1c2VkIGhlcmUgc28gZGVs ZXRlIGl0IGFzIHdlbGwuCisKKyAgICAgICAgRHVtcFJlbmRlclRyZWUgV2ViVmlld0hvc3QgbXVz dCBub3cgY2FsbCB0aGlzIG1ldGhvZCBhcyB3ZWxsLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoV2ViVmlld0hvc3Q6OmluaXRp YWxpemVMYXllclRyZWVWaWV3KToKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpzZXRXaW5kb3dSZWN0 KToKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpzZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAg IChXZWJWaWV3SG9zdDo6dXBkYXRlVmlld3BvcnRTaXplKToKKyAgICAgICAgKiBEdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oOgorICAgICAgICAoV2ViVmlld0hvc3QpOgorCiAy MDEzLTAyLTIzICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbQ2hyb21pdW1dIER1bXBSZW5kZXJUcmVlIFRlc3RTaGVsbDo6aW5pdGlhbGl6ZSBzaG91bGQg dGFrZSBQbGF0Zm9ybSogbm93IHRoYXQgV2ViS2l0UGxhdGZvcm1TdXBwb3J0IGlzIGVtcHR5CmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggNjk5 ZDdiYWY4ZjExYWYyNmNmMDU2NjYwNjlkNzczMDNhNmNjNGNiOC4uN2VkMDgxMjE5ZDg1YzA5NWI1 MTM3NDg4NzA3ZGE1YWNiOTU1MTRkYiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtMjcwLDYgKzI3MCw3IEBAIHZvaWQgV2ViVmlld0hvc3Q6 OmluaXRpYWxpemVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqIGNsaWVudCwg Y29uc3QKICAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIod2Via2l0X3N1cHBvcnQ6 OkNyZWF0ZUxheWVyVHJlZVZpZXczZChjbGllbnQpKTsKIAogICAgIEFTU0VSVChtX2xheWVyVHJl ZVZpZXcpOworICAgIHVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwogICAgIG1fbGF5ZXJUcmVlVmlldy0+ c2V0Um9vdExheWVyKHJvb3RMYXllcik7CiAgICAgbV9sYXllclRyZWVWaWV3LT5zZXRTdXJmYWNl UmVhZHkoKTsKIH0KQEAgLTM1Miw2ICszNTMsNyBAQCB2b2lkIFdlYlZpZXdIb3N0OjpzZXRXaW5k b3dSZWN0KGNvbnN0IFdlYlJlY3QmIHJlY3QpCiAgICAgaW50IHdpZHRoID0gbV93aW5kb3dSZWN0 LndpZHRoIC0gYm9yZGVyMjsKICAgICBpbnQgaGVpZ2h0ID0gbV93aW5kb3dSZWN0LmhlaWdodCAt IGJvcmRlcjI7CiAgICAgd2ViV2lkZ2V0KCktPnJlc2l6ZShXZWJTaXplKHdpZHRoLCBoZWlnaHQp KTsKKyAgICB1cGRhdGVWaWV3cG9ydFNpemUoKTsKIH0KIAogV2ViUmVjdCBXZWJWaWV3SG9zdDo6 cm9vdFdpbmRvd1JlY3QoKQpAQCAtNjAzLDYgKzYwNSw3IEBAIHZvaWQgV2ViVmlld0hvc3Q6OnNl dERhdGFiYXNlUXVvdGEoaW50IHF1b3RhKQogdm9pZCBXZWJWaWV3SG9zdDo6c2V0RGV2aWNlU2Nh bGVGYWN0b3IoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IpCiB7CiAgICAgd2ViVmlldygpLT5zZXRE ZXZpY2VTY2FsZUZhY3RvcihkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgdXBkYXRlVmlld3BvcnRT aXplKCk7CiB9CiAKIHZvaWQgV2ViVmlld0hvc3Q6OnNldEZvY3VzKGJvb2wgZm9jdXNlZCkKQEAg LTkyNyw2ICs5MzAsMTYgQEAgdm9pZCBXZWJWaWV3SG9zdDo6dXBkYXRlU2Vzc2lvbkhpc3Rvcnko V2ViRnJhbWUqIGZyYW1lKQogICAgIGVudHJ5LT5zZXRDb250ZW50U3RhdGUoaGlzdG9yeUl0ZW0p OwogfQogCit2b2lkIFdlYlZpZXdIb3N0Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQoreworICAgIGlm ICghbV9sYXllclRyZWVWaWV3KQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJTaXplIGRldmlj ZVZpZXdwb3J0U2l6ZSh3ZWJXaWRnZXQoKS0+c2l6ZSgpLndpZHRoICogd2ViVmlldygpLT5kZXZp Y2VTY2FsZUZhY3RvcigpLAorICAgICAgICB3ZWJXaWRnZXQoKS0+c2l6ZSgpLmhlaWdodCAqIHdl YlZpZXcoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgbV9sYXllclRyZWVWaWV3LT5zZXRW aWV3cG9ydFNpemUod2ViV2lkZ2V0KCktPnNpemUoKSwgZGV2aWNlVmlld3BvcnRTaXplKTsKK30K Kwogdm9pZCBXZWJWaWV3SG9zdDo6cHJpbnRGcmFtZURlc2NyaXB0aW9uKFdlYkZyYW1lKiB3ZWJm cmFtZSkKIHsKICAgICBzdHJpbmcgbmFtZTggPSB3ZWJmcmFtZS0+dW5pcXVlTmFtZSgpLnV0Zjgo KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0 LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IGY4 MWMwMzIyYTc3NmMzZjgxNTIyMWU2Y2FiNTk1ODdlNGUyNmVkNDguLjFlYzU2Nzk1NWVhNzlhNzhm NzQ1MWY4ZTM2NjljNzdhZGUzOGFmZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVmlld0hvc3QuaApAQCAtMjMzLDYgKzIzMyw4IEBAIHByaXZhdGU6CiAKICAgICBib29s IGhhc1dpbmRvdygpIGNvbnN0IHsgcmV0dXJuIG1faGFzV2luZG93OyB9CiAKKyAgICB2b2lkIHVw ZGF0ZVZpZXdwb3J0U2l6ZSgpOworCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICB3ZWJr aXRfc3VwcG9ydDo6VGVzdE1lZGlhU3RyZWFtQ2xpZW50KiB0ZXN0TWVkaWFTdHJlYW1DbGllbnQo KTsKICNlbmRpZgo=