119304 2013-07-30 20:26:47 -0700 Convert most callers of setInlineStyleProperty passing strings to enums or doubles instead 2013-07-31 11:39:59 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa benjamin commit-queue kling koivisto oldest_to_newest 913151 0 rniwa 2013-07-30 20:26:47 -0700 Convert most callers of setInlineStyleProperty passing strings to enums or doubles instead 913152 1 207801 rniwa 2013-07-30 20:27:06 -0700 Created attachment 207801 Cleanup 913425 2 207801 kling 2013-07-31 11:12:49 -0700 Comment on attachment 207801 Cleanup I've had this in ~/RainyDayPatches.txt forever, awesome :) 913436 3 207801 commit-queue 2013-07-31 11:39:57 -0700 Comment on attachment 207801 Cleanup Clearing flags on attachment: 207801 Committed r153529: <http://trac.webkit.org/changeset/153529> 913437 4 commit-queue 2013-07-31 11:39:59 -0700 All reviewed patches have been landed. Closing bug. 207801 2013-07-30 20:27:06 -0700 2013-07-31 11:39:57 -0700 Cleanup bug-119304-20130730202706.patch text/plain 15526 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTA3LTMwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENvbnZlcnQgbW9zdCBjYWxsZXJz IG9mIHNldElubGluZVN0eWxlUHJvcGVydHkgcGFzc2luZyBzdHJpbmdzIHRvIGVudW1zIG9yIGRv dWJsZXMgaW5zdGVhZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE5MzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTWVyZ2UgaHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2Js aW5rLysvODE1N2RkOTM4MTcxNjc1OWYxODNmYWJiZmVkMjljNTI5NjJiZTc0NgorCisgICAgICAg ICogZWRpdGluZy9EZWxldGVCdXR0b25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OmNyZWF0ZURlbGV0aW9uVUkpOgorICAgICAgICAoV2Vi Q29yZTo6RGVsZXRlQnV0dG9uQ29udHJvbGxlcjo6c2hvdyk6CisgICAgICAgICogaHRtbC9IVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZv cm1Db250cm9sRWxlbWVudDo6dXBkYXRlUGxhY2Vob2xkZXJWaXNpYmlsaXR5KToKKyAgICAgICAg KiBodG1sL0ltYWdlRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVu dDo6cmVzaXplSW1hZ2VUb0ZpdCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50Ojpy ZXN0b3JlSW1hZ2VTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1lbnQ6OndpbmRv d1NpemVDaGFuZ2VkKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50 cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJF bGVtZW50Ojp1cGRhdGVEaXNwbGF5KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRl eHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0ZVRpbWVyRmlyZWQpOgorICAgICAgICAqIGh0 bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1 ZTo6c2V0Rm9udFNpemUpOgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJp Yy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWVHZW5lcmljQm94RWxlbWVudDo6 YXBwbHlDU1NQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZUdlbmVy aWM6OnNldEZvbnRTaXplKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlc2l6ZSk6CisKIDIwMTMtMDctMzAgIFJv YiBCdWlzICA8cndsYnVpc0B3ZWJraXQub3JnPgogCiAgICAgICAgIFhNTFNlcmlhbGl6ZXIgc2hv dWxkIHJlc2V0IGRlZmF1bHQgbmFtZXNwYWNlIHdoZW4gbmVjZXNzYXJ5CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0RlbGV0ZUJ1dHRvbkNvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlQnV0dG9uQ29udHJvbGxlci5jcHAJKHJldmlz aW9uIDE1MzQ4NSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlQnV0dG9uQ29udHJv bGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMiwxMCArMjEyLDEwIEBAIHZvaWQgRGVsZXRl QnV0dG9uQ29udHJvbGxlcjo6Y3JlYXRlRGVsZXQKICAgICBjb250YWluZXItPnNldElubGluZVN0 eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlWaXNpYmlsaXR5LCBDU1NWYWx1ZUhpZGRlbik7CiAgICAg Y29udGFpbmVyLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24sIENT U1ZhbHVlQWJzb2x1dGUpOwogICAgIGNvbnRhaW5lci0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShD U1NQcm9wZXJ0eUN1cnNvciwgQ1NTVmFsdWVEZWZhdWx0KTsKLSAgICBjb250YWluZXItPnNldElu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlUb3AsICIwIik7Ci0gICAgY29udGFpbmVyLT5z ZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UmlnaHQsICIwIik7Ci0gICAgY29udGFp bmVyLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Qm90dG9tLCAiMCIpOwotICAg IGNvbnRhaW5lci0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsICIwIik7 CisgICAgY29udGFpbmVyLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VG9wLCAw LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICBjb250YWluZXItPnNldElubGluZVN0 eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlSaWdodCwgMCwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q WCk7CisgICAgY29udGFpbmVyLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Qm90 dG9tLCAwLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICBjb250YWluZXItPnNldElu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCAwLCBDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTX1BYKTsKIAogICAgIFJlZlB0cjxIVE1MRGl2RWxlbWVudD4gb3V0bGluZSA9IEhUTUxEaXZF bGVtZW50OjpjcmVhdGUobV90YXJnZXQtPmRvY3VtZW50KCkpOwogICAgIG91dGxpbmUtPnNldElk QXR0cmlidXRlKG91dGxpbmVFbGVtZW50SWRlbnRpZmllcik7CkBAIC0yMjUsMTIgKzIyNSwxNCBA QCB2b2lkIERlbGV0ZUJ1dHRvbkNvbnRyb2xsZXI6OmNyZWF0ZURlbGV0CiAKICAgICBvdXRsaW5l LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24sIENTU1ZhbHVlQWJz b2x1dGUpOwogICAgIG91dGxpbmUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHla SW5kZXgsIFN0cmluZzo6bnVtYmVyKC0xMDAwMDAwKSk7Ci0gICAgb3V0bGluZS0+c2V0SW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVRvcCwgU3RyaW5nOjpudW1iZXIoLWJvcmRlcldpZHRo IC0gbV90YXJnZXQtPnJlbmRlckJveCgpLT5ib3JkZXJUb3AoKSkgKyAicHgiKTsKLSAgICBvdXRs aW5lLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UmlnaHQsIFN0cmluZzo6bnVt YmVyKC1ib3JkZXJXaWR0aCAtIG1fdGFyZ2V0LT5yZW5kZXJCb3goKS0+Ym9yZGVyUmlnaHQoKSkg KyAicHgiKTsKLSAgICBvdXRsaW5lLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5 Qm90dG9tLCBTdHJpbmc6Om51bWJlcigtYm9yZGVyV2lkdGggLSBtX3RhcmdldC0+cmVuZGVyQm94 KCktPmJvcmRlckJvdHRvbSgpKSArICJweCIpOwotICAgIG91dGxpbmUtPnNldElubGluZVN0eWxl UHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCBTdHJpbmc6Om51bWJlcigtYm9yZGVyV2lkdGggLSBt X3RhcmdldC0+cmVuZGVyQm94KCktPmJvcmRlckxlZnQoKSkgKyAicHgiKTsKLSAgICBvdXRsaW5l LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Qm9yZGVyLCBTdHJpbmc6Om51bWJl cihib3JkZXJXaWR0aCkgKyAicHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjYpIik7Ci0gICAgb3V0 bGluZS0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclJhZGl1 cywgU3RyaW5nOjpudW1iZXIoYm9yZGVyUmFkaXVzKSArICJweCIpOworICAgIG91dGxpbmUtPnNl dElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlUb3AsIC1ib3JkZXJXaWR0aCAtIG1fdGFy Z2V0LT5yZW5kZXJCb3goKS0+Ym9yZGVyVG9wKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgp OworICAgIG91dGxpbmUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlSaWdodCwg LWJvcmRlcldpZHRoIC0gbV90YXJnZXQtPnJlbmRlckJveCgpLT5ib3JkZXJSaWdodCgpLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICBvdXRsaW5lLT5zZXRJbmxpbmVTdHlsZVByb3Bl cnR5KENTU1Byb3BlcnR5Qm90dG9tLCAtYm9yZGVyV2lkdGggLSBtX3RhcmdldC0+cmVuZGVyQm94 KCktPmJvcmRlckJvdHRvbSgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICBvdXRs aW5lLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TGVmdCwgLWJvcmRlcldpZHRo IC0gbV90YXJnZXQtPnJlbmRlckJveCgpLT5ib3JkZXJMZWZ0KCksIENTU1ByaW1pdGl2ZVZhbHVl OjpDU1NfUFgpOworICAgIG91dGxpbmUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlCb3JkZXJXaWR0aCwgYm9yZGVyV2lkdGgsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwor ICAgIG91dGxpbmUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlCb3JkZXJTdHls ZSwgQ1NTVmFsdWVTb2xpZCk7CisgICAgb3V0bGluZS0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShD U1NQcm9wZXJ0eUJvcmRlckNvbG9yLCAicmdiYSgwLCAwLCAwLCAwLjYpIik7CisgICAgb3V0bGlu ZS0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUJvcmRlclJhZGl1cywgYm9yZGVy UmFkaXVzLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICBvdXRsaW5lLT5zZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VmlzaWJpbGl0eSwgQ1NTVmFsdWVWaXNpYmxlKTsK IAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwpAQCAtMjQ4LDEwICsyNTAsMTAgQEAgdm9pZCBE ZWxldGVCdXR0b25Db250cm9sbGVyOjpjcmVhdGVEZWxldAogCiAgICAgYnV0dG9uLT5zZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5UG9zaXRpb24sIENTU1ZhbHVlQWJzb2x1dGUpOwog ICAgIGJ1dHRvbi0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVpJbmRleCwgU3Ry aW5nOjpudW1iZXIoMTAwMDAwMCkpOwotICAgIGJ1dHRvbi0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0 eShDU1NQcm9wZXJ0eVRvcCwgU3RyaW5nOjpudW1iZXIoKC1idXR0b25IZWlnaHQgLyAyKSAtIG1f dGFyZ2V0LT5yZW5kZXJCb3goKS0+Ym9yZGVyVG9wKCkgLSAoYm9yZGVyV2lkdGggLyAyKSArIGJ1 dHRvbkJvdHRvbVNoYWRvd09mZnNldCkgKyAicHgiKTsKLSAgICBidXR0b24tPnNldElubGluZVN0 eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0LCBTdHJpbmc6Om51bWJlcigoLWJ1dHRvbldpZHRo IC8gMikgLSBtX3RhcmdldC0+cmVuZGVyQm94KCktPmJvcmRlckxlZnQoKSAtIChib3JkZXJXaWR0 aCAvIDIpKSArICJweCIpOwotICAgIGJ1dHRvbi0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQ cm9wZXJ0eVdpZHRoLCBTdHJpbmc6Om51bWJlcihidXR0b25XaWR0aCkgKyAicHgiKTsKLSAgICBi dXR0b24tPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlIZWlnaHQsIFN0cmluZzo6 bnVtYmVyKGJ1dHRvbkhlaWdodCkgKyAicHgiKTsKKyAgICBidXR0b24tPnNldElubGluZVN0eWxl UHJvcGVydHkoQ1NTUHJvcGVydHlUb3AsICgtYnV0dG9uSGVpZ2h0IC8gMikgLSBtX3RhcmdldC0+ cmVuZGVyQm94KCktPmJvcmRlclRvcCgpIC0gKGJvcmRlcldpZHRoIC8gMikgKyBidXR0b25Cb3R0 b21TaGFkb3dPZmZzZXQsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOworICAgIGJ1dHRvbi0+ c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUxlZnQsICgtYnV0dG9uV2lkdGggLyAy KSAtIG1fdGFyZ2V0LT5yZW5kZXJCb3goKS0+Ym9yZGVyTGVmdCgpIC0gKGJvcmRlcldpZHRoIC8g MiksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOworICAgIGJ1dHRvbi0+c2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBidXR0b25XaWR0aCwgQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU19QWCk7CisgICAgYnV0dG9uLT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5SGVpZ2h0LCBidXR0b25IZWlnaHQsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAg IGJ1dHRvbi0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVZpc2liaWxpdHksIENT U1ZhbHVlVmlzaWJsZSk7CiAKICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IFdlYkNvcmU6 OmRldmljZVNjYWxlRmFjdG9yKG1fZnJhbWUpOwpAQCAtMzE0LDcgKzMxNiw3IEBAIHZvaWQgRGVs ZXRlQnV0dG9uQ29udHJvbGxlcjo6c2hvdyhIVE1MRWwKICAgICB9CiAKICAgICBpZiAobV90YXJn ZXQtPnJlbmRlcmVyKCktPnN0eWxlKCktPmhhc0F1dG9aSW5kZXgoKSkgewotICAgICAgICBtX3Rh cmdldC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVpJbmRleCwgIjAiKTsKKyAg ICAgICAgbV90YXJnZXQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlaSW5kZXgs IFN0cmluZzo6bnVtYmVyKDApKTsKICAgICAgICAgbV93YXNBdXRvWkluZGV4ID0gdHJ1ZTsKICAg ICB9CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNv bnRyb2xFbGVtZW50LmNwcAkocmV2aXNpb24gMTUzNDg1KQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Niw3 ICsxNjYsNyBAQCB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Ojp1cGRhdGVQCiAgICAg SFRNTEVsZW1lbnQqIHBsYWNlaG9sZGVyID0gcGxhY2Vob2xkZXJFbGVtZW50KCk7CiAgICAgaWYg KCFwbGFjZWhvbGRlcikKICAgICAgICAgcmV0dXJuOwotICAgIHBsYWNlaG9sZGVyLT5zZXRJbmxp bmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5VmlzaWJpbGl0eSwgcGxhY2Vob2xkZXJTaG91bGRC ZVZpc2libGUoKSA/IEFTQ0lJTGl0ZXJhbCgidmlzaWJsZSIpIDogQVNDSUlMaXRlcmFsKCJoaWRk ZW4iKSk7CisgICAgcGxhY2Vob2xkZXItPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlWaXNpYmlsaXR5LCBwbGFjZWhvbGRlclNob3VsZEJlVmlzaWJsZSgpID8gQ1NTVmFsdWVWaXNp YmxlIDogQ1NTVmFsdWVIaWRkZW4pOwogfQogCiB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt ZW50OjpmaXhQbGFjZWhvbGRlclJlbmRlcmVyKEhUTUxFbGVtZW50KiBwbGFjZWhvbGRlciwgSFRN TEVsZW1lbnQqIHNpYmxpbmdFbGVtZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9JbWFn ZURvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9j dW1lbnQuY3BwCShyZXZpc2lvbiAxNTM0ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdl RG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTUsNyArMjU1LDcgQEAgdm9pZCBJbWFn ZURvY3VtZW50OjpyZXNpemVJbWFnZVRvRml0KCkKICAgICBtX2ltYWdlRWxlbWVudC0+c2V0V2lk dGgoc3RhdGljX2Nhc3Q8aW50PihpbWFnZVNpemUud2lkdGgoKSAqIHNjYWxlKSk7CiAgICAgbV9p bWFnZUVsZW1lbnQtPnNldEhlaWdodChzdGF0aWNfY2FzdDxpbnQ+KGltYWdlU2l6ZS5oZWlnaHQo KSAqIHNjYWxlKSk7CiAgICAgCi0gICAgbV9pbWFnZUVsZW1lbnQtPnNldElubGluZVN0eWxlUHJv cGVydHkoQ1NTUHJvcGVydHlDdXJzb3IsICItd2Via2l0LXpvb20taW4iLCBmYWxzZSk7CisgICAg bV9pbWFnZUVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlDdXJzb3Is IENTU1ZhbHVlV2Via2l0Wm9vbUluKTsKIH0KIAogdm9pZCBJbWFnZURvY3VtZW50OjppbWFnZUNs aWNrZWQoaW50IHgsIGludCB5KQpAQCAtMzExLDcgKzMxMSw3IEBAIHZvaWQgSW1hZ2VEb2N1bWVu dDo6cmVzdG9yZUltYWdlU2l6ZSgpCiAgICAgaWYgKGltYWdlRml0c0luV2luZG93KCkpCiAgICAg ICAgIG1faW1hZ2VFbGVtZW50LT5yZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5 Q3Vyc29yKTsKICAgICBlbHNlCi0gICAgICAgIG1faW1hZ2VFbGVtZW50LT5zZXRJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5Q3Vyc29yLCAiLXdlYmtpdC16b29tLW91dCIsIGZhbHNlKTsK KyAgICAgICAgbV9pbWFnZUVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlDdXJzb3IsIENTU1ZhbHVlV2Via2l0Wm9vbU91dCk7CiAgICAgICAgIAogICAgIG1fZGlkU2hy aW5rSW1hZ2UgPSBmYWxzZTsKIH0KQEAgLTM0NCw3ICszNDQsNyBAQCB2b2lkIEltYWdlRG9jdW1l bnQ6OndpbmRvd1NpemVDaGFuZ2VkKCkKICAgICAgICAgaWYgKGZpdHNJbldpbmRvdykKICAgICAg ICAgICAgIG1faW1hZ2VFbGVtZW50LT5yZW1vdmVJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5Q3Vyc29yKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9pbWFnZUVsZW1lbnQtPnNl dElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlDdXJzb3IsICItd2Via2l0LXpvb20tb3V0 IiwgZmFsc2UpOworICAgICAgICAgICAgbV9pbWFnZUVsZW1lbnQtPnNldElubGluZVN0eWxlUHJv cGVydHkoQ1NTUHJvcGVydHlDdXJzb3IsIENTU1ZhbHVlV2Via2l0Wm9vbU91dCk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCShyZXZpc2lvbiAxNTM0ODUpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEzMDIsOCArMTMwMiw4IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNr Q29udGFpbmVyRWxlbWUKICAgICAgICAgICAgICAgICBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9u LT5zZXRDb250ZW50U2NhbGUocGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CiAKICAgICAgICAg ICAgIG1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb24tPnVwZGF0ZSgpOwotICAgICAgICAgICAgc2V0 SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBTdHJpbmc6Om51bWJlcihtX3Zp ZGVvRGlzcGxheVNpemUuc2l6ZSgpLndpZHRoKCkpICsgInB4Iik7Ci0gICAgICAgICAgICBzZXRJ bmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0LCBTdHJpbmc6Om51bWJlcihtX3Zp ZGVvRGlzcGxheVNpemUuc2l6ZSgpLmhlaWdodCgpKSArICJweCIpOworICAgICAgICAgICAgc2V0 SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdpZHRoLCBtX3ZpZGVvRGlzcGxheVNpemUu c2l6ZSgpLndpZHRoKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOworICAgICAgICAgICAg c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwgbV92aWRlb0Rpc3BsYXlT aXplLnNpemUoKS5oZWlnaHQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CiAgICAgICAg IH0KICAgICB9IGVsc2UgewogICAgICAgICBoaWRlKCk7CkBAIC0xMzE3LDggKzEzMTcsOCBAQCB2 b2lkIE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uKSB7Ci0gICAgICAgIHNldElubGlu ZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlXaWR0aCwgU3RyaW5nOjpudW1iZXIobV92aWRlb0Rp c3BsYXlTaXplLnNpemUoKS53aWR0aCgpKSArICJweCIpOwotICAgICAgICBzZXRJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0LCBTdHJpbmc6Om51bWJlcihtX3ZpZGVvRGlzcGxh eVNpemUuc2l6ZSgpLmhlaWdodCgpKSArICJweCIpOworICAgICAgICBzZXRJbmxpbmVTdHlsZVBy b3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIG1fdmlkZW9EaXNwbGF5U2l6ZS5zaXplKCkud2lkdGgo KSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CisgICAgICAgIHNldElubGluZVN0eWxlUHJv cGVydHkoQ1NTUHJvcGVydHlIZWlnaHQsIG1fdmlkZW9EaXNwbGF5U2l6ZS5zaXplKCkuaGVpZ2h0 KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAgIH0KICAgICAKICAgICBIVE1MTWVk aWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAJKHJldmlzaW9u IDE1MzQ4NSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTIxMiw3ICsxMjEyLDcgQEAgdm9pZCBUZXh0VHJhY2tDdWU6OnNl dEZvbnRTaXplKGludCBmb250UwogICAgIAogICAgIExPRyhNZWRpYSwgIlRleHRUcmFja0N1ZTo6 c2V0Rm9udFNpemUgLSBzZXR0aW5nIGN1ZSBmb250IHNpemUgdG8gJWkiLCBmb250U2l6ZSk7CiAK LSAgICBkaXNwbGF5VHJlZUludGVybmFsKCktPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlGb250U2l6ZSwgU3RyaW5nOjpudW1iZXIoZm9udFNpemUpICsgInB4IiwgaW1wb3J0YW50 KTsKKyAgICBkaXNwbGF5VHJlZUludGVybmFsKCktPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NT UHJvcGVydHlGb250U2l6ZSwgZm9udFNpemUsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgsIGlt cG9ydGFudCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNwcAkocmV2aXNpb24g MTUzNDg1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmlj LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBAQCB2b2lkIFRleHRUcmFja0N1ZUdl bmVyaWNCb3hFbGVtZW50OjphcHBsCiAKICAgICBmbG9hdCBzaXplID0gc3RhdGljX2Nhc3Q8Zmxv YXQ+KGN1ZS0+Z2V0Q1NTU2l6ZSgpKTsKICAgICBpZiAoY3VlLT51c2VEZWZhdWx0UG9zaXRpb24o KSkgewotICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Qm90dG9tLCAi MCIpOworICAgICAgICBzZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Qm90dG9tLCAw LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eU1hcmdpbkJvdHRvbSwgMS4wLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT X1BFUkNFTlRBR0UpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlMZWZ0LCBzdGF0aWNfY2FzdDxmbG9hdD4oY3VlLT5wb3NpdGlvbigpKSwg Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKQEAgLTE0Nyw3ICsxNDcsNyBAQCB2 b2lkIFRleHRUcmFja0N1ZUdlbmVyaWM6OnNldEZvbnRTaXplKGluCiAgICAgZG91YmxlIHNpemUg PSB2aWRlb1NpemUuaGVpZ2h0KCkgKiBiYXNlRm9udFNpemVSZWxhdGl2ZVRvVmlkZW9IZWlnaHQo KSAvIDEwMDsKICAgICBpZiAoZm9udFNpemVNdWx0aXBsaWVyKCkpCiAgICAgICAgIHNpemUgKj0g Zm9udFNpemVNdWx0aXBsaWVyKCkgLyAxMDA7Ci0gICAgZGlzcGxheVRyZWVJbnRlcm5hbCgpLT5z ZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFNpemUsIFN0cmluZzo6bnVtYmVy KGxyb3VuZChzaXplKSkgKyAicHgiKTsKKyAgICBkaXNwbGF5VHJlZUludGVybmFsKCktPnNldElu bGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlGb250U2l6ZSwgbHJvdW5kKHNpemUpLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKIAogICAgIExPRyhNZWRpYSwgIlRleHRUcmFja0N1ZUdl bmVyaWM6OnNldEZvbnRTaXplIC0gc2V0dGluZyBjdWUgZm9udCBzaXplIHRvICVsaSIsIGxyb3Vu ZChzaXplKSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAJKHJldmlzaW9uIDE1MzQ4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MjgsMjMgKzI1MjgsMjMgQEAgdm9pZCBSZW5k ZXJMYXllcjo6cmVzaXplKGNvbnN0IFBsYXRmb3JtTQogICAgIGlmIChyZXNpemUgIT0gUkVTSVpF X1ZFUlRJQ0FMICYmIGRpZmZlcmVuY2Uud2lkdGgoKSkgewogICAgICAgICBpZiAoZWxlbWVudC0+ aXNGb3JtQ29udHJvbEVsZW1lbnQoKSkgewogICAgICAgICAgICAgLy8gTWFrZSBpbXBsaWNpdCBt YXJnaW5zIGZyb20gdGhlIHRoZW1lIGV4cGxpY2l0IChzZWUgPGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk1NDc+KS4KLSAgICAgICAgICAgIHN0eWxlZEVsZW1lbnQtPnNl dElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlNYXJnaW5MZWZ0LCBTdHJpbmc6Om51bWJl cihyZW5kZXJlci0+bWFyZ2luTGVmdCgpIC8gem9vbUZhY3RvcikgKyAicHgiLCBmYWxzZSk7Ci0g ICAgICAgICAgICBzdHlsZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5TWFyZ2luUmlnaHQsIFN0cmluZzo6bnVtYmVyKHJlbmRlcmVyLT5tYXJnaW5SaWdodCgpIC8g em9vbUZhY3RvcikgKyAicHgiLCBmYWxzZSk7CisgICAgICAgICAgICBzdHlsZWRFbGVtZW50LT5z ZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWFyZ2luTGVmdCwgcmVuZGVyZXItPm1h cmdpbkxlZnQoKSAvIHpvb21GYWN0b3IsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOworICAg ICAgICAgICAgc3R5bGVkRWxlbWVudC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eU1hcmdpblJpZ2h0LCByZW5kZXJlci0+bWFyZ2luUmlnaHQoKSAvIHpvb21GYWN0b3IsIENTU1By aW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAgICAgICB9CiAgICAgICAgIExheW91dFVuaXQgYmFz ZVdpZHRoID0gcmVuZGVyZXItPndpZHRoKCkgLSAoaXNCb3hTaXppbmdCb3JkZXIgPyBMYXlvdXRV bml0KCkgOiByZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ1dpZHRoKCkpOwogICAgICAgICBiYXNl V2lkdGggPSBiYXNlV2lkdGggLyB6b29tRmFjdG9yOwotICAgICAgICBzdHlsZWRFbGVtZW50LT5z ZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5V2lkdGgsIFN0cmluZzo6bnVtYmVyKHJv dW5kVG9JbnQoYmFzZVdpZHRoICsgZGlmZmVyZW5jZS53aWR0aCgpKSkgKyAicHgiLCBmYWxzZSk7 CisgICAgICAgIHN0eWxlZEVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVy dHlXaWR0aCwgcm91bmRUb0ludChiYXNlV2lkdGggKyBkaWZmZXJlbmNlLndpZHRoKCkpLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICB9CiAKICAgICBpZiAocmVzaXplICE9IFJFU0la RV9IT1JJWk9OVEFMICYmIGRpZmZlcmVuY2UuaGVpZ2h0KCkpIHsKICAgICAgICAgaWYgKGVsZW1l bnQtPmlzRm9ybUNvbnRyb2xFbGVtZW50KCkpIHsKICAgICAgICAgICAgIC8vIE1ha2UgaW1wbGlj aXQgbWFyZ2lucyBmcm9tIHRoZSB0aGVtZSBleHBsaWNpdCAoc2VlIDxodHRwOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTQ3PikuCi0gICAgICAgICAgICBzdHlsZWRFbGVtZW50 LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWFyZ2luVG9wLCBTdHJpbmc6Om51 bWJlcihyZW5kZXJlci0+bWFyZ2luVG9wKCkgLyB6b29tRmFjdG9yKSArICJweCIsIGZhbHNlKTsK LSAgICAgICAgICAgIHN0eWxlZEVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJv cGVydHlNYXJnaW5Cb3R0b20sIFN0cmluZzo6bnVtYmVyKHJlbmRlcmVyLT5tYXJnaW5Cb3R0b20o KSAvIHpvb21GYWN0b3IpICsgInB4IiwgZmFsc2UpOworICAgICAgICAgICAgc3R5bGVkRWxlbWVu dC0+c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1hcmdpblRvcCwgcmVuZGVyZXIt Pm1hcmdpblRvcCgpIC8gem9vbUZhY3RvciwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7Cisg ICAgICAgICAgICBzdHlsZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5TWFyZ2luQm90dG9tLCByZW5kZXJlci0+bWFyZ2luQm90dG9tKCkgLyB6b29tRmFjdG9yLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICAgICAgfQogICAgICAgICBMYXlvdXRVbml0 IGJhc2VIZWlnaHQgPSByZW5kZXJlci0+aGVpZ2h0KCkgLSAoaXNCb3hTaXppbmdCb3JkZXIgPyBM YXlvdXRVbml0KCkgOiByZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpKTsKICAgICAg ICAgYmFzZUhlaWdodCA9IGJhc2VIZWlnaHQgLyB6b29tRmFjdG9yOwotICAgICAgICBzdHlsZWRF bGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0LCBTdHJpbmc6 Om51bWJlcihyb3VuZFRvSW50KGJhc2VIZWlnaHQgKyBkaWZmZXJlbmNlLmhlaWdodCgpKSkgKyAi cHgiLCBmYWxzZSk7CisgICAgICAgIHN0eWxlZEVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlIZWlnaHQsIHJvdW5kVG9JbnQoYmFzZUhlaWdodCArIGRpZmZlcmVuY2Uu aGVpZ2h0KCkpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICB9CiAKICAgICBkb2N1 bWVudC0+dXBkYXRlTGF5b3V0KCk7Cg==