139660 2014-12-15 16:22:57 -0800 Move 'cursor' CSS property to the new StyleBuilder 2014-12-16 17:18:01 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto sam oldest_to_newest 1055798 0 cdumez 2014-12-15 16:22:57 -0800 Move 'cursor' CSS property to the new StyleBuilder. 1055806 1 243330 cdumez 2014-12-15 16:46:53 -0800 Created attachment 243330 Patch 1056173 2 243330 benjamin 2014-12-16 15:57:47 -0800 Comment on attachment 243330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243330&action=review > Source/WebCore/css/StyleBuilderCustom.h:1178 > + styleResolver.style()->setCursor(downcast<CSSPrimitiveValue>(item.get())); > + return; If am I not mistaken, this must be the last value. We should assert for that. 1056175 3 243330 cdumez 2014-12-16 16:09:26 -0800 Comment on attachment 243330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243330&action=review >> Source/WebCore/css/StyleBuilderCustom.h:1178 >> + return; > > If am I not mistaken, this must be the last value. We should assert for that. Yes, it should be the last value, I will add the assertion. 1056184 4 243405 cdumez 2014-12-16 16:42:23 -0800 Created attachment 243405 Patch 1056189 5 243405 commit-queue 2014-12-16 17:17:56 -0800 Comment on attachment 243405 Patch Clearing flags on attachment: 243405 Committed r177414: <http://trac.webkit.org/changeset/177414> 1056190 6 commit-queue 2014-12-16 17:18:01 -0800 All reviewed patches have been landed. Closing bug. 243330 2014-12-15 16:46:53 -0800 2014-12-16 16:42:19 -0800 Patch bug-139660-20141215164742.patch text/plain 8765 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI3NDRkM2U5MmQ2NzY3 MWFhYjA1YThhMzJkZDA2ZGQ4ZTMwOTNlNi4uOTc3OTBiZjU4ZDlhY2UzOTE2MmRlNDA0MGRjNDRm NjYzNzc3ODgzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnY3Vyc29yJyBDU1Mg cHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgJ2N1cnNvcicgQ1NTIHByb3BlcnR5IHRvIHRo ZSBuZXcgU3R5bGVCdWlsZGVyIGJ5IHVzaW5nCisgICAgICAgIGN1c3RvbSBjb2RlLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0NT U1Byb3BlcnR5TmFtZXMuaW46CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRl ZFN0eWxlQnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q3Vyc29yOjph cHBseUluaGVyaXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3Bl cnR5Q3Vyc29yOjphcHBseUluaXRpYWxWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpBcHBseVByb3BlcnR5Q3Vyc29yOjphcHBseVZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkFwcGx5UHJvcGVydHlDdXJzb3I6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAg ICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl QnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUN1cnNvcik6CisKIDIwMTQtMTItMTIgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9m IHRoZSBET05UX0ZJTkFMSVpFX09OX01BSU5fVEhSRUFEICNkZWZpbmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggODg0ZWIwYWE0MzA3MDQ5ZDJjZjNkZDJjNjExOWQ1 ZjJmOTUyNTc0OS4uMDAwZWRkYmU3YWNjNWJjNTMwZGI2NzhkMDg0OTFhZmFhNWU2Mzc5NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KQEAgLTE2OCw3ICsxNjgsNyBAQCBj bGlwIFtDdXN0b209QWxsXQogY29udGVudCBbTGVnYWN5U3R5bGVCdWlsZGVyXQogY291bnRlci1p bmNyZW1lbnQgW0N1c3RvbT1BbGxdCiBjb3VudGVyLXJlc2V0IFtDdXN0b209QWxsXQotY3Vyc29y IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KK2N1cnNvciBbSW5oZXJpdGVkLCBDdXN0 b209QWxsXQogI2lmIGRlZmluZWQoRU5BQkxFX0NVUlNPUl9WSVNJQklMSVRZKSAmJiBFTkFCTEVf Q1VSU09SX1ZJU0lCSUxJVFkKIC13ZWJraXQtY3Vyc29yLXZpc2liaWxpdHkgW0luaGVyaXRlZCwg VHlwZU5hbWU9Q3Vyc29yVmlzaWJpbGl0eV0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IGUwY2I5NTY4Zjg3MzA2NjMyZWIyMGMw NWJjZDUzZjNmNTRkZDg4YTguLjcwODVlNDVkNTc1YWNmNGU0ZmRlYmExMDlhODJmMjhmNDdjZWQ2 ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK QEAgLTYyNiw1MCArNjI2LDYgQEAgcHVibGljOgogICAgIH0KIH07CiAKLWNsYXNzIEFwcGx5UHJv cGVydHlDdXJzb3IgewotcHVibGljOgotICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVl KENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi0gICAgewotICAg ICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRDdXJzb3Ioc3R5bGVSZXNvbHZlci0+cGFy ZW50U3R5bGUoKS0+Y3Vyc29yKCkpOwotICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5z ZXRDdXJzb3JMaXN0KHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0eWxlKCktPmN1cnNvcnMoKSk7Ci0g ICAgfQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFsdWUoQ1NTUHJvcGVydHlJRCwg U3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAgICB7Ci0gICAgICAgIHN0eWxlUmVzb2x2 ZXItPnN0eWxlKCktPmNsZWFyQ3Vyc29yTGlzdCgpOwotICAgICAgICBzdHlsZVJlc29sdmVyLT5z dHlsZSgpLT5zZXRDdXJzb3IoUmVuZGVyU3R5bGU6OmluaXRpYWxDdXJzb3IoKSk7Ci0gICAgfQot Ci0gICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVy KiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBzdHlsZVJl c29sdmVyLT5zdHlsZSgpLT5jbGVhckN1cnNvckxpc3QoKTsKLSAgICAgICAgaWYgKGlzPENTU1Zh bHVlTGlzdD4oKnZhbHVlKSkgewotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0JiBsaXN0ID0gZG93 bmNhc3Q8Q1NTVmFsdWVMaXN0PigqdmFsdWUpOwotICAgICAgICAgICAgaW50IGxlbmd0aCA9IGxp c3QubGVuZ3RoKCk7Ci0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRDdXJz b3IoQ3Vyc29yQXV0byk7Ci0gICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGxlbmd0aDsg aSsrKSB7Ci0gICAgICAgICAgICAgICAgQ1NTVmFsdWUqIGl0ZW0gPSBsaXN0Lml0ZW1XaXRob3V0 Qm91bmRzQ2hlY2soaSk7Ci0gICAgICAgICAgICAgICAgaWYgKGlzPENTU0N1cnNvckltYWdlVmFs dWU+KCppdGVtKSkgewotICAgICAgICAgICAgICAgICAgICBDU1NDdXJzb3JJbWFnZVZhbHVlJiBp bWFnZSA9IGRvd25jYXN0PENTU0N1cnNvckltYWdlVmFsdWU+KCppdGVtKTsKLSAgICAgICAgICAg ICAgICAgICAgaWYgKGltYWdlLnVwZGF0ZUlmU1ZHQ3Vyc29ySXNVc2VkKHN0eWxlUmVzb2x2ZXIt PmVsZW1lbnQoKSkpIC8vIEVsZW1lbnRzIHdpdGggU1ZHIGN1cnNvcnMgYXJlIG5vdCBhbGxvd2Vk IHRvIHNoYXJlIHN0eWxlLgotICAgICAgICAgICAgICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+ c3R5bGUoKS0+c2V0VW5pcXVlKCk7Ci0gICAgICAgICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIt PnN0eWxlKCktPmFkZEN1cnNvcihzdHlsZVJlc29sdmVyLT5zdHlsZUltYWdlKENTU1Byb3BlcnR5 Q3Vyc29yLCBpbWFnZSksIGltYWdlLmhvdFNwb3QoKSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNl IGlmIChpczxDU1NQcmltaXRpdmVWYWx1ZT4oKml0ZW0pKSB7Ci0gICAgICAgICAgICAgICAgICAg IENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlPigqaXRlbSk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5p c1ZhbHVlSUQoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxl KCktPnNldEN1cnNvcihwcmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKGlzPENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUp KSB7Ci0gICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3du Y2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKTsKLSAgICAgICAgICAgIGlmIChwcmltaXRp dmVWYWx1ZS5pc1ZhbHVlSUQoKSAmJiBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5jdXJzb3IoKSAh PSBFQ3Vyc29yKHByaW1pdGl2ZVZhbHVlKSkKLSAgICAgICAgICAgICAgICBzdHlsZVJlc29sdmVy LT5zdHlsZSgpLT5zZXRDdXJzb3IocHJpbWl0aXZlVmFsdWUpOwotICAgICAgICB9Ci0gICAgfQot Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4gUHJv cGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBw bHlWYWx1ZSk7IH0KLX07Ci0KIHRlbXBsYXRlIDx0eXBlbmFtZSBULAogICAgICAgICAgIFQgKEFu aW1hdGlvbjo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0LAogICAgICAgICAgIHZvaWQgKEFuaW1h dGlvbjo6KnNldHRlckZ1bmN0aW9uKShUKSwKQEAgLTc3NCw3ICs3MzAsNiBAQCBEZXByZWNhdGVk U3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJSaWdodENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9J bmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpib3JkZXJSaWdodENvbG9yLCAmUmVuZGVy U3R5bGU6OnNldEJvcmRlclJpZ2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtC b3JkZXJSaWdodENvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJUb3BDb2xvciwgQXBwbHlQ cm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9w Q29sb3IsICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyVG9wQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0 VmlzaXRlZExpbmtCb3JkZXJUb3BDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0ZUhh bmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q29sb3IsIEFwcGx5 UHJvcGVydHlDb2xvcjxJbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpjb2xvciwgJlJl bmRlclN0eWxlOjpzZXRDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua0NvbG9yLCAm UmVuZGVyU3R5bGU6OmludmFsaWRDb2xvciwgUmVuZGVyU3R5bGU6OmluaXRpYWxDb2xvcj46OmNy ZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q3Vyc29y LCBBcHBseVByb3BlcnR5Q3Vyc29yOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRTaXplLCBBcHBseVByb3BlcnR5Rm9udFNpemU6OmNyZWF0 ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFN0eWxl LCBBcHBseVByb3BlcnR5Rm9udDxGb250SXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjppdGFsaWMs ICZGb250RGVzY3JpcHRpb246OnNldEl0YWxpYywgRm9udEl0YWxpY09mZj46OmNyZWF0ZUhhbmRs ZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIEFw cGx5UHJvcGVydHlGb250PEZvbnRTbWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNtYWxsQ2Fw cywgJkZvbnREZXNjcmlwdGlvbjo6c2V0U21hbGxDYXBzLCBGb250U21hbGxDYXBzT2ZmPjo6Y3Jl YXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRl eCBkZGE4ZDczZmQxZWM2NjQ3MzE3ZGQ0M2E4NmM2YzNhOTZjNDNjMDkxLi44OGI0OGZmNWNmM2Vm Y2I1MWY5NDE4ZGM3NzE3ZTY4ZmRjZDAzNzJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVp bGRlckN1c3RvbS5oCkBAIC0yOCw3ICsyOCw5IEBACiAjZGVmaW5lIFN0eWxlQnVpbGRlckN1c3Rv bV9oCiAKICNpbmNsdWRlICJDU1NBc3BlY3RSYXRpb1ZhbHVlLmgiCisjaW5jbHVkZSAiQ1NTQ3Vy c29ySW1hZ2VWYWx1ZS5oIgogI2luY2x1ZGUgIkNTU1NoYWRvd1ZhbHVlLmgiCisjaW5jbHVkZSAi Q3Vyc29yTGlzdC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiTG9jYWxlVG9TY3Jp cHRNYXBwaW5nLmgiCiAjaW5jbHVkZSAiUmVjdC5oIgpAQCAtMTMzLDYgKzEzNSwxMCBAQCBwdWJs aWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Q291bnRlclJlc2V0KFN0eWxlUmVzb2x2 ZXImKTsKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlQ291bnRlclJlc2V0KFN0eWxlUmVzb2x2 ZXImLCBDU1NWYWx1ZSYpOwogCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsQ3Vyc29yKFN0 eWxlUmVzb2x2ZXImKTsKKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRDdXJzb3IoU3R5bGVS ZXNvbHZlciYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVDdXJzb3IoU3R5bGVSZXNvbHZl ciYsIENTU1ZhbHVlJik7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3Rp dmVab29tKFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgQ1NTVG9MZW5ndGhDb252ZXJzaW9u RGF0YSBjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKFN0eWxlUmVz b2x2ZXImKTsKQEAgLTExMzYsNiArMTE0Miw0MyBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJD dXN0b206OmFwcGx5VmFsdWVDb3VudGVyUmVzZXQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbAog ICAgIGFwcGx5VmFsdWVDb3VudGVyPFJlc2V0PihzdHlsZVJlc29sdmVyLCB2YWx1ZSk7CiB9CiAK K2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsQ3Vyc29yKFN0eWxl UmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCit7CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5j bGVhckN1cnNvckxpc3QoKTsKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEN1cnNvcihS ZW5kZXJTdHlsZTo6aW5pdGlhbEN1cnNvcigpKTsKK30KKworaW5saW5lIHZvaWQgU3R5bGVCdWls ZGVyQ3VzdG9tOjphcHBseUluaGVyaXRDdXJzb3IoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZl cikKK3sKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEN1cnNvcihzdHlsZVJlc29sdmVy LnBhcmVudFN0eWxlKCktPmN1cnNvcigpKTsKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNl dEN1cnNvckxpc3Qoc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5jdXJzb3JzKCkpOworfQor CitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDdXJzb3IoU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQoreworICAgIHN0eWxlUmVz b2x2ZXIuc3R5bGUoKS0+Y2xlYXJDdXJzb3JMaXN0KCk7CisgICAgaWYgKGlzPENTU1ByaW1pdGl2 ZVZhbHVlPih2YWx1ZSkpIHsKKyAgICAgICAgRUN1cnNvciBjdXJzb3IgPSBkb3duY2FzdDxDU1NQ cmltaXRpdmVWYWx1ZT4odmFsdWUpOworICAgICAgICBpZiAoc3R5bGVSZXNvbHZlci5zdHlsZSgp LT5jdXJzb3IoKSAhPSBjdXJzb3IpCisgICAgICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCkt PnNldEN1cnNvcihjdXJzb3IpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT5zZXRDdXJzb3IoQ3Vyc29yQXV0byk7CisgICAgZm9yIChhdXRvJiBp dGVtIDogZG93bmNhc3Q8Q1NTVmFsdWVMaXN0Pih2YWx1ZSkpIHsKKyAgICAgICAgaWYgKGlzPENT U0N1cnNvckltYWdlVmFsdWU+KGl0ZW0uZ2V0KCkpKSB7CisgICAgICAgICAgICBhdXRvJiBpbWFn ZSA9IGRvd25jYXN0PENTU0N1cnNvckltYWdlVmFsdWU+KGl0ZW0uZ2V0KCkpOworICAgICAgICAg ICAgaWYgKGltYWdlLnVwZGF0ZUlmU1ZHQ3Vyc29ySXNVc2VkKHN0eWxlUmVzb2x2ZXIuZWxlbWVu dCgpKSkgLy8gRWxlbWVudHMgd2l0aCBTVkcgY3Vyc29ycyBhcmUgbm90IGFsbG93ZWQgdG8gc2hh cmUgc3R5bGUuCisgICAgICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRVbmlx dWUoKTsKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+YWRkQ3Vyc29yKHN0eWxl UmVzb2x2ZXIuc3R5bGVJbWFnZShDU1NQcm9wZXJ0eUN1cnNvciwgaW1hZ2UpLCBpbWFnZS5ob3RT cG90KCkpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKworICAgICAgICBzdHls ZVJlc29sdmVyLnN0eWxlKCktPnNldEN1cnNvcihkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4o aXRlbS5nZXQoKSkpOworICAgICAgICByZXR1cm47CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBTdHlsZUJ1aWxkZXJDdXN0b21faAo= 243405 2014-12-16 16:42:23 -0800 2014-12-16 17:17:56 -0800 Patch bug-139660-20141216164313.patch text/plain 8927 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Mzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzA3OGU0NmJiOTYwYWQ1 YWFhNTIxZjNkMTI5YTU3YzkzOGVjZjU0MC4uZDAxNTk3MDY3YzQ1YjkxYTg1NDUyZDU4NGY5OGQw MDE3ZGY3ODFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnY3Vyc29yJyBDU1Mg cHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IEJl bmphbWluIFBvdWxhaW4uCisKKyAgICAgICAgTW92ZSAnY3Vyc29yJyBDU1MgcHJvcGVydHkgdG8g dGhlIG5ldyBTdHlsZUJ1aWxkZXIgYnkgdXNpbmcKKyAgICAgICAgY3VzdG9tIGNvZGUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBjc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNh dGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDdXJzb3I6 OmFwcGx5SW5oZXJpdFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlDdXJzb3I6OmFwcGx5SW5pdGlhbFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkFwcGx5UHJvcGVydHlDdXJzb3I6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUN1cnNvcjo6Y3JlYXRlSGFuZGxlcik6IERlbGV0ZWQuCisg ICAgICAgICogY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRDdXJzb3IpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQ3Vyc29yKToKKwogMjAxNC0xMi0xNiAg R2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgTW92 ZSBNYWMgcHJvY2VzcyBzdXBwcmVzc2lvbiBmcm9tIFdlYkNvcmUgdG8gV2ViS2l0MgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCA4ODRlYjBhYTQzMDcwNDlkMmNmM2Rk MmM2MTE5ZDVmMmY5NTI1NzQ5Li4wMDBlZGRiZTdhY2M1YmM1MzBkYjY3OGQwODQ5MWFmYWE1ZTYz Nzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtMTY4LDcgKzE2 OCw3IEBAIGNsaXAgW0N1c3RvbT1BbGxdCiBjb250ZW50IFtMZWdhY3lTdHlsZUJ1aWxkZXJdCiBj b3VudGVyLWluY3JlbWVudCBbQ3VzdG9tPUFsbF0KIGNvdW50ZXItcmVzZXQgW0N1c3RvbT1BbGxd Ci1jdXJzb3IgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQorY3Vyc29yIFtJbmhlcml0 ZWQsIEN1c3RvbT1BbGxdCiAjaWYgZGVmaW5lZChFTkFCTEVfQ1VSU09SX1ZJU0lCSUxJVFkpICYm IEVOQUJMRV9DVVJTT1JfVklTSUJJTElUWQogLXdlYmtpdC1jdXJzb3ItdmlzaWJpbGl0eSBbSW5o ZXJpdGVkLCBUeXBlTmFtZT1DdXJzb3JWaXNpYmlsaXR5XQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKaW5kZXggZTBjYjk1NjhmODczMDY2 MzJlYjIwYzA1YmNkNTNmM2Y1NGRkODhhOC4uNzA4NWU0NWQ1NzVhY2Y0ZTRmZGViYTEwOWE4MmYy OGY0N2NlZDZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWls ZGVyLmNwcApAQCAtNjI2LDUwICs2MjYsNiBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAotY2xhc3Mg QXBwbHlQcm9wZXJ0eUN1cnNvciB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIHZvaWQgYXBwbHlJbmhl cml0VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAg ICB7Ci0gICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldEN1cnNvcihzdHlsZVJlc29s dmVyLT5wYXJlbnRTdHlsZSgpLT5jdXJzb3IoKSk7Ci0gICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0 eWxlKCktPnNldEN1cnNvckxpc3Qoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+Y3Vyc29y cygpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseUluaXRpYWxWYWx1ZShDU1NQcm9w ZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsKLSAgICAgICAgc3R5 bGVSZXNvbHZlci0+c3R5bGUoKS0+Y2xlYXJDdXJzb3JMaXN0KCk7Ci0gICAgICAgIHN0eWxlUmVz b2x2ZXItPnN0eWxlKCktPnNldEN1cnNvcihSZW5kZXJTdHlsZTo6aW5pdGlhbEN1cnNvcigpKTsK LSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxl UmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKLSAgICB7Ci0gICAgICAg IHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPmNsZWFyQ3Vyc29yTGlzdCgpOwotICAgICAgICBpZiAo aXM8Q1NTVmFsdWVMaXN0PigqdmFsdWUpKSB7Ci0gICAgICAgICAgICBDU1NWYWx1ZUxpc3QmIGxp c3QgPSBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSk7Ci0gICAgICAgICAgICBpbnQgbGVu Z3RoID0gbGlzdC5sZW5ndGgoKTsKLSAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCkt PnNldEN1cnNvcihDdXJzb3JBdXRvKTsKLSAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwg bGVuZ3RoOyBpKyspIHsKLSAgICAgICAgICAgICAgICBDU1NWYWx1ZSogaXRlbSA9IGxpc3QuaXRl bVdpdGhvdXRCb3VuZHNDaGVjayhpKTsKLSAgICAgICAgICAgICAgICBpZiAoaXM8Q1NTQ3Vyc29y SW1hZ2VWYWx1ZT4oKml0ZW0pKSB7Ci0gICAgICAgICAgICAgICAgICAgIENTU0N1cnNvckltYWdl VmFsdWUmIGltYWdlID0gZG93bmNhc3Q8Q1NTQ3Vyc29ySW1hZ2VWYWx1ZT4oKml0ZW0pOwotICAg ICAgICAgICAgICAgICAgICBpZiAoaW1hZ2UudXBkYXRlSWZTVkdDdXJzb3JJc1VzZWQoc3R5bGVS ZXNvbHZlci0+ZWxlbWVudCgpKSkgLy8gRWxlbWVudHMgd2l0aCBTVkcgY3Vyc29ycyBhcmUgbm90 IGFsbG93ZWQgdG8gc2hhcmUgc3R5bGUuCi0gICAgICAgICAgICAgICAgICAgICAgICBzdHlsZVJl c29sdmVyLT5zdHlsZSgpLT5zZXRVbmlxdWUoKTsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGVS ZXNvbHZlci0+c3R5bGUoKS0+YWRkQ3Vyc29yKHN0eWxlUmVzb2x2ZXItPnN0eWxlSW1hZ2UoQ1NT UHJvcGVydHlDdXJzb3IsIGltYWdlKSwgaW1hZ2UuaG90U3BvdCgpKTsKLSAgICAgICAgICAgICAg ICB9IGVsc2UgaWYgKGlzPENTU1ByaW1pdGl2ZVZhbHVlPigqaXRlbSkpIHsKLSAgICAgICAgICAg ICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUmIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NT UHJpbWl0aXZlVmFsdWU+KCppdGVtKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHByaW1pdGl2 ZVZhbHVlLmlzVmFsdWVJRCgpKQotICAgICAgICAgICAgICAgICAgICAgICAgc3R5bGVSZXNvbHZl ci0+c3R5bGUoKS0+c2V0Q3Vyc29yKHByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoaXM8Q1NTUHJpbWl0aXZlVmFsdWU+ KCp2YWx1ZSkpIHsKLSAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1 ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUpOwotICAgICAgICAgICAgaWYg KHByaW1pdGl2ZVZhbHVlLmlzVmFsdWVJRCgpICYmIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPmN1 cnNvcigpICE9IEVDdXJzb3IocHJpbWl0aXZlVmFsdWUpKQotICAgICAgICAgICAgICAgIHN0eWxl UmVzb2x2ZXItPnN0eWxlKCktPnNldEN1cnNvcihwcmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgIH0K LSAgICB9Ci0KLSAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKSB7IHJl dHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZhbHVlLCAmYXBwbHlJbml0aWFsVmFs dWUsICZhcHBseVZhbHVlKTsgfQotfTsKLQogdGVtcGxhdGUgPHR5cGVuYW1lIFQsCiAgICAgICAg ICAgVCAoQW5pbWF0aW9uOjoqZ2V0dGVyRnVuY3Rpb24pKCkgY29uc3QsCiAgICAgICAgICAgdm9p ZCAoQW5pbWF0aW9uOjoqc2V0dGVyRnVuY3Rpb24pKFQpLApAQCAtNzc0LDcgKzczMCw2IEBAIERl cHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclJpZ2h0Q29sb3IsIEFwcGx5UHJvcGVydHlD b2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OmJvcmRlclJpZ2h0Q29sb3Is ICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyUmlnaHRDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNp dGVkTGlua0JvcmRlclJpZ2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5k bGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclRvcENvbG9y LCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpi b3JkZXJUb3BDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJUb3BDb2xvciwgJlJlbmRlclN0 eWxlOjpzZXRWaXNpdGVkTGlua0JvcmRlclRvcENvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6 Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlDb2xv ciwgQXBwbHlQcm9wZXJ0eUNvbG9yPEluaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OmNv bG9yLCAmUmVuZGVyU3R5bGU6OnNldENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5r Q29sb3IsICZSZW5kZXJTdHlsZTo6aW52YWxpZENvbG9yLCBSZW5kZXJTdHlsZTo6aW5pdGlhbENv bG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlDdXJzb3IsIEFwcGx5UHJvcGVydHlDdXJzb3I6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFNpemUsIEFwcGx5UHJvcGVydHlGb250U2l6 ZTo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlG b250U3R5bGUsIEFwcGx5UHJvcGVydHlGb250PEZvbnRJdGFsaWMsICZGb250RGVzY3JpcHRpb246 Oml0YWxpYywgJkZvbnREZXNjcmlwdGlvbjo6c2V0SXRhbGljLCBGb250SXRhbGljT2ZmPjo6Y3Jl YXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlGb250VmFy aWFudCwgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udFNtYWxsQ2FwcywgJkZvbnREZXNjcmlwdGlvbjo6 c21hbGxDYXBzLCAmRm9udERlc2NyaXB0aW9uOjpzZXRTbWFsbENhcHMsIEZvbnRTbWFsbENhcHNP ZmY+OjpjcmVhdGVIYW5kbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlckN1c3RvbS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3Rv bS5oCmluZGV4IGRkYThkNzNmZDFlYzY2NDczMTdkZDQzYTg2YzZjM2E5NmM0M2MwOTEuLjQ4MWEz MzdjNmIwMzU0YWU2Njc2NjU1NjI4ZTRlM2M4OGMyZWJjOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyQ3VzdG9tLmgKQEAgLTI4LDcgKzI4LDkgQEAKICNkZWZpbmUgU3R5bGVCdWls ZGVyQ3VzdG9tX2gKIAogI2luY2x1ZGUgIkNTU0FzcGVjdFJhdGlvVmFsdWUuaCIKKyNpbmNsdWRl ICJDU1NDdXJzb3JJbWFnZVZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTU2hhZG93VmFsdWUuaCIKKyNp bmNsdWRlICJDdXJzb3JMaXN0LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJMb2Nh bGVUb1NjcmlwdE1hcHBpbmcuaCIKICNpbmNsdWRlICJSZWN0LmgiCkBAIC0xMzMsNiArMTM1LDEw IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRDb3VudGVyUmVzZXQoU3R5 bGVSZXNvbHZlciYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVDb3VudGVyUmVzZXQoU3R5 bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAKKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaXRpYWxD dXJzb3IoU3R5bGVSZXNvbHZlciYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEN1cnNv cihTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUN1cnNvcihTdHls ZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKKwogcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCByZXNl dEVmZmVjdGl2ZVpvb20oU3R5bGVSZXNvbHZlciYpOwogICAgIHN0YXRpYyBDU1NUb0xlbmd0aENv bnZlcnNpb25EYXRhIGNzc3RvTGVuZ3RoQ29udmVyc2lvbkRhdGFXaXRoVGV4dFpvb21GYWN0b3Io U3R5bGVSZXNvbHZlciYpOwpAQCAtMTEzNiw2ICsxMTQyLDQ1IEBAIGlubGluZSB2b2lkIFN0eWxl QnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUNvdW50ZXJSZXNldChTdHlsZVJlc29sdmVyJiBzdHls ZVJlc29sCiAgICAgYXBwbHlWYWx1ZUNvdW50ZXI8UmVzZXQ+KHN0eWxlUmVzb2x2ZXIsIHZhbHVl KTsKIH0KIAoraW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxDdXJz b3IoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBzdHlsZVJlc29sdmVyLnN0 eWxlKCktPmNsZWFyQ3Vyc29yTGlzdCgpOworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0 Q3Vyc29yKFJlbmRlclN0eWxlOjppbml0aWFsQ3Vyc29yKCkpOworfQorCitpbmxpbmUgdm9pZCBT dHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEN1cnNvcihTdHlsZVJlc29sdmVyJiBzdHls ZVJlc29sdmVyKQoreworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0Q3Vyc29yKHN0eWxl UmVzb2x2ZXIucGFyZW50U3R5bGUoKS0+Y3Vyc29yKCkpOworICAgIHN0eWxlUmVzb2x2ZXIuc3R5 bGUoKS0+c2V0Q3Vyc29yTGlzdChzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPmN1cnNvcnMo KSk7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUN1cnNv cihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAg c3R5bGVSZXNvbHZlci5zdHlsZSgpLT5jbGVhckN1cnNvckxpc3QoKTsKKyAgICBpZiAoaXM8Q1NT UHJpbWl0aXZlVmFsdWU+KHZhbHVlKSkgeworICAgICAgICBFQ3Vyc29yIGN1cnNvciA9IGRvd25j YXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSk7CisgICAgICAgIGlmIChzdHlsZVJlc29sdmVy LnN0eWxlKCktPmN1cnNvcigpICE9IGN1cnNvcikKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIu c3R5bGUoKS0+c2V0Q3Vyc29yKGN1cnNvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAg ICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEN1cnNvcihDdXJzb3JBdXRvKTsKKyAgICBhdXRv JiBsaXN0ID0gZG93bmNhc3Q8Q1NTVmFsdWVMaXN0Pih2YWx1ZSk7CisgICAgZm9yIChhdXRvJiBp dGVtIDogbGlzdCkgeworICAgICAgICBpZiAoaXM8Q1NTQ3Vyc29ySW1hZ2VWYWx1ZT4oaXRlbS5n ZXQoKSkpIHsKKyAgICAgICAgICAgIGF1dG8mIGltYWdlID0gZG93bmNhc3Q8Q1NTQ3Vyc29ySW1h Z2VWYWx1ZT4oaXRlbS5nZXQoKSk7CisgICAgICAgICAgICBpZiAoaW1hZ2UudXBkYXRlSWZTVkdD dXJzb3JJc1VzZWQoc3R5bGVSZXNvbHZlci5lbGVtZW50KCkpKSAvLyBFbGVtZW50cyB3aXRoIFNW RyBjdXJzb3JzIGFyZSBub3QgYWxsb3dlZCB0byBzaGFyZSBzdHlsZS4KKyAgICAgICAgICAgICAg ICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFVuaXF1ZSgpOworICAgICAgICAgICAgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT5hZGRDdXJzb3Ioc3R5bGVSZXNvbHZlci5zdHlsZUltYWdlKENTU1By b3BlcnR5Q3Vyc29yLCBpbWFnZSksIGltYWdlLmhvdFNwb3QoKSk7CisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgfQorCisgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0Q3Vy c29yKGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihpdGVtLmdldCgpKSk7CisgICAgICAgIEFT U0VSVF9XSVRIX01FU1NBR0UoaXRlbS5wdHIoKSA9PSBsaXN0Lml0ZW0obGlzdC5sZW5ndGgoKSAt IDEpLCAiQ3Vyc29yIElEIGZhbGxiYWNrIHNob3VsZCBhbHdheXMgYmUgbGFzdCBpbiB0aGUgbGlz dCIpOworICAgICAgICByZXR1cm47CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAKICNlbmRpZiAvLyBTdHlsZUJ1aWxkZXJDdXN0b21faAo=