138296 2014-11-02 16:00:19 -0800 Move -webkit-shape-outside to the new StyleBuilder 2014-11-03 11:40:26 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez benjamin betravis buildbot commit-queue kling koivisto rniwa sam zoltan oldest_to_newest 1045636 0 cdumez 2014-11-02 16:00:19 -0800 Move -webkit-shape-outside to the new StyleBuilder. 1045637 1 cdumez 2014-11-02 16:03:10 -0800 Bear, Zoltan, when looking at the ApplyPropertyShape<> code in DeprecatedStyleBuilder.cpp, I noticed that it is handling only CSSValueAuto as CSSPrimitiveValue. This does not seem right. The spec (and our CSS Parser) only seem to allow CSSValueNone as CSSPrimitiveValue. Should we update ApplyPropertyShape<> to all setShapeOutside(style, nullptr) when the value is CSSValueNone? (instead of CSSValueAuto). 1045641 2 240822 cdumez 2014-11-02 16:33:18 -0800 Created attachment 240822 Patch 1045649 3 betravis 2014-11-02 20:12:31 -0800 Yes, if CSSValueAuto is lurking in the code, it is from an older version of the spec that used 'auto' instead of 'none'. Will look into this more tomorrow. 1045744 4 240853 cdumez 2014-11-03 09:03:50 -0800 Created attachment 240853 Patch 1045746 5 cdumez 2014-11-03 09:05:38 -0800 I am just adding a FIXME about the CSSValueAuto in this patch since the idea is to move the code to the new StyleBuilder, not change behavior. Hopefully, Bear can update the code afterwards. 1045782 6 240853 zoltan 2014-11-03 10:52:12 -0800 Comment on attachment 240853 Patch Thanks for moving the code to the new StyleBuilder! Looks good. 1045803 7 240853 commit-queue 2014-11-03 11:40:19 -0800 Comment on attachment 240853 Patch Clearing flags on attachment: 240853 Committed r175481: <http://trac.webkit.org/changeset/175481> 1045804 8 commit-queue 2014-11-03 11:40:26 -0800 All reviewed patches have been landed. Closing bug. 240822 2014-11-02 16:33:18 -0800 2014-11-03 09:03:46 -0800 Patch bug-138296-20141102163327.patch text/plain 9321 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE3YzBlZmY5ZjI2YWNj ZWFhODBmODZhMzNjZjg1YTI2NzRhOWFmOS4uZTQ0NTlkZWYyYWZiNzE1MzcyOWJkY2UzNWVhOWY4 MzhmMGExZDY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTExLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSAtd2Via2l0LXNoYXBl LW91dHNpZGUgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODI5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgLXdlYmtpdC1zaGFwZS1vdXRzaWRlIHRvIHRo ZSBuZXcgU3R5bGVCdWlsZGVyLCB1c2luZyBjdXN0b20KKyAgICAgICAgY29kZSBhcyBpdCBkb2Vz IG5vdCBhbHdheXMgY2FsbCBzZXRTaGFwZU91dHNpZGUoKS4KKworICAgICAgICBObyBuZXcgdGVz dHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVz LmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIp OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVNoYXBlOjpzZXRWYWx1ZSk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5U2hhcGU6OmFwcGx5VmFsdWUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVNoYXBlOjpjcmVhdGVIYW5k bGVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OmFwcGx5VmFsdWVXZWJraXRTaGFw ZU91dHNpZGUpOgorCisyMDE0LTExLTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CisKICAgICAgICAgTW92ZSBzdHJpbmctdHlwZWQgcHJvcGVydGllcyB0byB0aGUgbmV3IFN0eWxl QnVpbGRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM4Mjk1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVz LmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggZjI5NWI0 MjExOGFiMTFkYWJkZGVmNGU1N2YyODRmNmViNDYzMGQ0NS4uYzVmNmI2ZTZlOWZkOGVjOWQwOTdh NmQ0NWEzNDU2NjA4MzI1ZmE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1By b3BlcnR5TmFtZXMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMu aW4KQEAgLTUxMiw3ICs1MTIsNyBAQCB0ZXh0LWVtcGhhc2lzLXN0eWxlID0gLXdlYmtpdC10ZXh0 LWVtcGhhc2lzLXN0eWxlCiAtd2Via2l0LXJlZ2lvbi1icmVhay1pbnNpZGUgW05ld1N0eWxlQnVp bGRlciwgVHlwZU5hbWU9RVBhZ2VCcmVhaywgSW5pdGlhbD1pbml0aWFsUGFnZUJyZWFrXQogI2Vu ZGlmCiAjaWYgZGVmaW5lZChFTkFCTEVfQ1NTX1NIQVBFUykgJiYgRU5BQkxFX0NTU19TSEFQRVMK LS13ZWJraXQtc2hhcGUtb3V0c2lkZQorLXdlYmtpdC1zaGFwZS1vdXRzaWRlIFtOZXdTdHlsZUJ1 aWxkZXIsIEN1c3RvbT1WYWx1ZV0KIC13ZWJraXQtc2hhcGUtbWFyZ2luIFtOZXdTdHlsZUJ1aWxk ZXIsIENvbnZlcnRlcj1MZW5ndGhdCiAtd2Via2l0LXNoYXBlLWltYWdlLXRocmVzaG9sZCBbTmV3 U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9TnVtYmVyPGZsb2F0Pl0KICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDMwODViNzY0ZDhi NDQ4MWMwNTY1YWVkMmJiZjQ2M2MxNzcxY2U2MTMuLjM4ZTE5ZjJmOTc2NWFiY2NkMmQ2ZmM2ZGI4 Njk2NjRiZGU1YzU2Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVk U3R5bGVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHAKQEAgLTE4NTUsNTMgKzE4NTUsNiBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAot I2lmIEVOQUJMRShDU1NfU0hBUEVTKQotdGVtcGxhdGUgPFNoYXBlVmFsdWUqIChSZW5kZXJTdHls ZTo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0LCB2b2lkIChSZW5kZXJTdHlsZTo6KnNldHRlckZ1 bmN0aW9uKShQYXNzUmVmUHRyPFNoYXBlVmFsdWU+KSwgU2hhcGVWYWx1ZSogKCppbml0aWFsRnVu Y3Rpb24pKCk+Ci1jbGFzcyBBcHBseVByb3BlcnR5U2hhcGUgewotcHVibGljOgotICAgIHN0YXRp YyB2b2lkIHNldFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgUGFzc1JlZlB0cjxTaGFwZVZhbHVl PiB2YWx1ZSkgeyAoc3R5bGUtPipzZXR0ZXJGdW5jdGlvbikodmFsdWUpOyB9Ci0gICAgc3RhdGlj IHZvaWQgYXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBTdHlsZVJlc29sdmVyKiBz dHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBpZiAoaXM8Q1NT UHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSkpIHsKLSAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVl JiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUpOwot ICAgICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUF1 dG8pCi0gICAgICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgMCk7 Ci0gICAgICAgIH0gZWxzZSBpZiAodmFsdWUtPmlzSW1hZ2VWYWx1ZSgpIHx8IHZhbHVlLT5pc0lt YWdlR2VuZXJhdG9yVmFsdWUoKSB8fCB2YWx1ZS0+aXNJbWFnZVNldFZhbHVlKCkpIHsKLSAgICAg ICAgICAgIFJlZlB0cjxTaGFwZVZhbHVlPiBzaGFwZSA9IFNoYXBlVmFsdWU6OmNyZWF0ZUltYWdl VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGVJbWFnZShwcm9wZXJ0eSwgdmFsdWUpKTsKLSAgICAg ICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIHNoYXBlLnJlbGVhc2UoKSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAoaXM8Q1NTVmFsdWVMaXN0PigqdmFsdWUpKSB7Ci0gICAgICAg ICAgICBSZWZQdHI8QmFzaWNTaGFwZT4gc2hhcGU7Ci0gICAgICAgICAgICBDU1NCb3hUeXBlIHJl ZmVyZW5jZUJveCA9IEJveE1pc3Npbmc7Ci0gICAgICAgICAgICBDU1NWYWx1ZUxpc3QmIHZhbHVl TGlzdCA9IGRvd25jYXN0PENTU1ZhbHVlTGlzdD4oKnZhbHVlKTsKLSAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCB2YWx1ZUxpc3QubGVuZ3RoKCk7ICsraSkgewotICAgICAgICAg ICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1By aW1pdGl2ZVZhbHVlPigqdmFsdWVMaXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSkpOwotICAg ICAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5pc1NoYXBlKCkpCi0gICAgICAgICAgICAg ICAgICAgIHNoYXBlID0gYmFzaWNTaGFwZUZvclZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0YXRlKCku Y3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpLCBwcmltaXRpdmVWYWx1ZS5nZXRTaGFwZVZhbHVl KCkpOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQo KSA9PSBDU1NWYWx1ZUNvbnRlbnRCb3gKLSAgICAgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZl VmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlQm9yZGVyQm94Ci0gICAgICAgICAgICAgICAg ICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZVBhZGRpbmdCb3gK LSAgICAgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENT U1ZhbHVlTWFyZ2luQm94KQotICAgICAgICAgICAgICAgICAgICByZWZlcmVuY2VCb3ggPSBDU1NC b3hUeXBlKHByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKHNoYXBl KQotICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBl VmFsdWU6OmNyZWF0ZVNoYXBlVmFsdWUoc2hhcGUucmVsZWFzZSgpLCByZWZlcmVuY2VCb3gpKTsK LSAgICAgICAgICAgIGVsc2UgaWYgKHJlZmVyZW5jZUJveCAhPSBCb3hNaXNzaW5nKQotICAgICAg ICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlVmFsdWU6OmNy ZWF0ZUJveFNoYXBlVmFsdWUocmVmZXJlbmNlQm94KSk7Ci0KLSAgICAgICAgfQotICAgIH0KLQot ICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpCi0gICAgewotICAgICAg ICBQcm9wZXJ0eUhhbmRsZXIgaGFuZGxlciA9IEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxTaGFw ZVZhbHVlKiwgZ2V0dGVyRnVuY3Rpb24sIFBhc3NSZWZQdHI8U2hhcGVWYWx1ZT4sIHNldHRlckZ1 bmN0aW9uLCBTaGFwZVZhbHVlKiwgaW5pdGlhbEZ1bmN0aW9uPjo6Y3JlYXRlSGFuZGxlcigpOwot ICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKGhhbmRsZXIuaW5oZXJpdEZ1bmN0aW9uKCks IGhhbmRsZXIuaW5pdGlhbEZ1bmN0aW9uKCksICZhcHBseVZhbHVlKTsKLSAgICB9Ci19OwotI2Vu ZGlmCi0KICNpZiBFTkFCTEUoQ1NTX0lNQUdFX1JFU09MVVRJT04pCiBjbGFzcyBBcHBseVByb3Bl cnR5SW1hZ2VSZXNvbHV0aW9uIHsKIHB1YmxpYzoKQEAgLTIxMjIsOSArMjA3NSw2IEBAIERlcHJl Y2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zaXRpb25Qcm9wZXJ0eSwgQXBwbHlQcm9w ZXJ0eUFuaW1hdGlvbjxDU1NQcm9wZXJ0eUlELCAmQW5pbWF0aW9uOjpwcm9wZXJ0eSwgJkFuaW1h dGlvbjo6c2V0UHJvcGVydHksICZBbmltYXRpb246OmlzUHJvcGVydHlTZXQsICZBbmltYXRpb246 OmNsZWFyUHJvcGVydHksICZBbmltYXRpb246OmluaXRpYWxBbmltYXRpb25Qcm9wZXJ0eSwgJkNT U1RvU3R5bGVNYXA6Om1hcEFuaW1hdGlvblByb3BlcnR5LCAmUmVuZGVyU3R5bGU6OmFjY2Vzc1Ry YW5zaXRpb25zLCAmUmVuZGVyU3R5bGU6OnRyYW5zaXRpb25zPjo6Y3JlYXRlSGFuZGxlcigpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uVGltaW5n RnVuY3Rpb24sIEFwcGx5UHJvcGVydHlBbmltYXRpb248Y29uc3QgUGFzc1JlZlB0cjxUaW1pbmdG dW5jdGlvbj4sICZBbmltYXRpb246OnRpbWluZ0Z1bmN0aW9uLCAmQW5pbWF0aW9uOjpzZXRUaW1p bmdGdW5jdGlvbiwgJkFuaW1hdGlvbjo6aXNUaW1pbmdGdW5jdGlvblNldCwgJkFuaW1hdGlvbjo6 Y2xlYXJUaW1pbmdGdW5jdGlvbiwgJkFuaW1hdGlvbjo6aW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1 bmN0aW9uLCAmQ1NTVG9TdHlsZU1hcDo6bWFwQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24sICZSZW5k ZXJTdHlsZTo6YWNjZXNzVHJhbnNpdGlvbnMsICZSZW5kZXJTdHlsZTo6dHJhbnNpdGlvbnM+Ojpj cmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtp dENsaXBQYXRoLCBBcHBseVByb3BlcnR5Q2xpcFBhdGg8JlJlbmRlclN0eWxlOjpjbGlwUGF0aCwg JlJlbmRlclN0eWxlOjpzZXRDbGlwUGF0aCwgJlJlbmRlclN0eWxlOjppbml0aWFsQ2xpcFBhdGg+ OjpjcmVhdGVIYW5kbGVyKCkpOwotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlT3V0c2lkZSwgQXBwbHlQcm9wZXJ0eVNo YXBlPCZSZW5kZXJTdHlsZTo6c2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5bGU6OnNldFNoYXBlT3V0 c2lkZSwgJlJlbmRlclN0eWxlOjppbml0aWFsU2hhcGVPdXRzaWRlPjo6Y3JlYXRlSGFuZGxlcigp KTsKLSNlbmRpZgogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdpZG93cywgQXBw bHlQcm9wZXJ0eUF1dG88c2hvcnQsICZSZW5kZXJTdHlsZTo6d2lkb3dzLCAmUmVuZGVyU3R5bGU6 OnNldFdpZG93cywgJlJlbmRlclN0eWxlOjpoYXNBdXRvV2lkb3dzLCAmUmVuZGVyU3R5bGU6OnNl dEhhc0F1dG9XaWRvd3M+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eVdvcmRTcGFjaW5nLCBBcHBseVByb3BlcnR5V29yZFNwYWNpbmc6OmNyZWF0 ZUhhbmRsZXIoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRl eCA0MjhhM2IwMzRkMmJkMTI0NGYxZDNkMjZhZjU0OTkyYzI2YjNmNzY2Li41NzNhYzQ0YzkyYzJj M2MyNjViZmVlZmNjMTg4NmU0ZjAyNjk0MmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVp bGRlckN1c3RvbS5oCkBAIC0yNyw2ICsyNywxMCBAQAogI2lmbmRlZiBTdHlsZUJ1aWxkZXJDdXN0 b21faAogI2RlZmluZSBTdHlsZUJ1aWxkZXJDdXN0b21faAogCisjaW5jbHVkZSAiQmFzaWNTaGFw ZUZ1bmN0aW9ucy5oIgorI2luY2x1ZGUgIkNTU0ltYWdlR2VuZXJhdG9yVmFsdWUuaCIKKyNpbmNs dWRlICJDU1NJbWFnZVNldFZhbHVlLmgiCisjaW5jbHVkZSAiQ1NTSW1hZ2VWYWx1ZS5oIgogI2lu Y2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjYsNiAr NzAsNDIgQEAgaW5saW5lIHZvaWQgYXBwbHlWYWx1ZURpcmVjdGlvbihTdHlsZVJlc29sdmVyJiBz dHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiAgICAgICAgIGVsZW1lbnQtPmRvY3VtZW50 KCkuc2V0RGlyZWN0aW9uU2V0T25Eb2N1bWVudEVsZW1lbnQodHJ1ZSk7CiB9CiAKKyNpZiBFTkFC TEUoQ1NTX1NIQVBFUykKK2lubGluZSB2b2lkIGFwcGx5VmFsdWVXZWJraXRTaGFwZU91dHNpZGUo U3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQoreworICAgIGlm IChpczxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUpKSB7CisgICAgICAgIC8vIEZJWE1FOiBTaG91 bGRuJ3QgdGhpcyBiZSBDU1NWYWx1ZU5vbmU/CisgICAgICAgIC8vIGh0dHA6Ly93d3cudzMub3Jn L1RSL2Nzcy1zaGFwZXMvI3NoYXBlLW91dHNpZGUtcHJvcGVydHkKKyAgICAgICAgaWYgKGRvd25j YXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSkuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlQXV0 bykKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0U2hhcGVPdXRzaWRlKG51 bGxwdHIpOworICAgIH0gaWYgKGlzPENTU0ltYWdlVmFsdWU+KHZhbHVlKSB8fCBpczxDU1NJbWFn ZUdlbmVyYXRvclZhbHVlPih2YWx1ZSkgfHwgaXM8Q1NTSW1hZ2VTZXRWYWx1ZT4odmFsdWUpKSB7 CisgICAgICAgIFJlZlB0cjxTaGFwZVZhbHVlPiBzaGFwZSA9IFNoYXBlVmFsdWU6OmNyZWF0ZUlt YWdlVmFsdWUoc3R5bGVSZXNvbHZlci5zdHlsZUltYWdlKENTU1Byb3BlcnR5V2Via2l0U2hhcGVP dXRzaWRlLCAmdmFsdWUpKTsKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRTaGFw ZU91dHNpZGUoc2hhcGUucmVsZWFzZSgpKTsKKyAgICB9IGVsc2UgaWYgKGlzPENTU1ZhbHVlTGlz dD4odmFsdWUpKSB7CisgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlPiBzaGFwZTsKKyAgICAgICAg Q1NTQm94VHlwZSByZWZlcmVuY2VCb3ggPSBCb3hNaXNzaW5nOworICAgICAgICBhdXRvJiB2YWx1 ZUxpc3QgPSBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KHZhbHVlKTsKKyAgICAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IHZhbHVlTGlzdC5sZW5ndGgoKTsgKytpKSB7CisgICAgICAgICAgICBD U1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVW YWx1ZT4oKnZhbHVlTGlzdC5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKGkpKTsKKyAgICAgICAgICAg IGlmIChwcmltaXRpdmVWYWx1ZS5pc1NoYXBlKCkpCisgICAgICAgICAgICAgICAgc2hhcGUgPSBi YXNpY1NoYXBlRm9yVmFsdWUoc3R5bGVSZXNvbHZlci5zdGF0ZSgpLmNzc1RvTGVuZ3RoQ29udmVy c2lvbkRhdGEoKSwgcHJpbWl0aXZlVmFsdWUuZ2V0U2hhcGVWYWx1ZSgpKTsKKyAgICAgICAgICAg IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUNvbnRlbnRC b3gKKyAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NT VmFsdWVCb3JkZXJCb3gKKyAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1 ZUlEKCkgPT0gQ1NTVmFsdWVQYWRkaW5nQm94CisgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZl VmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlTWFyZ2luQm94KQorICAgICAgICAgICAgICAg IHJlZmVyZW5jZUJveCA9IENTU0JveFR5cGUocHJpbWl0aXZlVmFsdWUpOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChz aGFwZSkKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0U2hhcGVPdXRzaWRl KFNoYXBlVmFsdWU6OmNyZWF0ZVNoYXBlVmFsdWUoc2hhcGUucmVsZWFzZSgpLCByZWZlcmVuY2VC b3gpKTsKKyAgICAgICAgZWxzZSBpZiAocmVmZXJlbmNlQm94ICE9IEJveE1pc3NpbmcpCisgICAg ICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFNoYXBlT3V0c2lkZShTaGFwZVZhbHVl OjpjcmVhdGVCb3hTaGFwZVZhbHVlKHJlZmVyZW5jZUJveCkpOworICAgIH0KK30KKyNlbmRpZiAv LyBFTkFCTEUoQ1NTX1NIQVBFUykKKwogfSAvLyBuYW1lc3BhY2UgU3R5bGVCdWlsZGVyRnVuY3Rp b25zCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 240853 2014-11-03 09:03:50 -0800 2014-11-03 11:40:19 -0800 Patch bug-138296-20141103090400.patch text/plain 9194 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjcwMGM2NjJmMTgxN2E5 MjQ4ZjI0NzcxNDc5YTBiZGJhNDg1YjQ1My4uNzA2YjEwMDUzZmMzMjc1ZDhlNDA0OWQxODI4Y2Jh NjRhNGNhMjZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAtd2Via2l0LXNoYXBl LW91dHNpZGUgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODI5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgLXdlYmtpdC1zaGFwZS1vdXRzaWRlIHRvIHRo ZSBuZXcgU3R5bGVCdWlsZGVyLCB1c2luZyBjdXN0b20KKyAgICAgICAgY29kZSBhcyBpdCBkb2Vz IG5vdCBhbHdheXMgY2FsbCBzZXRTaGFwZU91dHNpZGUoKS4KKworICAgICAgICBObyBuZXcgdGVz dHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVz LmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIp OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVNoYXBlOjpzZXRWYWx1ZSk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5U2hhcGU6OmFwcGx5VmFsdWUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVNoYXBlOjpjcmVhdGVIYW5k bGVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OmFwcGx5VmFsdWVXZWJraXRTaGFw ZU91dHNpZGUpOgorCiAyMDE0LTExLTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgTW92ZSAnem9vbScgQ1NTIHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWls ZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4IGU3NmUzMmMxN2E3 NjVmYmU2MjIxYTRlNDg2MzNjOTM2N2E4MDA1OWQuLmQ4ODI5MzNiYzBiMWZkMjViOTMwOTg4ODc4 ZGYzMzhiNzYzMGMyMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0 eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBA IC01MTQsNyArNTE0LDcgQEAgdGV4dC1lbXBoYXNpcy1zdHlsZSA9IC13ZWJraXQtdGV4dC1lbXBo YXNpcy1zdHlsZQogLXdlYmtpdC1yZWdpb24tYnJlYWstaW5zaWRlIFtOZXdTdHlsZUJ1aWxkZXIs IFR5cGVOYW1lPUVQYWdlQnJlYWssIEluaXRpYWw9aW5pdGlhbFBhZ2VCcmVha10KICNlbmRpZgog I2lmIGRlZmluZWQoRU5BQkxFX0NTU19TSEFQRVMpICYmIEVOQUJMRV9DU1NfU0hBUEVTCi0td2Vi a2l0LXNoYXBlLW91dHNpZGUKKy13ZWJraXQtc2hhcGUtb3V0c2lkZSBbTmV3U3R5bGVCdWlsZGVy LCBDdXN0b209VmFsdWVdCiAtd2Via2l0LXNoYXBlLW1hcmdpbiBbTmV3U3R5bGVCdWlsZGVyLCBD b252ZXJ0ZXI9TGVuZ3RoXQogLXdlYmtpdC1zaGFwZS1pbWFnZS10aHJlc2hvbGQgW05ld1N0eWxl QnVpbGRlciwgQ29udmVydGVyPU51bWJlcjxmbG9hdD5dCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRleCBkY2VlMjY2OTY0MTA4MWI4 NGI0ZjgyMmQ4MTU4ZjRhODAxYTExMzM4Li41NjIwMWNkNTdmMWEwMTdhY2RmNTdhZmMxZmE4NmU1 N2U0YjYxMzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIuY3BwCkBAIC0xODAzLDUzICsxODAzLDYgQEAgcHVibGljOgogICAgIH0KIH07CiAKLSNpZiBF TkFCTEUoQ1NTX1NIQVBFUykKLXRlbXBsYXRlIDxTaGFwZVZhbHVlKiAoUmVuZGVyU3R5bGU6Oipn ZXR0ZXJGdW5jdGlvbikoKSBjb25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXJGdW5jdGlv bikoUGFzc1JlZlB0cjxTaGFwZVZhbHVlPiksIFNoYXBlVmFsdWUqICgqaW5pdGlhbEZ1bmN0aW9u KSgpPgotY2xhc3MgQXBwbHlQcm9wZXJ0eVNoYXBlIHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9p ZCBzZXRWYWx1ZShSZW5kZXJTdHlsZSogc3R5bGUsIFBhc3NSZWZQdHI8U2hhcGVWYWx1ZT4gdmFs dWUpIHsgKHN0eWxlLT4qc2V0dGVyRnVuY3Rpb24pKHZhbHVlKTsgfQotICAgIHN0YXRpYyB2b2lk IGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwgU3R5bGVSZXNvbHZlciogc3R5bGVS ZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsKLSAgICAgICAgaWYgKGlzPENTU1ByaW1p dGl2ZVZhbHVlPigqdmFsdWUpKSB7Ci0gICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgcHJp bWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKTsKLSAgICAg ICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVBdXRvKQot ICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIDApOwotICAg ICAgICB9IGVsc2UgaWYgKHZhbHVlLT5pc0ltYWdlVmFsdWUoKSB8fCB2YWx1ZS0+aXNJbWFnZUdl bmVyYXRvclZhbHVlKCkgfHwgdmFsdWUtPmlzSW1hZ2VTZXRWYWx1ZSgpKSB7Ci0gICAgICAgICAg ICBSZWZQdHI8U2hhcGVWYWx1ZT4gc2hhcGUgPSBTaGFwZVZhbHVlOjpjcmVhdGVJbWFnZVZhbHVl KHN0eWxlUmVzb2x2ZXItPnN0eWxlSW1hZ2UocHJvcGVydHksIHZhbHVlKSk7Ci0gICAgICAgICAg ICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBzaGFwZS5yZWxlYXNlKCkpOwotICAg ICAgICB9IGVsc2UgaWYgKGlzPENTU1ZhbHVlTGlzdD4oKnZhbHVlKSkgewotICAgICAgICAgICAg UmVmUHRyPEJhc2ljU2hhcGU+IHNoYXBlOwotICAgICAgICAgICAgQ1NTQm94VHlwZSByZWZlcmVu Y2VCb3ggPSBCb3hNaXNzaW5nOwotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0JiB2YWx1ZUxpc3Qg PSBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSk7Ci0gICAgICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgdmFsdWVMaXN0Lmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgICAgICAg ICBDU1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRp dmVWYWx1ZT4oKnZhbHVlTGlzdC5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKGkpKTsKLSAgICAgICAg ICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNTaGFwZSgpKQotICAgICAgICAgICAgICAgICAg ICBzaGFwZSA9IGJhc2ljU2hhcGVGb3JWYWx1ZShzdHlsZVJlc29sdmVyLT5zdGF0ZSgpLmNzc1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEoKSwgcHJpbWl0aXZlVmFsdWUuZ2V0U2hhcGVWYWx1ZSgpKTsK LSAgICAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0g Q1NTVmFsdWVDb250ZW50Qm94Ci0gICAgICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVl LmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUJvcmRlckJveAotICAgICAgICAgICAgICAgICAgICB8 fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVQYWRkaW5nQm94Ci0gICAg ICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1 ZU1hcmdpbkJveCkKLSAgICAgICAgICAgICAgICAgICAgcmVmZXJlbmNlQm94ID0gQ1NTQm94VHlw ZShwcmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmIChzaGFwZSkKLSAg ICAgICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBTaGFwZVZhbHVl OjpjcmVhdGVTaGFwZVZhbHVlKHNoYXBlLnJlbGVhc2UoKSwgcmVmZXJlbmNlQm94KSk7Ci0gICAg ICAgICAgICBlbHNlIGlmIChyZWZlcmVuY2VCb3ggIT0gQm94TWlzc2luZykKLSAgICAgICAgICAg ICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBTaGFwZVZhbHVlOjpjcmVhdGVC b3hTaGFwZVZhbHVlKHJlZmVyZW5jZUJveCkpOwotCi0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBz dGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQotICAgIHsKLSAgICAgICAgUHJv cGVydHlIYW5kbGVyIGhhbmRsZXIgPSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8U2hhcGVWYWx1 ZSosIGdldHRlckZ1bmN0aW9uLCBQYXNzUmVmUHRyPFNoYXBlVmFsdWU+LCBzZXR0ZXJGdW5jdGlv biwgU2hhcGVWYWx1ZSosIGluaXRpYWxGdW5jdGlvbj46OmNyZWF0ZUhhbmRsZXIoKTsKLSAgICAg ICAgcmV0dXJuIFByb3BlcnR5SGFuZGxlcihoYW5kbGVyLmluaGVyaXRGdW5jdGlvbigpLCBoYW5k bGVyLmluaXRpYWxGdW5jdGlvbigpLCAmYXBwbHlWYWx1ZSk7Ci0gICAgfQotfTsKLSNlbmRpZgot CiAjaWYgRU5BQkxFKENTU19JTUFHRV9SRVNPTFVUSU9OKQogY2xhc3MgQXBwbHlQcm9wZXJ0eUlt YWdlUmVzb2x1dGlvbiB7CiBwdWJsaWM6CkBAIC0yMDcwLDkgKzIwMjMsNiBAQCBEZXByZWNhdGVk U3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uUHJvcGVydHksIEFwcGx5UHJvcGVydHlB bmltYXRpb248Q1NTUHJvcGVydHlJRCwgJkFuaW1hdGlvbjo6cHJvcGVydHksICZBbmltYXRpb246 OnNldFByb3BlcnR5LCAmQW5pbWF0aW9uOjppc1Byb3BlcnR5U2V0LCAmQW5pbWF0aW9uOjpjbGVh clByb3BlcnR5LCAmQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uUHJvcGVydHksICZDU1NUb1N0 eWxlTWFwOjptYXBBbmltYXRpb25Qcm9wZXJ0eSwgJlJlbmRlclN0eWxlOjphY2Nlc3NUcmFuc2l0 aW9ucywgJlJlbmRlclN0eWxlOjp0cmFuc2l0aW9ucz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VHJhbnNpdGlvblRpbWluZ0Z1bmN0 aW9uLCBBcHBseVByb3BlcnR5QW5pbWF0aW9uPGNvbnN0IFBhc3NSZWZQdHI8VGltaW5nRnVuY3Rp b24+LCAmQW5pbWF0aW9uOjp0aW1pbmdGdW5jdGlvbiwgJkFuaW1hdGlvbjo6c2V0VGltaW5nRnVu Y3Rpb24sICZBbmltYXRpb246OmlzVGltaW5nRnVuY3Rpb25TZXQsICZBbmltYXRpb246OmNsZWFy VGltaW5nRnVuY3Rpb24sICZBbmltYXRpb246OmluaXRpYWxBbmltYXRpb25UaW1pbmdGdW5jdGlv biwgJkNTU1RvU3R5bGVNYXA6Om1hcEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uLCAmUmVuZGVyU3R5 bGU6OmFjY2Vzc1RyYW5zaXRpb25zLCAmUmVuZGVyU3R5bGU6OnRyYW5zaXRpb25zPjo6Y3JlYXRl SGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRDbGlw UGF0aCwgQXBwbHlQcm9wZXJ0eUNsaXBQYXRoPCZSZW5kZXJTdHlsZTo6Y2xpcFBhdGgsICZSZW5k ZXJTdHlsZTo6c2V0Q2xpcFBhdGgsICZSZW5kZXJTdHlsZTo6aW5pdGlhbENsaXBQYXRoPjo6Y3Jl YXRlSGFuZGxlcigpKTsKLSNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGUsIEFwcGx5UHJvcGVydHlTaGFwZTwm UmVuZGVyU3R5bGU6OnNoYXBlT3V0c2lkZSwgJlJlbmRlclN0eWxlOjpzZXRTaGFwZU91dHNpZGUs ICZSZW5kZXJTdHlsZTo6aW5pdGlhbFNoYXBlT3V0c2lkZT46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0j ZW5kaWYKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXaWRvd3MsIEFwcGx5UHJv cGVydHlBdXRvPHNob3J0LCAmUmVuZGVyU3R5bGU6OndpZG93cywgJlJlbmRlclN0eWxlOjpzZXRX aWRvd3MsICZSZW5kZXJTdHlsZTo6aGFzQXV0b1dpZG93cywgJlJlbmRlclN0eWxlOjpzZXRIYXNB dXRvV2lkb3dzPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NT UHJvcGVydHlXb3JkU3BhY2luZywgQXBwbHlQcm9wZXJ0eVdvcmRTcGFjaW5nOjpjcmVhdGVIYW5k bGVyKCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3Vz dG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXggZmVm NDNkZGNiYWNkYmNlNzVhYmI3ZGJlYTQ2ZWY4MmI3ZGQ2YTRlYy4uMTAwZmFjZTFmMzI3ZGI1MzM1 OTMzNjZkOTA5YmFhODg1ZmRjNzIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJD dXN0b20uaApAQCAtMjcsNiArMjcsMTAgQEAKICNpZm5kZWYgU3R5bGVCdWlsZGVyQ3VzdG9tX2gK ICNkZWZpbmUgU3R5bGVCdWlsZGVyQ3VzdG9tX2gKIAorI2luY2x1ZGUgIkJhc2ljU2hhcGVGdW5j dGlvbnMuaCIKKyNpbmNsdWRlICJDU1NJbWFnZUdlbmVyYXRvclZhbHVlLmgiCisjaW5jbHVkZSAi Q1NTSW1hZ2VTZXRWYWx1ZS5oIgorI2luY2x1ZGUgIkNTU0ltYWdlVmFsdWUuaCIKICNpbmNsdWRl ICJTdHlsZVJlc29sdmVyLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEwOSw2ICsxMTMs NDIgQEAgaW5saW5lIHZvaWQgYXBwbHlWYWx1ZVpvb20oU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNv bHZlciwgQ1NTVmFsdWUmIHZhbHVlKQogICAgIH0KIH0KIAorI2lmIEVOQUJMRShDU1NfU0hBUEVT KQoraW5saW5lIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdFNoYXBlT3V0c2lkZShTdHlsZVJlc29sdmVy JiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgaWYgKGlzPENTU1ByaW1p dGl2ZVZhbHVlPih2YWx1ZSkpIHsKKyAgICAgICAgLy8gRklYTUU6IFNob3VsZG4ndCB0aGlzIGJl IENTU1ZhbHVlTm9uZT8KKyAgICAgICAgLy8gaHR0cDovL3d3dy53My5vcmcvVFIvY3NzLXNoYXBl cy8jc2hhcGUtb3V0c2lkZS1wcm9wZXJ0eQorICAgICAgICBpZiAoZG93bmNhc3Q8Q1NTUHJpbWl0 aXZlVmFsdWU+KHZhbHVlKS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVBdXRvKQorICAgICAgICAg ICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRTaGFwZU91dHNpZGUobnVsbHB0cik7CisgICAg fSBpZiAoaXM8Q1NTSW1hZ2VWYWx1ZT4odmFsdWUpIHx8IGlzPENTU0ltYWdlR2VuZXJhdG9yVmFs dWU+KHZhbHVlKSB8fCBpczxDU1NJbWFnZVNldFZhbHVlPih2YWx1ZSkpIHsKKyAgICAgICAgUmVm UHRyPFNoYXBlVmFsdWU+IHNoYXBlID0gU2hhcGVWYWx1ZTo6Y3JlYXRlSW1hZ2VWYWx1ZShzdHls ZVJlc29sdmVyLnN0eWxlSW1hZ2UoQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGUsICZ2YWx1 ZSkpOworICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFNoYXBlT3V0c2lkZShzaGFw ZS5yZWxlYXNlKCkpOworICAgIH0gZWxzZSBpZiAoaXM8Q1NTVmFsdWVMaXN0Pih2YWx1ZSkpIHsK KyAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGU+IHNoYXBlOworICAgICAgICBDU1NCb3hUeXBlIHJl ZmVyZW5jZUJveCA9IEJveE1pc3Npbmc7CisgICAgICAgIGF1dG8mIHZhbHVlTGlzdCA9IGRvd25j YXN0PENTU1ZhbHVlTGlzdD4odmFsdWUpOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgdmFsdWVMaXN0Lmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZh bHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWVM aXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSkpOworICAgICAgICAgICAgaWYgKHByaW1pdGl2 ZVZhbHVlLmlzU2hhcGUoKSkKKyAgICAgICAgICAgICAgICBzaGFwZSA9IGJhc2ljU2hhcGVGb3JW YWx1ZShzdHlsZVJlc29sdmVyLnN0YXRlKCkuY3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpLCBw cmltaXRpdmVWYWx1ZS5nZXRTaGFwZVZhbHVlKCkpOworICAgICAgICAgICAgZWxzZSBpZiAocHJp bWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlQ29udGVudEJveAorICAgICAgICAg ICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUJvcmRlckJv eAorICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NW YWx1ZVBhZGRpbmdCb3gKKyAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1 ZUlEKCkgPT0gQ1NTVmFsdWVNYXJnaW5Cb3gpCisgICAgICAgICAgICAgICAgcmVmZXJlbmNlQm94 ID0gQ1NTQm94VHlwZShwcmltaXRpdmVWYWx1ZSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHNoYXBlKQorICAgICAg ICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRTaGFwZU91dHNpZGUoU2hhcGVWYWx1ZTo6 Y3JlYXRlU2hhcGVWYWx1ZShzaGFwZS5yZWxlYXNlKCksIHJlZmVyZW5jZUJveCkpOworICAgICAg ICBlbHNlIGlmIChyZWZlcmVuY2VCb3ggIT0gQm94TWlzc2luZykKKyAgICAgICAgICAgIHN0eWxl UmVzb2x2ZXIuc3R5bGUoKS0+c2V0U2hhcGVPdXRzaWRlKFNoYXBlVmFsdWU6OmNyZWF0ZUJveFNo YXBlVmFsdWUocmVmZXJlbmNlQm94KSk7CisgICAgfQorfQorI2VuZGlmIC8vIEVOQUJMRShDU1Nf U0hBUEVTKQorCiB9IC8vIG5hbWVzcGFjZSBTdHlsZUJ1aWxkZXJGdW5jdGlvbnMKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQo=