125572 2013-12-11 06:31:55 -0800 [EFL] Fix build with CONTEXT_MENUS flag set OFF 2013-12-11 08:07:15 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 958697 0 mpakulavelrutka 2013-12-11 06:31:55 -0800 SSIA 958698 1 218958 mpakulavelrutka 2013-12-11 06:37:47 -0800 Created attachment 218958 proposed patch 958700 2 218958 gyuyoung.kim 2013-12-11 06:48:42 -0800 Comment on attachment 218958 proposed patch Though this patch modifies files out of EFL port files, this patch looks reasonable. r=me. 958732 3 218958 commit-queue 2013-12-11 08:07:12 -0800 Comment on attachment 218958 proposed patch Clearing flags on attachment: 218958 Committed r160432: <http://trac.webkit.org/changeset/160432> 958733 4 commit-queue 2013-12-11 08:07:15 -0800 All reviewed patches have been landed. Closing bug. 218958 2013-12-11 06:37:47 -0800 2013-12-11 08:07:12 -0800 proposed patch contextmenusoff.diff text/plain 10413 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NDUxMmJkLi5iZDVkOTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMTItMTEgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXSBGaXggYnVpbGQgd2l0aCBDT05URVhUX01FTlVTIGZs YWcgc2V0IE9GRgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI1NTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgZGlzcGF0Y2hFdmVudEFzQ29udGV4dE1lbnVFdmVudCBpcyBjYWxsZWQgcmVnYXJkbGVzcyBv ZiBDT05URVhUX01FTlVTIGZsYWcgc2V0dGluZywKKyAgICAgICAgdGh1cyBpdHMgZGVmaW5pdGlv biBpbiBJbnNwZWN0b3JGcm9udGVuZEhvc3Qgc2hvdWxkIG5vdCBiZSBndWFyZGVkIGJ5IHRoaXMg ZmxhZy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW91ciBjaGFuZ2UuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckZyb250ZW5kSG9zdDo6ZGlzcGF0Y2hFdmVudEFzQ29udGV4dE1lbnVF dmVudCk6CisKIDIwMTMtMTItMTEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgog CiAgICAgICAgIFJFR1JFU1NJT04ocjE2MDM4OSk6IFNWRyB0ZXN0IGFzc2VydGlvbiBleHRyYXZh Z2FuemEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZEhvc3QuY3BwCmluZGV4IGJlMjRlMWUuLjA0YzkwMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCkBAIC0yODEsMTAgKzI4MSwx MSBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KEV2ZW50KiBl dmVudCwgY29uc3QgVmVjdG9yPENvbnRleHRNZQogICAgIG1fZnJvbnRlbmRQYWdlLT5jb250ZXh0 TWVudUNvbnRyb2xsZXIoKS5zaG93Q29udGV4dE1lbnUoZXZlbnQsIG1lbnVQcm92aWRlcik7CiAg ICAgbV9tZW51UHJvdmlkZXIgPSBtZW51UHJvdmlkZXIuZ2V0KCk7CiB9CisjZW5kaWYKIAogdm9p ZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmRpc3BhdGNoRXZlbnRBc0NvbnRleHRNZW51RXZlbnQo RXZlbnQqIGV2ZW50KQogewotI2lmIFVTRShBQ0NFU1NJQklMSVRZX0NPTlRFWFRfTUVOVVMpCisj aWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpICYmIFVTRShBQ0NFU1NJQklMSVRZX0NPTlRFWFRfTUVO VVMpCiAgICAgaWYgKCFldmVudCB8fCAhZXZlbnQtPmlzTW91c2VFdmVudCgpKQogICAgICAgICBy ZXR1cm47CiAKQEAgLTI5Nyw3ICsyOTgsNiBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6 ZGlzcGF0Y2hFdmVudEFzQ29udGV4dE1lbnVFdmVudChFdmVudCogZXZlbnQpCiAgICAgVU5VU0VE X1BBUkFNKGV2ZW50KTsKICNlbmRpZgogfQotI2VuZGlmCiAKIFN0cmluZyBJbnNwZWN0b3JGcm9u dGVuZEhvc3Q6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoY29uc3QgU3RyaW5nJiB1cmwpCiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggODllZDc5Mi4uYTE1NzFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDEzLTEyLTExICBNaWNoYcWCIFBha3XFgmEgdmVsIFJ1dGthICA8bS5wYWt1bGFAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gRml4IGJ1aWxkIHdpdGggQ09OVEVYVF9NRU5VUyBm bGFnIHNldCBPRkYKKyAgICAgICAgaHR0cHM6Ly8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjU1NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggRUZMIGJ1aWxkIGJ5IGFkZGluZyBuZWNlc3NhcnkgZ3VhcmQsIGFsc28gVU5VU0VE X1BBUkFNIG1hY3JvcyB3aGVyZSBhZGRlZC4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0Nv bnRleHRNZW51SXRlbS5jcHA6IEFkZGVkIFVOVVNFRF9QQVJBTSBtYWNyb3MuCisgICAgICAgIChX S0NvbnRleHRNZW51SXRlbUNyZWF0ZUFzQWN0aW9uKToKKyAgICAgICAgKFdLQ29udGV4dE1lbnVJ dGVtQ3JlYXRlQXNDaGVja2FibGVBY3Rpb24pOgorICAgICAgICAoV0tDb250ZXh0TWVudUl0ZW1D cmVhdGVBc1N1Ym1lbnUpOgorICAgICAgICAoV0tDb250ZXh0TWVudUl0ZW1HZXRUYWcpOgorICAg ICAgICAoV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKToKKyAgICAgICAgKFdLQ29udGV4dE1lbnVJ dGVtQ29weVRpdGxlKToKKyAgICAgICAgKFdLQ29udGV4dE1lbnVJdGVtR2V0RW5hYmxlZCk6Cisg ICAgICAgIChXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQpOgorICAgICAgICAoV0tDb250ZXh0 TWVudUNvcHlTdWJtZW51SXRlbXMpOgorICAgICAgICAoV0tDb250ZXh0TWVudUl0ZW1HZXRVc2Vy RGF0YSk6CisgICAgICAgIChXS0NvbnRleHRNZW51SXRlbVNldFVzZXJEYXRhKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDogRGl0dG8uCisgICAgICAgIChXS1BhZ2VTZXRQ YWdlQ29udGV4dE1lbnVDbGllbnQpOgorICAgICAgICAoV0tQYWdlU2VsZWN0Q29udGV4dE1lbnVJ dGVtKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZS5jcHA6IERpdHRvLgorICAgICAgICAoV0tCdW5kbGVQYWdlU2V0Q29udGV4dE1lbnVDbGll bnQpOgorICAgICAgICAoV0tCdW5kbGVQYWdlQ2xpY2tNZW51SXRlbSk6CisgICAgICAgIChXS0J1 bmRsZVBhZ2VDb3B5Q29udGV4dE1lbnVJdGVtcyk6CisgICAgICAgIChXS0J1bmRsZVBhZ2VDb3B5 Q29udGV4dE1lbnVBdFBvaW50SW5XaW5kb3cpCisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJW aWV3RWZsLmNwcDogR3VhcmQgY3JlYXRlQ29udGV4dE1lbnVQcm94eSBtZXRob2QuCisgICAgICAg ICogVUlQcm9jZXNzL2VmbC9XZWJWaWV3RWZsLmg6IERpdHRvLgorCiAyMDEzLTEyLTExICBLd2Fu ZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgW1dLMl1bU291cF0g SW1wbGVtZW50IE5ldHdvcmtQcm9jZXNzOjphbGxvd1NwZWNpZmljSFRUUFNDZXJ0aWZpY2F0ZUZv ckhvc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0NvbnRleHRN ZW51SXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tDb250ZXh0TWVudUl0 ZW0uY3BwCmluZGV4IDA1ZWU0YjguLjUzMDY0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvYy9XS0NvbnRleHRNZW51SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0FQSS9jL1dLQ29udGV4dE1lbnVJdGVtLmNwcApAQCAtNTMsNiArNTMsOSBAQCBXS0Nv bnRleHRNZW51SXRlbVJlZiBXS0NvbnRleHRNZW51SXRlbUNyZWF0ZUFzQWN0aW9uKFdLQ29udGV4 dE1lbnVJdGVtVGFnIHRhZywgVwogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQogICAgIHJldHVy biB0b0FQSShXZWJDb250ZXh0TWVudUl0ZW06OmNyZWF0ZShXZWJDb250ZXh0TWVudUl0ZW1EYXRh KEFjdGlvblR5cGUsIHRvSW1wbCh0YWcpLCB0b0ltcGwodGl0bGUpLT5zdHJpbmcoKSwgZW5hYmxl ZCwgZmFsc2UpKS5sZWFrUmVmKCkpOwogI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0odGFnKTsKKyAg ICBVTlVTRURfUEFSQU0odGl0bGUpOworICAgIFVOVVNFRF9QQVJBTShlbmFibGVkKTsKICAgICBy ZXR1cm4gMDsKICNlbmRpZgogfQpAQCAtNjIsNiArNjUsMTAgQEAgV0tDb250ZXh0TWVudUl0ZW1S ZWYgV0tDb250ZXh0TWVudUl0ZW1DcmVhdGVBc0NoZWNrYWJsZUFjdGlvbihXS0NvbnRleHRNZW51 SXRlbVQKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICByZXR1cm4gdG9BUEkoV2ViQ29u dGV4dE1lbnVJdGVtOjpjcmVhdGUoV2ViQ29udGV4dE1lbnVJdGVtRGF0YShDaGVja2FibGVBY3Rp b25UeXBlLCB0b0ltcGwodGFnKSwgdG9JbXBsKHRpdGxlKS0+c3RyaW5nKCksIGVuYWJsZWQsIGNo ZWNrZWQpKS5sZWFrUmVmKCkpOwogI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0odGFnKTsKKyAgICBV TlVTRURfUEFSQU0odGl0bGUpOworICAgIFVOVVNFRF9QQVJBTShlbmFibGVkKTsKKyAgICBVTlVT RURfUEFSQU0oY2hlY2tlZCk7CiAgICAgcmV0dXJuIDA7CiAjZW5kaWYKIH0KQEAgLTcxLDYgKzc4 LDkgQEAgV0tDb250ZXh0TWVudUl0ZW1SZWYgV0tDb250ZXh0TWVudUl0ZW1DcmVhdGVBc1N1Ym1l bnUoV0tTdHJpbmdSZWYgdGl0bGUsIGJvb2wgZW4KICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK ICAgICByZXR1cm4gdG9BUEkoV2ViQ29udGV4dE1lbnVJdGVtOjpjcmVhdGUodG9JbXBsKHRpdGxl KS0+c3RyaW5nKCksIGVuYWJsZWQsIHRvSW1wbChzdWJtZW51SXRlbXMpKS5sZWFrUmVmKCkpOwog I2Vsc2UKKyAgICBVTlVTRURfUEFSQU0odGl0bGUpOworICAgIFVOVVNFRF9QQVJBTShlbmFibGVk KTsKKyAgICBVTlVTRURfUEFSQU0oc3VibWVudUl0ZW1zKTsKICAgICByZXR1cm4gMDsKICNlbmRp ZgogfQpAQCAtMTE3LDYgKzEyNyw3IEBAIFdLQ29udGV4dE1lbnVJdGVtVGFnIFdLQ29udGV4dE1l bnVJdGVtR2V0VGFnKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW1SZWYpCiAgICAgcmV0dXJuIHRv QVBJKHRvSW1wbChpdGVtUmVmKS0+ZGF0YSgpLT5hY3Rpb24oKSk7CiAjZW5kaWYKICNlbHNlCisg ICAgVU5VU0VEX1BBUkFNKGl0ZW1SZWYpOwogICAgIHJldHVybiB0b0FQSShDb250ZXh0TWVudUl0 ZW1UYWdOb0FjdGlvbik7CiAjZW5kaWYKIH0KQEAgLTEyNiw2ICsxMzcsNyBAQCBXS0NvbnRleHRN ZW51SXRlbVR5cGUgV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKFdLQ29udGV4dE1lbnVJdGVtUmVm IGl0ZW1SZWYpCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgcmV0dXJuIHRvQVBJKHRv SW1wbChpdGVtUmVmKS0+ZGF0YSgpLT50eXBlKCkpOwogI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0o aXRlbVJlZik7CiAgICAgcmV0dXJuIHRvQVBJKEFjdGlvblR5cGUpOwogI2VuZGlmCiB9CkBAIC0x MzUsNiArMTQ3LDcgQEAgV0tTdHJpbmdSZWYgV0tDb250ZXh0TWVudUl0ZW1Db3B5VGl0bGUoV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbVJlZikKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAg ICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKGl0ZW1SZWYpLT5kYXRhKCktPnRpdGxlKCkuaW1w bCgpKTsKICNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGl0ZW1SZWYpOwogICAgIHJldHVybiAwOwog I2VuZGlmCiB9CkBAIC0xNDQsNiArMTU3LDcgQEAgYm9vbCBXS0NvbnRleHRNZW51SXRlbUdldEVu YWJsZWQoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbVJlZikKICNpZiBFTkFCTEUoQ09OVEVYVF9N RU5VUykKICAgICByZXR1cm4gdG9JbXBsKGl0ZW1SZWYpLT5kYXRhKCktPmVuYWJsZWQoKTsKICNl bHNlCisgICAgVU5VU0VEX1BBUkFNKGl0ZW1SZWYpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRp ZgogfQpAQCAtMTUzLDYgKzE2Nyw3IEBAIGJvb2wgV0tDb250ZXh0TWVudUl0ZW1HZXRDaGVja2Vk KFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW1SZWYpCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMp CiAgICAgcmV0dXJuIHRvSW1wbChpdGVtUmVmKS0+ZGF0YSgpLT5jaGVja2VkKCk7CiAjZWxzZQor ICAgIFVOVVNFRF9QQVJBTShpdGVtUmVmKTsKICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIH0K QEAgLTE2Miw2ICsxNzcsNyBAQCBXS0FycmF5UmVmIFdLQ29udGV4dE1lbnVDb3B5U3VibWVudUl0 ZW1zKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW1SZWYpCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVO VVMpCiAgICAgcmV0dXJuIHRvQVBJKHRvSW1wbChpdGVtUmVmKS0+c3VibWVudUl0ZW1zQXNBUElB cnJheSgpLmxlYWtSZWYoKSk7CiAjZWxzZQorICAgIFVOVVNFRF9QQVJBTShpdGVtUmVmKTsKICAg ICByZXR1cm4gMDsKICNlbmRpZgogfQpAQCAtMTcxLDYgKzE4Nyw3IEBAIFdLVHlwZVJlZiBXS0Nv bnRleHRNZW51SXRlbUdldFVzZXJEYXRhKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW1SZWYpCiAj aWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgcmV0dXJuIHRvQVBJKHRvSW1wbChpdGVtUmVm KS0+dXNlckRhdGEoKSk7CiAjZWxzZQorICAgIFVOVVNFRF9QQVJBTShpdGVtUmVmKTsKICAgICBy ZXR1cm4gMDsKICNlbmRpZgogfQpAQCAtMTc5LDUgKzE5Niw4IEBAIHZvaWQgV0tDb250ZXh0TWVu dUl0ZW1TZXRVc2VyRGF0YShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtUmVmLCBXS1R5cGVSZWYg dXNlckRhCiB7CiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgdG9JbXBsKGl0ZW1SZWYp LT5zZXRVc2VyRGF0YSh0b0ltcGwodXNlckRhdGFSZWYpKTsKKyNlbHNlCisgICAgVU5VU0VEX1BB UkFNKGl0ZW1SZWYpOworICAgIFVOVVNFRF9QQVJBTSh1c2VyRGF0YVJlZik7CiAjZW5kaWYKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggMTQwNjE0ZS4u ZjQwNjQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAg LTY0Myw2ICs2NDMsOSBAQCB2b2lkIFdLUGFnZVNldFBhZ2VDb250ZXh0TWVudUNsaWVudChXS1Bh Z2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQYWdlQ29udGV4dE1lbnVDbAogewogI2lmIEVOQUJMRShD T05URVhUX01FTlVTKQogICAgIHRvSW1wbChwYWdlUmVmKS0+aW5pdGlhbGl6ZUNvbnRleHRNZW51 Q2xpZW50KHdrQ2xpZW50KTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2VSZWYpOworICAg IFVOVVNFRF9QQVJBTSh3a0NsaWVudCk7CiAjZW5kaWYKIH0KIApAQCAtODU3LDYgKzg2MCw5IEBA IHZvaWQgV0tQYWdlU2VsZWN0Q29udGV4dE1lbnVJdGVtKFdLUGFnZVJlZiBwYWdlLCBXS0NvbnRl eHRNZW51SXRlbVJlZiBpdGVtKQogewogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQogICAgIHRv SW1wbChwYWdlKS0+Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoKih0b0ltcGwoaXRlbSktPmRhdGEo KSkpOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0ocGFnZSk7CisgICAgVU5VU0VEX1BBUkFNKGl0 ZW0pOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9l ZmwvV2ViVmlld0VmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXdF ZmwuY3BwCmluZGV4IDQyMzM1NDguLmM0OWVlMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViVmlld0VmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJWaWV3RWZsLmNwcApAQCAtODcsMTAgKzg3LDEyIEBAIFBhc3NSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IFdlYlZpZXdFZmw6OmNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQ cm94eSogcGFnCiAgICAgcmV0dXJuIFdlYlBvcHVwTWVudUxpc3RlbmVyRWZsOjpjcmVhdGUocGFn ZSk7CiB9CiAKKyNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKIFBhc3NSZWZQdHI8V2ViQ29udGV4 dE1lbnVQcm94eT4gV2ViVmlld0VmbDo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJv eHkqIHBhZ2UpCiB7CiAgICAgcmV0dXJuIFdlYkNvbnRleHRNZW51UHJveHlFZmw6OmNyZWF0ZSht X2V3a1ZpZXcsIHBhZ2UpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViVmlld0VmbDo6c2V0Q3Vyc29y KGNvbnN0IEN1cnNvciYgY3Vyc29yKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9XZWJWaWV3RWZsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dl YlZpZXdFZmwuaAppbmRleCA1OTA3NWEyLi4wNzVmNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXdFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL1dlYlZpZXdFZmwuaApAQCAtNTcsMTAgKzU3LDEzIEBAIHByaXZhdGU6CiAKICAg ICB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJDb3JlOjpDdXJzb3ImKSBPVkVSUklERTsKICAgICBQ YXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBjcmVhdGVQb3B1cE1lbnVQcm94eShXZWJQYWdl UHJveHkqKSBPVkVSUklERTsKLSAgICBQYXNzUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IGNy ZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5KikgT1ZFUlJJREU7CiAgICAgdm9pZCB1 cGRhdGVUZXh0SW5wdXRTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZvaWQgaGFuZGxlRG93bmxvYWRS ZXF1ZXN0KERvd25sb2FkUHJveHkqKSBPVkVSUklERTsKIAorI2lmIEVOQUJMRShDT05URVhUX01F TlVTKQorICAgIFBhc3NSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1l bnVQcm94eShXZWJQYWdlUHJveHkqKSBPVkVSUklERTsKKyNlbmRpZgorCiAjaWYgRU5BQkxFKEZV TExTQ1JFRU5fQVBJKQogICAgIC8vIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQKICAg ICB2aXJ0dWFsIHZvaWQgY2xvc2VGdWxsU2NyZWVuTWFuYWdlcigpIE9WRVJSSURFIEZJTkFMIHsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvYy9XS0J1bmRsZVBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCmluZGV4IDQxNjc1NjQuLmM3M2ZmZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv V0tCdW5kbGVQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKQEAgLTY1LDYgKzY1LDkgQEAgdm9pZCBXS0J1 bmRsZVBhZ2VTZXRDb250ZXh0TWVudUNsaWVudChXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tC dW5kbGVQYWdlQ29udGUKIHsKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAgICB0b0ltcGwo cGFnZVJlZiktPmluaXRpYWxpemVJbmplY3RlZEJ1bmRsZUNvbnRleHRNZW51Q2xpZW50KHdrQ2xp ZW50KTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2VSZWYpOworICAgIFVOVVNFRF9QQVJB TSh3a0NsaWVudCk7CiAjZW5kaWYKIH0KIApAQCAtMTYzLDYgKzE2Niw5IEBAIHZvaWQgV0tCdW5k bGVQYWdlQ2xpY2tNZW51SXRlbShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tDb250ZXh0TWVu dUl0ZW1SZWYgaXRlCiB7CiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgdG9JbXBsKHBh Z2VSZWYpLT5jb250ZXh0TWVudSgpLT5pdGVtU2VsZWN0ZWQoKnRvSW1wbChpdGVtKS0+ZGF0YSgp KTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2VSZWYpOworICAgIFVOVVNFRF9QQVJBTShp dGVtKTsKICNlbmRpZgogfQogCkBAIC0xODgsNiArMTk0LDcgQEAgV0tBcnJheVJlZiBXS0J1bmRs ZVBhZ2VDb3B5Q29udGV4dE1lbnVJdGVtcyhXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZikKIAogICAg IHJldHVybiB0b0FQSShjb250ZXh0TWVudUl0ZW1zKCpjb250ZXh0TWVudSkubGVha1JlZigpKTsK ICNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2VSZWYpOwogICAgIHJldHVybiBudWxscHRyOwog I2VuZGlmCiB9CkBAIC0yMDEsNiArMjA4LDggQEAgV0tBcnJheVJlZiBXS0J1bmRsZVBhZ2VDb3B5 Q29udGV4dE1lbnVBdFBvaW50SW5XaW5kb3coV0tCdW5kbGVQYWdlUmVmIHBhZ2VSZWYsIFcKIAog ICAgIHJldHVybiB0b0FQSShjb250ZXh0TWVudUl0ZW1zKCpjb250ZXh0TWVudSkubGVha1JlZigp KTsKICNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2VSZWYpOworICAgIFVOVVNFRF9QQVJBTShw b2ludCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiAjZW5kaWYKIH0K