80584 2012-03-08 02:43:40 -0800 [chromium] Pass setVisibility to CCLayerTreeHostImpl regardless of LRC initialization status 2012-03-08 19:52:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nduca nduca cc-bugs jamesr webkit.review.bot oldest_to_newest 573737 0 nduca 2012-03-08 02:43:40 -0800 [chromium] Pass setVisibility to CCLayerTreeHostImpl regardless of LRC initialization status 573738 1 130799 nduca 2012-03-08 02:44:12 -0800 Created attachment 130799 Patch 573741 2 nduca 2012-03-08 02:46:57 -0800 As part of re-working the compositeAndReadback flow, I am trying to write a unit test that fails for the existing broken case. In doing that, I got bitten by the visibility call behaving differently during initialization. So, I'm thinking, can we just make it all the time? 573758 3 130804 nduca 2012-03-08 03:47:14 -0800 Created attachment 130804 null check during initialize 573970 4 130804 jamesr 2012-03-08 11:09:20 -0800 Comment on attachment 130804 null check during initialize View in context: https://bugs.webkit.org/attachment.cgi?id=130804&action=review OK > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:399 > + if (visible && m_layerRenderer && m_layerRenderer->capabilities().usingPartialSwap) since we're also null checking m_layerRenderer on line 394 probably better to just null check it and return above that line instead of checking it twice 574214 5 130907 nduca 2012-03-08 14:30:23 -0800 Created attachment 130907 Normalize SingleThreadProxy behavior also 574217 6 130907 nduca 2012-03-08 14:30:53 -0800 Comment on attachment 130907 Normalize SingleThreadProxy behavior also Putting r? again because I made a similar change to CCSingleThreadProxy::setVisible 574277 7 130907 jamesr 2012-03-08 15:08:54 -0800 Comment on attachment 130907 Normalize SingleThreadProxy behavior also OK 574520 8 130907 webkit.review.bot 2012-03-08 19:52:41 -0800 Comment on attachment 130907 Normalize SingleThreadProxy behavior also Clearing flags on attachment: 130907 Committed r110255: <http://trac.webkit.org/changeset/110255> 574521 9 webkit.review.bot 2012-03-08 19:52:46 -0800 All reviewed patches have been landed. Closing bug. 130799 2012-03-08 02:44:12 -0800 2012-03-08 03:47:11 -0800 Patch bug-80584-20120308024411.patch text/plain 3286 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVjYjhkYWVjMjViNDA2 OTZhZDA2YTEyNGI0NTYxZjM5YzQ4YzMyNy4uNzRhZGUwODQzMDM0MGE3OTQyZTc4NWY5NWI2ZGFi NzNlZDA0M2E5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTA4ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFBhc3Mgc2V0 VmlzaWJpbGl0eSB0byBDQ0xheWVyVHJlZUhvc3RJbXBsIHJlZ2FyZGxlc3Mgb2YgTFJDIGluaXRp YWxpemF0aW9uIHN0YXR1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODA1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6OnNldFZpc2libGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpkaWRCZWNvbWVJbnZpc2libGVPbkltcGxU aHJlYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6 c2V0VmlzaWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjppbml0 aWFsaXplTGF5ZXJSZW5kZXJlcik6CisKIDIwMTItMDMtMDggIFJvYmluIENhbyAgPHJvYmluLmNh b0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwc3RyZWFtIEdy YXBoaWNzTGF5ZXJCbGFja0JlcnJ5LntoLCBjcHB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 LmNwcAppbmRleCA4YjM0YjFjYWZmMWRiMTYzZWRlM2U4YjRhMTY2ZjZjMDA2ZDkzZmZjLi44NjJl ZDM5NDcxMmM0ZjZjNjg1NWYzNzI3NDVmMTQ2ZjY5NjE4OWQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5jcHAKQEAgLTM1MiwxMCArMzUyLDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6 OnNldFZpc2libGUoYm9vbCB2aXNpYmxlKQogCiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIAot ICAgIGlmICghbV9sYXllclJlbmRlcmVySW5pdGlhbGl6ZWQpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGlmICghdmlzaWJsZSkgeworICAgIGlmICghdmlzaWJsZSAmJiBtX2xheWVyUmVuZGVyZXJJ bml0aWFsaXplZCkgewogICAgICAgICBtX2NvbnRlbnRzVGV4dHVyZU1hbmFnZXItPnJlZHVjZU1l bW9yeVRvTGltaXQoVGV4dHVyZU1hbmFnZXI6Omxvd0xpbWl0Qnl0ZXModmlld3BvcnRTaXplKCkp KTsKICAgICAgICAgbV9jb250ZW50c1RleHR1cmVNYW5hZ2VyLT51bnByb3RlY3RBbGxUZXh0dXJl cygpOwogICAgIH0KQEAgLTM2OSw2ICszNjYsOSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6c2V0 VmlzaWJsZShib29sIHZpc2libGUpCiB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZGlkQmVjb21lSW52 aXNpYmxlT25JbXBsVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGhvc3RJbXBsKQogewogICAg IEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7CisgICAgaWYgKCFtX2xheWVyUmVuZGVy ZXJJbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fcHJveHktPmxheWVy UmVuZGVyZXJDYXBhYmlsaXRpZXMoKS5jb250ZXh0SGFzQ2FjaGVkRnJvbnRCdWZmZXIpCiAgICAg ICAgIGNvbnRlbnRzVGV4dHVyZU1hbmFnZXIoKS0+ZXZpY3RBbmREZWxldGVBbGxUZXh0dXJlcyho b3N0SW1wbC0+Y29udGVudHNUZXh0dXJlQWxsb2NhdG9yKCkpOwogICAgIGVsc2UgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCA5MjVjOGNjNGMwNjYxMmQ0MTUy ZjA5OWFkNzI2MDhhMzc4MjBjODBhLi4yYzg1MjA1NGU5ODk2ZjUxNDMzOGU4ODFkZDIzMmMzNDZl NWFhOWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtMzk2 LDcgKzM5Niw3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0VmlzaWJsZShib29sIHZp c2libGUpCiAKICAgICAvLyBSZXNldCB0aGUgZGFtYWdlIHRyYWNrZXIgYmVjYXVzZSB0aGUgZnJv bnQvYmFjayBidWZmZXJzIG1heSBoYXZlIGJlZW4gZGFtYWdlZCBieSB0aGUgR1BVCiAgICAgLy8g cHJvY2VzcyBvbiB2aXNpYmlsaXR5IGNoYW5nZS4KLSAgICBpZiAodmlzaWJsZSAmJiBtX2xheWVy UmVuZGVyZXItPmNhcGFiaWxpdGllcygpLnVzaW5nUGFydGlhbFN3YXApCisgICAgaWYgKHZpc2li bGUgJiYgbV9sYXllclJlbmRlcmVyICYmIG1fbGF5ZXJSZW5kZXJlci0+Y2FwYWJpbGl0aWVzKCku dXNpbmdQYXJ0aWFsU3dhcCkKICAgICAgICAgc2V0RnVsbFJvb3RMYXllckRhbWFnZSgpOwogfQog CkBAIC00MTEsNiArNDExLDEwIEBAIGJvb2wgQ0NMYXllclRyZWVIb3N0SW1wbDo6aW5pdGlhbGl6 ZUxheWVyUmVuZGVyZXIoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4KICAgICB9CiAKICAg ICBtX2xheWVyUmVuZGVyZXIgPSBsYXllclJlbmRlcmVyLnJlbGVhc2UoKTsKKworICAgIGlmICgh bV92aXNpYmxlKQorICAgICAgICBsYXllclJlbmRlcmVyLT5zZXRWaXNpYmxlKG1fdmlzaWJsZSk7 CisKICAgICByZXR1cm4gbV9sYXllclJlbmRlcmVyOwogfQogCg== 130804 2012-03-08 03:47:14 -0800 2012-03-08 14:30:20 -0800 null check during initialize bug-80584-20120308034713.patch text/plain 3308 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVjYjhkYWVjMjViNDA2 OTZhZDA2YTEyNGI0NTYxZjM5YzQ4YzMyNy4uNzRhZGUwODQzMDM0MGE3OTQyZTc4NWY5NWI2ZGFi NzNlZDA0M2E5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTA4ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFBhc3Mgc2V0 VmlzaWJpbGl0eSB0byBDQ0xheWVyVHJlZUhvc3RJbXBsIHJlZ2FyZGxlc3Mgb2YgTFJDIGluaXRp YWxpemF0aW9uIHN0YXR1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODA1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6OnNldFZpc2libGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpkaWRCZWNvbWVJbnZpc2libGVPbkltcGxU aHJlYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6 c2V0VmlzaWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjppbml0 aWFsaXplTGF5ZXJSZW5kZXJlcik6CisKIDIwMTItMDMtMDggIFJvYmluIENhbyAgPHJvYmluLmNh b0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwc3RyZWFtIEdy YXBoaWNzTGF5ZXJCbGFja0JlcnJ5LntoLCBjcHB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 LmNwcAppbmRleCA4YjM0YjFjYWZmMWRiMTYzZWRlM2U4YjRhMTY2ZjZjMDA2ZDkzZmZjLi44NjJl ZDM5NDcxMmM0ZjZjNjg1NWYzNzI3NDVmMTQ2ZjY5NjE4OWQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5jcHAKQEAgLTM1MiwxMCArMzUyLDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6 OnNldFZpc2libGUoYm9vbCB2aXNpYmxlKQogCiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIAot ICAgIGlmICghbV9sYXllclJlbmRlcmVySW5pdGlhbGl6ZWQpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGlmICghdmlzaWJsZSkgeworICAgIGlmICghdmlzaWJsZSAmJiBtX2xheWVyUmVuZGVyZXJJ bml0aWFsaXplZCkgewogICAgICAgICBtX2NvbnRlbnRzVGV4dHVyZU1hbmFnZXItPnJlZHVjZU1l bW9yeVRvTGltaXQoVGV4dHVyZU1hbmFnZXI6Omxvd0xpbWl0Qnl0ZXModmlld3BvcnRTaXplKCkp KTsKICAgICAgICAgbV9jb250ZW50c1RleHR1cmVNYW5hZ2VyLT51bnByb3RlY3RBbGxUZXh0dXJl cygpOwogICAgIH0KQEAgLTM2OSw2ICszNjYsOSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6c2V0 VmlzaWJsZShib29sIHZpc2libGUpCiB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZGlkQmVjb21lSW52 aXNpYmxlT25JbXBsVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGhvc3RJbXBsKQogewogICAg IEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7CisgICAgaWYgKCFtX2xheWVyUmVuZGVy ZXJJbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fcHJveHktPmxheWVy UmVuZGVyZXJDYXBhYmlsaXRpZXMoKS5jb250ZXh0SGFzQ2FjaGVkRnJvbnRCdWZmZXIpCiAgICAg ICAgIGNvbnRlbnRzVGV4dHVyZU1hbmFnZXIoKS0+ZXZpY3RBbmREZWxldGVBbGxUZXh0dXJlcyho b3N0SW1wbC0+Y29udGVudHNUZXh0dXJlQWxsb2NhdG9yKCkpOwogICAgIGVsc2UgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCA5MjVjOGNjNGMwNjYxMmQ0MTUy ZjA5OWFkNzI2MDhhMzc4MjBjODBhLi40NDEzYzBlYzY0MjI4Y2NhYjhkYWJmYTdkZTRkM2UzZGVl YzIzYTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtMzk2 LDcgKzM5Niw3IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbDo6c2V0VmlzaWJsZShib29sIHZp c2libGUpCiAKICAgICAvLyBSZXNldCB0aGUgZGFtYWdlIHRyYWNrZXIgYmVjYXVzZSB0aGUgZnJv bnQvYmFjayBidWZmZXJzIG1heSBoYXZlIGJlZW4gZGFtYWdlZCBieSB0aGUgR1BVCiAgICAgLy8g cHJvY2VzcyBvbiB2aXNpYmlsaXR5IGNoYW5nZS4KLSAgICBpZiAodmlzaWJsZSAmJiBtX2xheWVy UmVuZGVyZXItPmNhcGFiaWxpdGllcygpLnVzaW5nUGFydGlhbFN3YXApCisgICAgaWYgKHZpc2li bGUgJiYgbV9sYXllclJlbmRlcmVyICYmIG1fbGF5ZXJSZW5kZXJlci0+Y2FwYWJpbGl0aWVzKCku dXNpbmdQYXJ0aWFsU3dhcCkKICAgICAgICAgc2V0RnVsbFJvb3RMYXllckRhbWFnZSgpOwogfQog CkBAIC00MTEsNiArNDExLDEwIEBAIGJvb2wgQ0NMYXllclRyZWVIb3N0SW1wbDo6aW5pdGlhbGl6 ZUxheWVyUmVuZGVyZXIoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4KICAgICB9CiAKICAg ICBtX2xheWVyUmVuZGVyZXIgPSBsYXllclJlbmRlcmVyLnJlbGVhc2UoKTsKKworICAgIGlmICgh bV92aXNpYmxlICYmIG1fbGF5ZXJSZW5kZXJlcikKKyAgICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+ c2V0VmlzaWJsZShtX3Zpc2libGUpOworCiAgICAgcmV0dXJuIG1fbGF5ZXJSZW5kZXJlcjsKIH0K IAo= 130907 2012-03-08 14:30:23 -0800 2012-03-08 19:52:41 -0800 Normalize SingleThreadProxy behavior also bug-80584-20120308143022.patch text/plain 4136 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVjYjhkYWVjMjViNDA2 OTZhZDA2YTEyNGI0NTYxZjM5YzQ4YzMyNy4uNzRhZGUwODQzMDM0MGE3OTQyZTc4NWY5NWI2ZGFi NzNlZDA0M2E5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTA4ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFBhc3Mgc2V0 VmlzaWJpbGl0eSB0byBDQ0xheWVyVHJlZUhvc3RJbXBsIHJlZ2FyZGxlc3Mgb2YgTFJDIGluaXRp YWxpemF0aW9uIHN0YXR1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODA1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6OnNldFZpc2libGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0OjpkaWRCZWNvbWVJbnZpc2libGVPbkltcGxU aHJlYWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdEltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbDo6 c2V0VmlzaWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsOjppbml0 aWFsaXplTGF5ZXJSZW5kZXJlcik6CisKIDIwMTItMDMtMDggIFJvYmluIENhbyAgPHJvYmluLmNh b0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVwc3RyZWFtIEdy YXBoaWNzTGF5ZXJCbGFja0JlcnJ5LntoLCBjcHB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 LmNwcAppbmRleCA4YjM0YjFjYWZmMWRiMTYzZWRlM2U4YjRhMTY2ZjZjMDA2ZDkzZmZjLi44NjJl ZDM5NDcxMmM0ZjZjNjg1NWYzNzI3NDVmMTQ2ZjY5NjE4OWQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5jcHAKQEAgLTM1MiwxMCArMzUyLDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6 OnNldFZpc2libGUoYm9vbCB2aXNpYmxlKQogCiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIAot ICAgIGlmICghbV9sYXllclJlbmRlcmVySW5pdGlhbGl6ZWQpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGlmICghdmlzaWJsZSkgeworICAgIGlmICghdmlzaWJsZSAmJiBtX2xheWVyUmVuZGVyZXJJ bml0aWFsaXplZCkgewogICAgICAgICBtX2NvbnRlbnRzVGV4dHVyZU1hbmFnZXItPnJlZHVjZU1l bW9yeVRvTGltaXQoVGV4dHVyZU1hbmFnZXI6Omxvd0xpbWl0Qnl0ZXModmlld3BvcnRTaXplKCkp KTsKICAgICAgICAgbV9jb250ZW50c1RleHR1cmVNYW5hZ2VyLT51bnByb3RlY3RBbGxUZXh0dXJl cygpOwogICAgIH0KQEAgLTM2OSw2ICszNjYsOSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6c2V0 VmlzaWJsZShib29sIHZpc2libGUpCiB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6ZGlkQmVjb21lSW52 aXNpYmxlT25JbXBsVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqIGhvc3RJbXBsKQogewogICAg IEFTU0VSVChDQ1Byb3h5Ojppc0ltcGxUaHJlYWQoKSk7CisgICAgaWYgKCFtX2xheWVyUmVuZGVy ZXJJbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fcHJveHktPmxheWVy UmVuZGVyZXJDYXBhYmlsaXRpZXMoKS5jb250ZXh0SGFzQ2FjaGVkRnJvbnRCdWZmZXIpCiAgICAg ICAgIGNvbnRlbnRzVGV4dHVyZU1hbmFnZXIoKS0+ZXZpY3RBbmREZWxldGVBbGxUZXh0dXJlcyho b3N0SW1wbC0+Y29udGVudHNUZXh0dXJlQWxsb2NhdG9yKCkpOwogICAgIGVsc2UgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAppbmRleCA5MjVjOGNjNGMwNjYxMmQ0MTUy ZjA5OWFkNzI2MDhhMzc4MjBjODBhLi45MTEzYTUwNDFhOGNjMWZmZjI1ZjkxMzZjMzdmN2I3YmQx OTI1YWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcApAQCAtMzkx LDggKzM5MSwxMCBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdEltcGw6OnNldFZpc2libGUoYm9vbCB2 aXNpYmxlKQogICAgICAgICByZXR1cm47CiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIAotICAg IGlmIChtX2xheWVyUmVuZGVyZXIpCi0gICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+c2V0VmlzaWJs ZSh2aXNpYmxlKTsKKyAgICBpZiAoIW1fbGF5ZXJSZW5kZXJlcikKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9sYXllclJlbmRlcmVyLT5zZXRWaXNpYmxlKHZpc2libGUpOwogCiAgICAgLy8gUmVz ZXQgdGhlIGRhbWFnZSB0cmFja2VyIGJlY2F1c2UgdGhlIGZyb250L2JhY2sgYnVmZmVycyBtYXkg aGF2ZSBiZWVuIGRhbWFnZWQgYnkgdGhlIEdQVQogICAgIC8vIHByb2Nlc3Mgb24gdmlzaWJpbGl0 eSBjaGFuZ2UuCkBAIC00MTEsNiArNDEzLDEwIEBAIGJvb2wgQ0NMYXllclRyZWVIb3N0SW1wbDo6 aW5pdGlhbGl6ZUxheWVyUmVuZGVyZXIoUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4KICAg ICB9CiAKICAgICBtX2xheWVyUmVuZGVyZXIgPSBsYXllclJlbmRlcmVyLnJlbGVhc2UoKTsKKwor ICAgIGlmICghbV92aXNpYmxlICYmIG1fbGF5ZXJSZW5kZXJlcikKKyAgICAgICAgIG1fbGF5ZXJS ZW5kZXJlci0+c2V0VmlzaWJsZShtX3Zpc2libGUpOworCiAgICAgcmV0dXJuIG1fbGF5ZXJSZW5k ZXJlcjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NTaW5nbGVUaHJlYWRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NpbmdsZVRocmVhZFByb3h5LmNwcAppbmRleCA0 MGYwM2IyZDZkYjFhYmI5YzlkNTg2NzExOWFiNTEwNWQ1NTZjNjZlLi5lMDk4ZTZhNTYyNDYyZjY1 MTY3N2I4MjNiOTA0NzFmMmEyM2MyODRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NpbmdsZVRocmVhZFByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NpbmdsZVRocmVh ZFByb3h5LmNwcApAQCAtMjM2LDEyICsyMzYsMTQgQEAgdm9pZCBDQ1NpbmdsZVRocmVhZFByb3h5 OjpzZXROZWVkc1JlZHJhdygpCiAKIHZvaWQgQ0NTaW5nbGVUaHJlYWRQcm94eTo6c2V0VmlzaWJs ZShib29sIHZpc2libGUpCiB7CisgICAgbV9sYXllclRyZWVIb3N0SW1wbC0+c2V0VmlzaWJsZSh2 aXNpYmxlKTsKKwogICAgIGlmICghdmlzaWJsZSkgewogICAgICAgICBEZWJ1Z1Njb3BlZFNldElt cGxUaHJlYWQgaW1wbDsKICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5kaWRCZWNvbWVJbnZpc2li bGVPbkltcGxUaHJlYWQobV9sYXllclRyZWVIb3N0SW1wbC5nZXQoKSk7Ci0gICAgICAgIG1fbGF5 ZXJUcmVlSG9zdEltcGwtPnNldFZpc2libGUoZmFsc2UpOwogICAgICAgICByZXR1cm47CiAgICAg fQorCiAgICAgc2V0TmVlZHNDb21taXQoKTsKIH0KIAo=