111630 2013-03-06 14:49:32 -0800 [texmap] Remove direct access to clip state from clip stack 2013-03-07 07:28:02 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111566 1 bruno.abinader bruno.abinader allan.jensen cmarcelo igor.oliveira kalyan.kondapally luiz noam tonikitoo webkit.review.bot oldest_to_newest 849325 0 bruno.abinader 2013-03-06 14:49:32 -0800 As we are now monitoring the clip state from TextureMapperGL/BitmapTextureGL, have direct access to clip state object would eventually make it dirty without properly setting the 'clipStateDirty' flag. This bug intends to substitute direct access with auxiliary functions which would set the clip state dirty when necessary. 849327 1 191836 bruno.abinader 2013-03-06 14:54:09 -0800 Created attachment 191836 Patch Proposed patch 850048 2 191988 bruno.abinader 2013-03-07 06:54:57 -0800 Created attachment 191988 Patch Rebased patch after changes from r145071 850052 3 191988 allan.jensen 2013-03-07 07:04:13 -0800 Comment on attachment 191988 Patch LGTM 850069 4 191988 webkit.review.bot 2013-03-07 07:27:58 -0800 Comment on attachment 191988 Patch Clearing flags on attachment: 191988 Committed r145073: <http://trac.webkit.org/changeset/145073> 850070 5 webkit.review.bot 2013-03-07 07:28:02 -0800 All reviewed patches have been landed. Closing bug. 191836 2013-03-06 14:54:09 -0800 2013-03-07 06:54:51 -0800 Patch bug-111630-20130306185013.patch text/plain 5372 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMzZmJjOTU4MTMzZjlh MjIxZDQ3OTNkMjhjNzQwOTVjMDA5Zjc0MS4uZTQ3MzZkYzdiMzU1OTY2NDk4ZDYzY2IzOGNmZjNl YmZmMGQ2MjJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAzLTA2ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBbdGV4bWFwXSBSZW1vdmUgZGlyZWN0IGFjY2VzcyB0byBjbGlwIHN0YXRlIGZyb20g Y2xpcCBzdGFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTExNjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQXMgd2UgYXJlIG5vdyBtb25pdG9yaW5nIHRoZSBjbGlwIHN0YXRlIGZyb20KKyAgICAgICAg VGV4dHVyZU1hcHBlckdML0JpdG1hcFRleHR1cmVHTCwgaGF2ZSBkaXJlY3QgYWNjZXNzIHRvIGNs aXAgc3RhdGUgb2JqZWN0CisgICAgICAgIHdvdWxkIGV2ZW50dWFsbHkgbWFrZSBpdCBkaXJ0eSB3 aXRob3V0IHByb3Blcmx5IHNldHRpbmcgdGhlCisgICAgICAgICdjbGlwU3RhdGVEaXJ0eScgZmxh Zy4gVGhpcyBidWcgaW50ZW5kcyB0byBzdWJzdGl0dXRlIGRpcmVjdCBhY2Nlc3Mgd2l0aAorICAg ICAgICBhdXhpbGlhcnkgZnVuY3Rpb25zIHdoaWNoIHdvdWxkIHNldCB0aGUgY2xpcCBzdGF0ZSBk aXJ0eSB3aGVuIG5lY2Vzc2FyeS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIHVzZXIgdmlz aWJsZSBiZWhhdmlvciBjaGFuZ2VkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVy R0w6OkNsaXBTdGFjazo6aW50ZXJzZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6Q2xpcFN0YWNrOjpzZXRTdGVuY2lsSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckdMOjpkcmF3Qm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6ZHJhd1RleHR1cmUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpi ZWdpblNjaXNzb3JDbGlwKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6YmVn aW5DbGlwKToKKyAgICAgICAgUmVwbGFjZWQgZGlyZWN0IGFjY2VzcyB3aXRoIGF1eGlsaWFyeSBm dW5jdGlvbnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmg6CisgICAgICAgIChDbGlwU3RhY2spOiBSZW1vdmVkIENsaXBTdGFjazo6Y3VycmVu dCgpIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3Rh Y2s6OmdldFN0ZW5jaWxJbmRleCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1h cHBlckdMOjpDbGlwU3RhY2s6OmlzQ3VycmVudFNjaXNzb3JCb3hFbXB0eSk6IEFkZGVkLgorCiAy MDEzLTAzLTA1ICBQZXRlciBOZWxzb24gIDxwZXRlckBwZXRlcmRuLmNvbT4KIAogICAgICAgICBb V2luQ2Fpcm9dIFN1cHBvcnQgZm9yIGNvb2tpZXMgaXMgaW5jb21wbGV0ZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckdMLmNwcAppbmRleCBkYzk3Zjg5OTdjYzk0ZGI5YzA2NTdmNzJmN2E3MzczYzFiNjI1NTFlLi4w MjI2MjNjODMyMjk0YTQ3MmMyNzMzZDg5YmMwOGYwNTJmMjA0YmZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckdMLmNwcApAQCAtMTgyLDYgKzE4MiwxOCBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0 YWNrOjpyZXNldChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1 ZTsKIH0KIAordm9pZCBUZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6aW50ZXJzZWN0KGNvbnN0 IEludFJlY3QmIHJlY3QpCit7CisgICAgY2xpcFN0YXRlLnNjaXNzb3JCb3guaW50ZXJzZWN0KHJl Y3QpOworICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1ZTsKK30KKwordm9pZCBUZXh0dXJlTWFwcGVy R0w6OkNsaXBTdGFjazo6c2V0U3RlbmNpbEluZGV4KGludCBzdGVuY2lsSW5kZXgpCit7CisgICAg Y2xpcFN0YXRlLnN0ZW5jaWxJbmRleCA9IHN0ZW5jaWxJbmRleDsKKyAgICBjbGlwU3RhdGVEaXJ0 eSA9IHRydWU7Cit9CisKIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnB1c2goKQog ewogICAgIGNsaXBTdGFjay5hcHBlbmQoY2xpcFN0YXRlKTsKQEAgLTMxNCw3ICszMjYsNyBAQCB2 b2lkIFRleHR1cmVNYXBwZXJHTDo6ZW5kUGFpbnRpbmcoKQogCiB2b2lkIFRleHR1cmVNYXBwZXJH TDo6ZHJhd0JvcmRlcihjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IHdpZHRoLCBjb25zdCBGbG9h dFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBtb2RlbFZpZXdN YXRyaXgpCiB7Ci0gICAgaWYgKGNsaXBTdGFjaygpLmN1cnJlbnQoKS5zY2lzc29yQm94LmlzRW1w dHkoKSkKKyAgICBpZiAoY2xpcFN0YWNrKCkuaXNDdXJyZW50U2Npc3NvckJveEVtcHR5KCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4g cHJvZ3JhbSA9IGRhdGEoKS5zaGFyZWRHTERhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKFRleHR1cmVN YXBwZXJTaGFkZXJQcm9ncmFtOjpTb2xpZENvbG9yKTsKQEAgLTQwNiw3ICs0MTgsNyBAQCB2b2lk IFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmUoY29uc3QgQml0bWFwVGV4dHVyZSYgdGV4dHVy ZSwgY29uc3QgRmxvYXRSZWN0JgogICAgIGlmICghdGV4dHVyZS5pc1ZhbGlkKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGlmIChjbGlwU3RhY2soKS5jdXJyZW50KCkuc2Npc3NvckJveC5pc0Vt cHR5KCkpCisgICAgaWYgKGNsaXBTdGFjaygpLmlzQ3VycmVudFNjaXNzb3JCb3hFbXB0eSgpKQog ICAgICAgICByZXR1cm47CiAKICAgICBjb25zdCBCaXRtYXBUZXh0dXJlR0wmIHRleHR1cmVHTCA9 IHN0YXRpY19jYXN0PGNvbnN0IEJpdG1hcFRleHR1cmVHTCY+KHRleHR1cmUpOwpAQCAtMTEyMyw3 ICsxMTM1LDcgQEAgYm9vbCBUZXh0dXJlTWFwcGVyR0w6OmJlZ2luU2Npc3NvckNsaXAoY29uc3Qg VHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHIKICAgICBpZiAoIXF1YWQuaXNSZWN0 aWxpbmVhcigpIHx8IHJlY3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBjbGlwU3RhY2soKS5jdXJyZW50KCkuc2Npc3NvckJveC5pbnRlcnNlY3QocmVjdCk7CisgICAg Y2xpcFN0YWNrKCkuaW50ZXJzZWN0KHJlY3QpOwogICAgIGNsaXBTdGFjaygpLmFwcGx5KG1fY29u dGV4dDNELmdldCgpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTExNDgsNyArMTE2MCw3IEBA IHZvaWQgVGV4dHVyZU1hcHBlckdMOjpiZWdpbkNsaXAoY29uc3QgVHJhbnNmb3JtYXRpb25NYXRy aXgmIG1vZGVsVmlld01hdHJpeCwgY29uCiAKICAgICBzdGF0aWMgY29uc3QgVHJhbnNmb3JtYXRp b25NYXRyaXggZnVsbFByb2plY3Rpb25NYXRyaXggPSBUcmFuc2Zvcm1hdGlvbk1hdHJpeDo6cmVj dFRvUmVjdChGbG9hdFJlY3QoMCwgMCwgMSwgMSksIEZsb2F0UmVjdCgtMSwgLTEsIDIsIDIpKTsK IAotICAgIGludCYgc3RlbmNpbEluZGV4ID0gY2xpcFN0YWNrKCkuY3VycmVudCgpLnN0ZW5jaWxJ bmRleDsKKyAgICBpbnQgc3RlbmNpbEluZGV4ID0gY2xpcFN0YWNrKCkuZ2V0U3RlbmNpbEluZGV4 KCk7CiAKICAgICBtX2NvbnRleHQzRC0+ZW5hYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lM X1RFU1QpOwogCkBAIC0xMTc1LDcgKzExODcsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6YmVn aW5DbGlwKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBtb2RlbFZpZXdNYXRyaXgsIGNvbgog ICAgIG1fY29udGV4dDNELT5zdGVuY2lsTWFzaygwKTsKIAogICAgIC8vIEluY3JlYXNlIHN0ZW5j aWxJbmRleCBhbmQgYXBwbHkgc3RlbmNpbCB0ZXN0aW5nLgotICAgIHN0ZW5jaWxJbmRleCAqPSAy OworICAgIGNsaXBTdGFjaygpLnNldFN0ZW5jaWxJbmRleChzdGVuY2lsSW5kZXggKiAyKTsKICAg ICBjbGlwU3RhY2soKS5hcHBseShtX2NvbnRleHQzRC5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy R0wuaAppbmRleCAzNDE2MzU1NGY2MjJjMDMzZjBlMDg4MzhhOWNjNGFjNjEwNjU0YmJhLi45ZjZl MWM2OWNlYTYwMDQ4Mjk5YmRjZDA0MDdhYWYwYjIxMDY5NWZhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5o CkBAIC05OCw2ICs5OCwxNiBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIGFwcGx5KEdyYXBoaWNz Q29udGV4dDNEKik7CiAgICAgICAgIGlubGluZSBDbGlwU3RhdGUmIGN1cnJlbnQoKSB7IHJldHVy biBjbGlwU3RhdGU7IH0KICAgICAgICAgdm9pZCByZXNldChjb25zdCBJbnRSZWN0Jik7CisgICAg ICAgIHZvaWQgaW50ZXJzZWN0KGNvbnN0IEludFJlY3QmKTsKKyAgICAgICAgdm9pZCBzZXRTdGVu Y2lsSW5kZXgoaW50KTsKKyAgICAgICAgaW5saW5lIGludCBnZXRTdGVuY2lsSW5kZXgoKSBjb25z dAorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gY2xpcFN0YXRlLnN0ZW5jaWxJbmRleDsK KyAgICAgICAgfQorICAgICAgICBpbmxpbmUgYm9vbCBpc0N1cnJlbnRTY2lzc29yQm94RW1wdHko KSBjb25zdAorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gY2xpcFN0YXRlLnNjaXNzb3JC b3guaXNFbXB0eSgpOworICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBDbGlwU3Rh dGUgY2xpcFN0YXRlOwo= 191988 2013-03-07 06:54:57 -0800 2013-03-07 07:27:58 -0800 Patch bug-111630-20130307105100.patch text/plain 5488 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzJlNjhjNGFhOGIxOWZl OTMxZGVjNDJmNzhhY2I3MjZlMDA0YTk2Ni4uNjQwYzMyMWMwNTc0YTMwZDU4ZWIxMDkzNzliZjZh M2E4NWJiMDA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDEzLTAzLTA3ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KIAor ICAgICAgICBbdGV4bWFwXSBSZW1vdmUgZGlyZWN0IGFjY2VzcyB0byBjbGlwIHN0YXRlIGZyb20g Y2xpcCBzdGFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTExNjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQXMgd2UgYXJlIG5vdyBtb25pdG9yaW5nIHRoZSBjbGlwIHN0YXRlIGZyb20KKyAgICAgICAg VGV4dHVyZU1hcHBlckdML0JpdG1hcFRleHR1cmVHTCwgaGF2ZSBkaXJlY3QgYWNjZXNzIHRvIGNs aXAgc3RhdGUgb2JqZWN0CisgICAgICAgIHdvdWxkIGV2ZW50dWFsbHkgbWFrZSBpdCBkaXJ0eSB3 aXRob3V0IHByb3Blcmx5IHNldHRpbmcgdGhlCisgICAgICAgICdjbGlwU3RhdGVEaXJ0eScgZmxh Zy4gVGhpcyBidWcgaW50ZW5kcyB0byBzdWJzdGl0dXRlIGRpcmVjdCBhY2Nlc3Mgd2l0aAorICAg ICAgICBhdXhpbGlhcnkgZnVuY3Rpb25zIHdoaWNoIHdvdWxkIHNldCB0aGUgY2xpcCBzdGF0ZSBk aXJ0eSB3aGVuIG5lY2Vzc2FyeS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIHVzZXIgdmlz aWJsZSBiZWhhdmlvciBjaGFuZ2VkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVy R0w6OkNsaXBTdGFjazo6aW50ZXJzZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6Q2xpcFN0YWNrOjpzZXRTdGVuY2lsSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckdMOjpkcmF3Qm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJHTDo6ZHJhd1RleHR1cmUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpi ZWdpblNjaXNzb3JDbGlwKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6YmVn aW5DbGlwKToKKyAgICAgICAgUmVwbGFjZWQgZGlyZWN0IGFjY2VzcyB3aXRoIGF1eGlsaWFyeSBm dW5jdGlvbnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmg6CisgICAgICAgIChDbGlwU3RhY2spOiBSZW1vdmVkIENsaXBTdGFjazo6Y3VycmVu dCgpIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpDbGlwU3Rh Y2s6OmdldFN0ZW5jaWxJbmRleCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1h cHBlckdMOjpDbGlwU3RhY2s6OmlzQ3VycmVudFNjaXNzb3JCb3hFbXB0eSk6IEFkZGVkLgorCisy MDEzLTAzLTA3ICBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJh c3lza29tLmNvbT4KKwogICAgICAgICBbVGV4dHVyZW1hcHBlcl0gdHJhbnNmb3JtLXN0eWxlICdm bGF0JyB2YWx1ZSBpcyBicm9rZW4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMTU2NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDI3NDkwYjYy YzVlYjIwOTViODdlZDFmNzgxZjdlMTUyOWMzYWVkZTYuLjE1NTRmMDA4Mjk1NDI2OWRkYTFlMWJl NTNjOWU2NzA4NDc0YTA4MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0xODIsNiArMTgy LDE4IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpDbGlwU3RhY2s6OnJlc2V0KGNvbnN0IEludFJl Y3QmIHJlY3QpCiAgICAgY2xpcFN0YXRlRGlydHkgPSB0cnVlOwogfQogCit2b2lkIFRleHR1cmVN YXBwZXJHTDo6Q2xpcFN0YWNrOjppbnRlcnNlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAg ICBjbGlwU3RhdGUuc2Npc3NvckJveC5pbnRlcnNlY3QocmVjdCk7CisgICAgY2xpcFN0YXRlRGly dHkgPSB0cnVlOworfQorCit2b2lkIFRleHR1cmVNYXBwZXJHTDo6Q2xpcFN0YWNrOjpzZXRTdGVu Y2lsSW5kZXgoaW50IHN0ZW5jaWxJbmRleCkKK3sKKyAgICBjbGlwU3RhdGUuc3RlbmNpbEluZGV4 ID0gc3RlbmNpbEluZGV4OworICAgIGNsaXBTdGF0ZURpcnR5ID0gdHJ1ZTsKK30KKwogdm9pZCBU ZXh0dXJlTWFwcGVyR0w6OkNsaXBTdGFjazo6cHVzaCgpCiB7CiAgICAgY2xpcFN0YWNrLmFwcGVu ZChjbGlwU3RhdGUpOwpAQCAtMzE5LDcgKzMzMSw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpl bmRQYWludGluZygpCiAKIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3Qm9yZGVyKGNvbnN0IENv bG9yJiBjb2xvciwgZmxvYXQgd2lkdGgsIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0UmVjdCwgY29u c3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCkKIHsKLSAgICBpZiAoY2xp cFN0YWNrKCkuY3VycmVudCgpLnNjaXNzb3JCb3guaXNFbXB0eSgpKQorICAgIGlmIChjbGlwU3Rh Y2soKS5pc0N1cnJlbnRTY2lzc29yQm94RW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg UmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBwcm9ncmFtID0gZGF0YSgpLnNoYXJl ZEdMRGF0YSgpLmdldFNoYWRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06OlNv bGlkQ29sb3IpOwpAQCAtNDExLDcgKzQyMyw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3 VGV4dHVyZShjb25zdCBCaXRtYXBUZXh0dXJlJiB0ZXh0dXJlLCBjb25zdCBGbG9hdFJlY3QmCiAg ICAgaWYgKCF0ZXh0dXJlLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGNs aXBTdGFjaygpLmN1cnJlbnQoKS5zY2lzc29yQm94LmlzRW1wdHkoKSkKKyAgICBpZiAoY2xpcFN0 YWNrKCkuaXNDdXJyZW50U2Npc3NvckJveEVtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IGNvbnN0IEJpdG1hcFRleHR1cmVHTCYgdGV4dHVyZUdMID0gc3RhdGljX2Nhc3Q8Y29uc3QgQml0 bWFwVGV4dHVyZUdMJj4odGV4dHVyZSk7CkBAIC0xMTI4LDcgKzExNDAsNyBAQCBib29sIFRleHR1 cmVNYXBwZXJHTDo6YmVnaW5TY2lzc29yQ2xpcChjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYg bW9kZWxWaWV3TWF0cgogICAgIGlmICghcXVhZC5pc1JlY3RpbGluZWFyKCkgfHwgcmVjdC5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNsaXBTdGFjaygpLmN1cnJlbnQo KS5zY2lzc29yQm94LmludGVyc2VjdChyZWN0KTsKKyAgICBjbGlwU3RhY2soKS5pbnRlcnNlY3Qo cmVjdCk7CiAgICAgY2xpcFN0YWNrKCkuYXBwbHlJZk5lZWRlZChtX2NvbnRleHQzRC5nZXQoKSk7 CiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0xMTUzLDcgKzExNjUsNyBAQCB2b2lkIFRleHR1cmVN YXBwZXJHTDo6YmVnaW5DbGlwKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBtb2RlbFZpZXdN YXRyaXgsIGNvbgogCiAgICAgc3RhdGljIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4IGZ1bGxQ cm9qZWN0aW9uTWF0cml4ID0gVHJhbnNmb3JtYXRpb25NYXRyaXg6OnJlY3RUb1JlY3QoRmxvYXRS ZWN0KDAsIDAsIDEsIDEpLCBGbG9hdFJlY3QoLTEsIC0xLCAyLCAyKSk7CiAKLSAgICBpbnQmIHN0 ZW5jaWxJbmRleCA9IGNsaXBTdGFjaygpLmN1cnJlbnQoKS5zdGVuY2lsSW5kZXg7CisgICAgaW50 IHN0ZW5jaWxJbmRleCA9IGNsaXBTdGFjaygpLmdldFN0ZW5jaWxJbmRleCgpOwogCiAgICAgbV9j b250ZXh0M0QtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9URVNUKTsKIApAQCAt MTE4MCw3ICsxMTkyLDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OmJlZ2luQ2xpcChjb25zdCBU cmFuc2Zvcm1hdGlvbk1hdHJpeCYgbW9kZWxWaWV3TWF0cml4LCBjb24KICAgICBtX2NvbnRleHQz RC0+c3RlbmNpbE1hc2soMCk7CiAKICAgICAvLyBJbmNyZWFzZSBzdGVuY2lsSW5kZXggYW5kIGFw cGx5IHN0ZW5jaWwgdGVzdGluZy4KLSAgICBzdGVuY2lsSW5kZXggKj0gMjsKKyAgICBjbGlwU3Rh Y2soKS5zZXRTdGVuY2lsSW5kZXgoc3RlbmNpbEluZGV4ICogMik7CiAgICAgY2xpcFN0YWNrKCku YXBwbHlJZk5lZWRlZChtX2NvbnRleHQzRC5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaApp bmRleCBiM2ExNDk4MTE0Y2ExNjBkMzRmMmIzOTNjM2MxNDI0ZGY1ZTNiZjNlLi42OGEwYjlmYTky ZWIxZjAwNzUyYzI1MTQ2MzFkMzcyODg1M2VmN2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oCkBAIC05 OSw2ICs5OSwxNiBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIGFwcGx5SWZOZWVkZWQoR3JhcGhp Y3NDb250ZXh0M0QqKTsKICAgICAgICAgaW5saW5lIENsaXBTdGF0ZSYgY3VycmVudCgpIHsgcmV0 dXJuIGNsaXBTdGF0ZTsgfQogICAgICAgICB2b2lkIHJlc2V0KGNvbnN0IEludFJlY3QmKTsKKyAg ICAgICAgdm9pZCBpbnRlcnNlY3QoY29uc3QgSW50UmVjdCYpOworICAgICAgICB2b2lkIHNldFN0 ZW5jaWxJbmRleChpbnQpOworICAgICAgICBpbmxpbmUgaW50IGdldFN0ZW5jaWxJbmRleCgpIGNv bnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBjbGlwU3RhdGUuc3RlbmNpbEluZGV4 OworICAgICAgICB9CisgICAgICAgIGlubGluZSBib29sIGlzQ3VycmVudFNjaXNzb3JCb3hFbXB0 eSgpIGNvbnN0CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBjbGlwU3RhdGUuc2Npc3Nv ckJveC5pc0VtcHR5KCk7CisgICAgICAgIH0KIAogICAgIHByaXZhdGU6CiAgICAgICAgIENsaXBT dGF0ZSBjbGlwU3RhdGU7Cg==