83491 2012-04-09 11:40:24 -0700 Prepare html classes for sub-pixel LayoutUnits 2012-04-09 17:03:24 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric.carlson eric feature-media-reviews jchaffraix tkent webkit.review.bot oldest_to_newest 598469 0 leviw 2012-04-09 11:40:24 -0700 This eliminates remaining diffs in html/ with the subpixellayout branch. 598490 1 136279 leviw 2012-04-09 11:59:02 -0700 Created attachment 136279 Patch 598550 2 136279 eric 2012-04-09 13:14:18 -0700 Comment on attachment 136279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136279&action=review > Source/WebCore/html/ValidationMessage.cpp:123 > + bubble->setInlineStyleProperty(CSSPropertyTop, hostY + static_cast<double>(hostRect.height()), CSSPrimitiveValue::CSS_PX); Why the double casts? 598557 3 136279 leviw 2012-04-09 13:21:29 -0700 Comment on attachment 136279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136279&action=review >> Source/WebCore/html/ValidationMessage.cpp:123 >> + bubble->setInlineStyleProperty(CSSPropertyTop, hostY + static_cast<double>(hostRect.height()), CSSPrimitiveValue::CSS_PX); > > Why the double casts? You're right, this can be removed. We were just missing a double flavor of operator+ in FractionalLayoutUnit. Will upload again. 598572 4 136295 leviw 2012-04-09 13:34:46 -0700 Created attachment 136295 Patch 598574 5 136295 eric 2012-04-09 13:37:00 -0700 Comment on attachment 136295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136295&action=review > Source/WebCore/platform/Length.h:127 > + // FIXME: When we switch to sub-pixel layout, value will return float by default, and this will > + // no longer simply return value(). > + int intValue() const > + { > + return value(); > + } > + What will it return? static_cast<int>(value())? round(value())? Can we make it return whatever that is now? Or add such in a comment or something? 598578 6 136295 leviw 2012-04-09 13:40:35 -0700 Comment on attachment 136295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136295&action=review >> Source/WebCore/platform/Length.h:127 >> + > > What will it return? static_cast<int>(value())? round(value())? Can we make it return whatever that is now? Or add such in a comment or something? Sorry, my comment was better in the changelog than the code. This will simply inherit the current logic of value(). 598581 7 136299 leviw 2012-04-09 13:43:50 -0700 Created attachment 136299 Patch 598631 8 leviw 2012-04-09 14:44:29 -0700 I hope I've cleared up the issues you called out. I'd love another look :) 598642 9 136299 eric 2012-04-09 14:51:35 -0700 Comment on attachment 136299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136299&action=review > Source/WebCore/platform/Length.h:122 > + // FIXME: When we switch to sub-pixel layout, value will return float by default, and this will inherit > + // the current implementation of value(). Were you going to change this? 598643 10 136299 eric 2012-04-09 14:52:14 -0700 Comment on attachment 136299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136299&action=review >> Source/WebCore/platform/Length.h:122 >> + // the current implementation of value(). > > Were you going to change this? Oh, I guess you did. Anyway, the switch is very soon, so this is fine regardless. 598657 11 136299 leviw 2012-04-09 15:10:25 -0700 Comment on attachment 136299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136299&action=review >>> Source/WebCore/platform/Length.h:122 >>> + // the current implementation of value(). >> >> Were you going to change this? > > Oh, I guess you did. Anyway, the switch is very soon, so this is fine regardless. Thanks for the review! 598778 12 136299 webkit.review.bot 2012-04-09 17:03:19 -0700 Comment on attachment 136299 Patch Clearing flags on attachment: 136299 Committed r113645: <http://trac.webkit.org/changeset/113645> 598779 13 webkit.review.bot 2012-04-09 17:03:24 -0700 All reviewed patches have been landed. Closing bug. 136279 2012-04-09 11:59:02 -0700 2012-04-09 13:34:41 -0700 Patch bug-83491-20120409115901.patch text/plain 7602 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzU5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA0LTA5ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVwYXJlIGh0bWwgY2xh c3NlcyBmb3Igc3ViLXBpeGVsIExheW91dFVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQ5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYnJpbmdzIHRoZSBlbnRpcmUgSFRNTCBm b2xkZXIgdXAgdG8gdGhlIGN1cnJlbnQgc3RhdGUgb2YgdGhlIHN1YnBpeGVsbGF5b3V0IGJyYW5j aC4gQWRkaW5nCisgICAgICAgIGFuIGludFZhbHVlIGZsYXZvciBvZiBMZW5ndGggdGhhdCBtYXBz IHRvIHRoZSBjdXJyZW50IHZhbHVlIGZ1bmN0aW9uIHdhcyBhbHNvIG5lY2Vzc2FyeSB0byBnZXQg dXMKKyAgICAgICAgdGhlcmUuIFNlZSBodHRwczovL3RyYWMud2Via2l0Lm9yZy93aWtpL0xheW91 dFVuaXQgYW5kIHRoZSBkZXNjcmlwdGlvbnMgYmVsb3cgZm9yIGRldGFpbHMuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL0hU TUxNYXJxdWVlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWFycXVlZUVsZW1l bnQ6OnNjcm9sbEFtb3VudCk6IEZpeGVzIGEgY29tcGlsZXIgZXJyb3Igd2hlbiBsZW5ndGggcmV0 dXJucyBhIGZsb2F0LCBhcworICAgICAgICB3ZSBpbnRlbmQgaXQgdG8gZG8gd2hlbiBzd2l0Y2hp bmcgdG8gc3ViLXBpeGVsIGxheW91dC4KKyAgICAgICAgKiBodG1sL0ltYWdlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudFBhcnNlcjo6ZmluaXNoKTogaW1hZ2VT aXplIGlzIGFsd2F5cyBpbnRlZ3JhbC4KKyAgICAgICAgKiBodG1sL1ZhbGlkYXRpb25NZXNzYWdl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEJ1YmJsZVBvc2l0aW9uKTogRml4aW5nIGEg Y29tcGlsYXRpb24gZXJyb3Igd2hlbiB1c2luZyBGcmFjdGlvbmFsTGF5b3V0VW5pdHMgd2l0aCBh bgorICAgICAgICBleHBsaWNpdCBjYXN0IHRvIGRvdWJsZS4gVGhpcyBkb2Vzbid0IGNoYW5nZSB0 aGUgY3VycmVudCBiZWhhdmlvci4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xF bGVtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZWRpYVZvbHVtZVNsaWRlckNv bnRhaW5lcjo6bGF5b3V0KTogVXNpbmcgcGl4ZWxTbmFwcGVkU2l6ZSB0byBjb21tdW5pY2F0ZSB3 aXRoIHRoZW1lCisgICAgICAgIGNvZGUuCisgICAgICAgICogaHRtbC9zaGFkb3cvU2xpZGVyVGh1 bWJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNsaWRlclRodW1iRWxlbWVudDo6c2V0 UG9zaXRpb25Gcm9tUG9pbnQpOiBMaWtlIGFkanVzdEJ1YmJsZVBvc2l0aW9uLCBhZGRpbmcgZXhw bGljaXQgY2FzdHMKKyAgICAgICAgdGhhdCBhdm9pZCBjb21waWxlciBlcnJvcnMgd2hlbiB1c2lu ZyBGcmFjdGlvbmFsTGF5b3V0VW5pdHMuCisgICAgICAgICogcGxhdGZvcm0vTGVuZ3RoLmg6Cisg ICAgICAgIChXZWJDb3JlOjpMZW5ndGg6Okxlbmd0aCk6IEFkZGVkIGEgY29uc3RydWN0b3IgdGhh dCB0YWtlcyBhIEZyYWN0aW9uYWxMYXlvdXRVbml0LgorICAgICAgICAoTGVuZ3RoKToKKyAgICAg ICAgKFdlYkNvcmU6Okxlbmd0aDo6aW50VmFsdWUpOiBDdXJyZW50bHkgbWFwcyBkaXJlY3RseSB0 byBMZW5ndGg6OnZhbHVlLCBidXQgdGhlIGN1cnJlbnQgbG9naWMgb2YgdmFsdWUKKyAgICAgICAg d2lsbCBiZSBtaWdyYXRlZCBoZXJlIHdoZW4gdmFsdWUgaXMgY2hhbmdlZCB0byByZXR1cm4gYSBm bG9hdC4KKyAgICAgICAgKFdlYkNvcmU6Okxlbmd0aDo6c2V0VmFsdWUpOiBBZGRlZCBhIHZhcmlh bnQgdGhhdCB0YWtlcyBhIEZyYWN0aW9uYWxMYXlvdXRVbml0LgorCiAyMDEyLTA0LTA5ICBBYmhp c2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ3Jhc2ggZHVlIHRv IGZsb2F0cyBub3QgY2xlYXJlZCBiZWZvcmUgc3RhcnRpbmcgU1ZHIDx0ZXh0PiBsYXlvdXQuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXJxdWVlRWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWFycXVlZUVsZW1lbnQuY3BwCShyZXZpc2lv biAxMTM1ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXJxdWVlRWxlbWVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBAQCBpbnQgSFRNTE1hcnF1ZWVFbGVtZW50 OjpzY3JvbGxBbW91bnQoKSBjCiB7CiAgICAgYm9vbCBvazsKICAgICBpbnQgc2Nyb2xsQW1vdW50 ID0gZmFzdEdldEF0dHJpYnV0ZShzY3JvbGxhbW91bnRBdHRyKS50b0ludCgmb2spOwotICAgIHJl dHVybiBvayAmJiBzY3JvbGxBbW91bnQgPj0gMCA/IHNjcm9sbEFtb3VudCA6IFJlbmRlclN0eWxl Ojppbml0aWFsTWFycXVlZUluY3JlbWVudCgpLnZhbHVlKCk7CisgICAgcmV0dXJuIG9rICYmIHNj cm9sbEFtb3VudCA+PSAwID8gc2Nyb2xsQW1vdW50IDogUmVuZGVyU3R5bGU6OmluaXRpYWxNYXJx dWVlSW5jcmVtZW50KCkuaW50VmFsdWUoKTsKIH0KICAgICAKIHZvaWQgSFRNTE1hcnF1ZWVFbGVt ZW50OjpzZXRTY3JvbGxBbW91bnQoaW50IHNjcm9sbEFtb3VudCwgRXhjZXB0aW9uQ29kZSYgZWMp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9jdW1lbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5jcHAJKHJldmlzaW9uIDExMzU4 NSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIEltYWdlRG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgp CiAKICAgICAgICAgLy8gUmVwb3J0IHRoZSBuYXR1cmFsIGltYWdlIHNpemUgaW4gdGhlIHBhZ2Ug dGl0bGUsIHJlZ2FyZGxlc3Mgb2Ygem9vbQogICAgICAgICAvLyBsZXZlbC4KLSAgICAgICAgTGF5 b3V0U2l6ZSBzaXplID0gY2FjaGVkSW1hZ2UtPmltYWdlU2l6ZUZvclJlbmRlcmVyKGRvY3VtZW50 KCktPmltYWdlRWxlbWVudCgpLT5yZW5kZXJlcigpLCAxLjBmKTsKKyAgICAgICAgSW50U2l6ZSBz aXplID0gY2FjaGVkSW1hZ2UtPmltYWdlU2l6ZUZvclJlbmRlcmVyKGRvY3VtZW50KCktPmltYWdl RWxlbWVudCgpLT5yZW5kZXJlcigpLCAxLjBmKTsKICAgICAgICAgaWYgKHNpemUud2lkdGgoKSkg ewogICAgICAgICAgICAgLy8gQ29tcHV0ZSB0aGUgdGl0bGUsIHdlIHVzZSB0aGUgZGVjb2RlZCBm aWxlbmFtZSBvZiB0aGUgcmVzb3VyY2UsIGZhbGxpbmcKICAgICAgICAgICAgIC8vIGJhY2sgb24g dGhlIChkZWNvZGVkKSBob3N0bmFtZSBpZiB0aGVyZSBpcyBubyBwYXRoLgpJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9WYWxpZGF0aW9uTWVzc2FnZS5jcHAJKHJldmlzaW9uIDExMzU4NSkKKysr IFNvdXJjZS9XZWJDb3JlL2h0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMjAsMTIgKzEyMCwxMiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RCdWJibGVQb3NpdGlvbihj b25zdCBMCiAgICAgICAgIGhvc3RZIC09IGNvbnRhaW5lckxvY2F0aW9uLnkoKSArIGNvbnRhaW5l ci0+Ym9yZGVyVG9wKCk7CiAgICAgfQogCi0gICAgYnViYmxlLT5zZXRJbmxpbmVTdHlsZVByb3Bl cnR5KENTU1Byb3BlcnR5VG9wLCBob3N0WSArIGhvc3RSZWN0LmhlaWdodCgpLCBDU1NQcmltaXRp dmVWYWx1ZTo6Q1NTX1BYKTsKKyAgICBidWJibGUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NT UHJvcGVydHlUb3AsIGhvc3RZICsgc3RhdGljX2Nhc3Q8ZG91YmxlPihob3N0UmVjdC5oZWlnaHQo KSksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAgIC8vIFRoZSAnbGVmdCcgdmFsdWUg b2YgOjotd2Via2l0LXZhbGlkYXRpb24tYnViYmxlLWFycm93LgogICAgIGNvbnN0IGludCBidWJi bGVBcnJvd1RvcE9mZnNldCA9IDMyOwogICAgIGRvdWJsZSBidWJibGVYID0gaG9zdFg7CiAgICAg aWYgKGhvc3RSZWN0LndpZHRoKCkgLyAyIDwgYnViYmxlQXJyb3dUb3BPZmZzZXQpCi0gICAgICAg IGJ1YmJsZVggPSBtYXgoaG9zdFggKyBob3N0UmVjdC53aWR0aCgpIC8gMiAtIGJ1YmJsZUFycm93 VG9wT2Zmc2V0LCAwLjApOworICAgICAgICBidWJibGVYID0gbWF4KGhvc3RYICsgc3RhdGljX2Nh c3Q8ZG91YmxlPihob3N0UmVjdC53aWR0aCgpKSAvIDIgLSBidWJibGVBcnJvd1RvcE9mZnNldCwg MC4wKTsKICAgICBidWJibGUtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlMZWZ0 LCBidWJibGVYLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKIH0KIApJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAko cmV2aXNpb24gMTEzNTg1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9sRWxlbWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDMsNyArMzQzLDcgQEAgdm9pZCBS ZW5kZXJNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcjo6bAogCiAgICAgTGF5b3V0U3RhdGVEaXNh YmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKHZpZXcoKSk7CiAKLSAgICBMYXlvdXRQb2ludCBvZmZz ZXQgPSB0aGVtZSgpLT52b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihidXR0b25Cb3gs IHNpemUoKSk7CisgICAgSW50UG9pbnQgb2Zmc2V0ID0gdGhlbWUoKS0+dm9sdW1lU2xpZGVyT2Zm c2V0RnJvbU11dGVCdXR0b24oYnV0dG9uQm94LCBwaXhlbFNuYXBwZWRTaXplKCkpOwogICAgIHNl dFgob2Zmc2V0LngoKSArIGJ1dHRvbkJveC0+b2Zmc2V0TGVmdCgpKTsKICAgICBzZXRZKG9mZnNl dC55KCkgKyBidXR0b25Cb3gtPm9mZnNldFRvcCgpKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcAkocmV2aXNpb24gMTEz NTg1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDcgKzIzNiw3IEBAIHZvaWQgU2xpZGVyVGh1bWJFbGVt ZW50OjpzZXRQb3NpdGlvbkZyb20KICAgICAgICAgcmV0dXJuOwogCiAgICAgU3RlcFJhbmdlIHJh bmdlKGlucHV0KTsKLSAgICBkb3VibGUgZnJhY3Rpb24gPSBzdGF0aWNfY2FzdDxkb3VibGU+KHBv c2l0aW9uKSAvIHRyYWNrU2l6ZTsKKyAgICBkb3VibGUgZnJhY3Rpb24gPSBzdGF0aWNfY2FzdDxk b3VibGU+KHBvc2l0aW9uKSAvIHN0YXRpY19jYXN0PGRvdWJsZT4odHJhY2tTaXplKTsKICAgICBp ZiAoaXNWZXJ0aWNhbCB8fCAhcmVuZGVyQm94KCktPnN0eWxlKCktPmlzTGVmdFRvUmlnaHREaXJl Y3Rpb24oKSkKICAgICAgICAgZnJhY3Rpb24gPSAxIC0gZnJhY3Rpb247CiAgICAgZG91YmxlIHZh bHVlID0gcmFuZ2UuY2xhbXBWYWx1ZShyYW5nZS52YWx1ZUZyb21Qcm9wb3J0aW9uKGZyYWN0aW9u KSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguaAkocmV2aXNpb24gMTEzNTg1KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0LDYg KzI0LDcgQEAKICNkZWZpbmUgTGVuZ3RoX2gKIAogI2luY2x1ZGUgIkFuaW1hdGlvblV0aWxpdGll cy5oIgorI2luY2x1ZGUgIkxheW91dFR5cGVzLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMu aD4KICNpbmNsdWRlIDx3dGYvRmFzdEFsbG9jQmFzZS5oPgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJk Lmg+CkBAIC01NSw2ICs1NiwxMSBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KICAgICAKKyAgICBM ZW5ndGgoRnJhY3Rpb25hbExheW91dFVuaXQgdiwgTGVuZ3RoVHlwZSB0LCBib29sIHEgPSBmYWxz ZSkKKyAgICAgICAgOiBtX2Zsb2F0VmFsdWUodi50b0Zsb2F0KCkpLCBtX3F1aXJrKHEpLCBtX3R5 cGUodCksIG1faXNGbG9hdCh0cnVlKQorICAgIHsKKyAgICB9CisgICAgCiAgICAgTGVuZ3RoKGZs b2F0IHYsIExlbmd0aFR5cGUgdCwgYm9vbCBxID0gZmFsc2UpCiAgICAgOiBtX2Zsb2F0VmFsdWUo diksIG1fcXVpcmsocSksIG1fdHlwZSh0KSwgbV9pc0Zsb2F0KHRydWUpCiAgICAgewpAQCAtMTEy LDYgKzExOCwxMyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBnZXRJbnRWYWx1ZSgpOwogICAg IH0KIAorICAgIC8vIEZJWE1FOiBXaGVuIHdlIHN3aXRjaCB0byBzdWItcGl4ZWwgbGF5b3V0LCB2 YWx1ZSB3aWxsIHJldHVybiBmbG9hdCBieSBkZWZhdWx0LCBhbmQgdGhpcyB3aWxsCisgICAgLy8g bm8gbG9uZ2VyIHNpbXBseSByZXR1cm4gdmFsdWUoKS4KKyAgICBpbnQgaW50VmFsdWUoKSBjb25z dAorICAgIHsKKyAgICAgICAgcmV0dXJuIHZhbHVlKCk7CisgICAgfQorCiAgICAgZmxvYXQgcGVy Y2VudCgpIGNvbnN0CiAgICAgewogICAgICAgICBBU1NFUlQodHlwZSgpID09IFBlcmNlbnQpOwpA QCAtMTUxLDYgKzE2NCwxMyBAQCBwdWJsaWM6CiAgICAgICAgIG1faXNGbG9hdCA9IHRydWU7ICAg IAogICAgIH0KIAorICAgIHZvaWQgc2V0VmFsdWUoTGVuZ3RoVHlwZSB0LCBGcmFjdGlvbmFsTGF5 b3V0VW5pdCB2YWx1ZSkKKyAgICB7CisgICAgICAgIG1fdHlwZSA9IHQ7CisgICAgICAgIG1fZmxv YXRWYWx1ZSA9IHZhbHVlOworICAgICAgICBtX2lzRmxvYXQgPSB0cnVlOyAgICAKKyAgICB9CisK ICAgICB2b2lkIHNldFZhbHVlKGZsb2F0IHZhbHVlKQogICAgIHsKICAgICAgICAgKnRoaXMgPSBM ZW5ndGgodmFsdWUsIEZpeGVkKTsK 136295 2012-04-09 13:34:46 -0700 2012-04-09 13:43:47 -0700 Patch bug-83491-20120409133444.patch text/plain 4474 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA0LTA5ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVwYXJlIGh0bWwgY2xh c3NlcyBmb3Igc3ViLXBpeGVsIExheW91dFVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQ5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYnJpbmdzIHRoZSBlbnRpcmUgSFRNTCBm b2xkZXIgdXAgdG8gdGhlIGN1cnJlbnQgc3RhdGUgb2YgdGhlIHN1YnBpeGVsbGF5b3V0IGJyYW5j aC4gQWRkaW5nCisgICAgICAgIGFuIGludFZhbHVlIGZsYXZvciBvZiBMZW5ndGggdGhhdCBtYXBz IHRvIHRoZSBjdXJyZW50IHZhbHVlIGZ1bmN0aW9uIHdhcyBhbHNvIG5lY2Vzc2FyeSB0byBnZXQg dXMKKyAgICAgICAgdGhlcmUuIFNlZSBodHRwczovL3RyYWMud2Via2l0Lm9yZy93aWtpL0xheW91 dFVuaXQgYW5kIHRoZSBkZXNjcmlwdGlvbnMgYmVsb3cgZm9yIGRldGFpbHMuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL0hU TUxNYXJxdWVlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWFycXVlZUVsZW1l bnQ6OnNjcm9sbEFtb3VudCk6IEZpeGVzIGEgY29tcGlsZXIgZXJyb3Igd2hlbiBsZW5ndGggcmV0 dXJucyBhIGZsb2F0LCBhcworICAgICAgICB3ZSBpbnRlbmQgaXQgdG8gZG8gd2hlbiBzd2l0Y2hp bmcgdG8gc3ViLXBpeGVsIGxheW91dC4KKyAgICAgICAgKiBodG1sL0ltYWdlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudFBhcnNlcjo6ZmluaXNoKTogaW1hZ2VT aXplIGlzIGFsd2F5cyBpbnRlZ3JhbC4KKyAgICAgICAgKiBwbGF0Zm9ybS9MZW5ndGguaDoKKyAg ICAgICAgKFdlYkNvcmU6Okxlbmd0aDo6TGVuZ3RoKTogQWRkZWQgYSBjb25zdHJ1Y3RvciB0aGF0 IHRha2VzIGEgRnJhY3Rpb25hbExheW91dFVuaXQuCisgICAgICAgIChMZW5ndGgpOgorICAgICAg ICAoV2ViQ29yZTo6TGVuZ3RoOjppbnRWYWx1ZSk6IEN1cnJlbnRseSBtYXBzIGRpcmVjdGx5IHRv IExlbmd0aDo6dmFsdWUsIGJ1dCB0aGUgY3VycmVudCBsb2dpYyBvZiB2YWx1ZQorICAgICAgICB3 aWxsIGJlIG1pZ3JhdGVkIGhlcmUgd2hlbiB2YWx1ZSBpcyBjaGFuZ2VkIHRvIHJldHVybiBhIGZs b2F0LgorICAgICAgICAoV2ViQ29yZTo6TGVuZ3RoOjpzZXRWYWx1ZSk6IEFkZGVkIGEgdmFyaWFu dCB0aGF0IHRha2VzIGEgRnJhY3Rpb25hbExheW91dFVuaXQuCisKIDIwMTItMDQtMDkgIFZpY3Rv ciBDYXJidW5lICA8dmNhcmJ1bmVAYWRvYmUuY29tPgogCiAgICAgICAgIFNpbXBsaWZpZWQgdm9s dW1lIHNsaWRlciByZW5kZXJpbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXJx dWVlRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWFy cXVlZUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxMTM2MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNYXJxdWVlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBA QCBpbnQgSFRNTE1hcnF1ZWVFbGVtZW50OjpzY3JvbGxBbW91bnQoKSBjCiB7CiAgICAgYm9vbCBv azsKICAgICBpbnQgc2Nyb2xsQW1vdW50ID0gZmFzdEdldEF0dHJpYnV0ZShzY3JvbGxhbW91bnRB dHRyKS50b0ludCgmb2spOwotICAgIHJldHVybiBvayAmJiBzY3JvbGxBbW91bnQgPj0gMCA/IHNj cm9sbEFtb3VudCA6IFJlbmRlclN0eWxlOjppbml0aWFsTWFycXVlZUluY3JlbWVudCgpLnZhbHVl KCk7CisgICAgcmV0dXJuIG9rICYmIHNjcm9sbEFtb3VudCA+PSAwID8gc2Nyb2xsQW1vdW50IDog UmVuZGVyU3R5bGU6OmluaXRpYWxNYXJxdWVlSW5jcmVtZW50KCkuaW50VmFsdWUoKTsKIH0KICAg ICAKIHZvaWQgSFRNTE1hcnF1ZWVFbGVtZW50OjpzZXRTY3JvbGxBbW91bnQoaW50IHNjcm9sbEFt b3VudCwgRXhjZXB0aW9uQ29kZSYgZWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdl RG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5jcHAJKHJldmlzaW9uIDExMzYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VE b2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIEltYWdl RG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgpCiAKICAgICAgICAgLy8gUmVwb3J0IHRoZSBuYXR1cmFs IGltYWdlIHNpemUgaW4gdGhlIHBhZ2UgdGl0bGUsIHJlZ2FyZGxlc3Mgb2Ygem9vbQogICAgICAg ICAvLyBsZXZlbC4KLSAgICAgICAgTGF5b3V0U2l6ZSBzaXplID0gY2FjaGVkSW1hZ2UtPmltYWdl U2l6ZUZvclJlbmRlcmVyKGRvY3VtZW50KCktPmltYWdlRWxlbWVudCgpLT5yZW5kZXJlcigpLCAx LjBmKTsKKyAgICAgICAgSW50U2l6ZSBzaXplID0gY2FjaGVkSW1hZ2UtPmltYWdlU2l6ZUZvclJl bmRlcmVyKGRvY3VtZW50KCktPmltYWdlRWxlbWVudCgpLT5yZW5kZXJlcigpLCAxLjBmKTsKICAg ICAgICAgaWYgKHNpemUud2lkdGgoKSkgewogICAgICAgICAgICAgLy8gQ29tcHV0ZSB0aGUgdGl0 bGUsIHdlIHVzZSB0aGUgZGVjb2RlZCBmaWxlbmFtZSBvZiB0aGUgcmVzb3VyY2UsIGZhbGxpbmcK ICAgICAgICAgICAgIC8vIGJhY2sgb24gdGhlIChkZWNvZGVkKSBob3N0bmFtZSBpZiB0aGVyZSBp cyBubyBwYXRoLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgJKHJldmlzaW9uIDExMzYw OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNCw2ICsyNCw3IEBACiAjZGVmaW5lIExlbmd0aF9oCiAKICNpbmNsdWRlICJBbmltYXRpb25V dGlsaXRpZXMuaCIKKyNpbmNsdWRlICJMYXlvdXRUeXBlcy5oIgogI2luY2x1ZGUgPHd0Zi9Bc3Nl cnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL0Zhc3RBbGxvY0Jhc2UuaD4KICNpbmNsdWRlIDx3dGYv Rm9yd2FyZC5oPgpAQCAtNTUsNiArNTYsMTEgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAg CisgICAgTGVuZ3RoKEZyYWN0aW9uYWxMYXlvdXRVbml0IHYsIExlbmd0aFR5cGUgdCwgYm9vbCBx ID0gZmFsc2UpCisgICAgICAgIDogbV9mbG9hdFZhbHVlKHYudG9GbG9hdCgpKSwgbV9xdWlyayhx KSwgbV90eXBlKHQpLCBtX2lzRmxvYXQodHJ1ZSkKKyAgICB7CisgICAgfQorICAgIAogICAgIExl bmd0aChmbG9hdCB2LCBMZW5ndGhUeXBlIHQsIGJvb2wgcSA9IGZhbHNlKQogICAgIDogbV9mbG9h dFZhbHVlKHYpLCBtX3F1aXJrKHEpLCBtX3R5cGUodCksIG1faXNGbG9hdCh0cnVlKQogICAgIHsK QEAgLTExMiw2ICsxMTgsMTMgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gZ2V0SW50VmFsdWUo KTsKICAgICB9CiAKKyAgICAvLyBGSVhNRTogV2hlbiB3ZSBzd2l0Y2ggdG8gc3ViLXBpeGVsIGxh eW91dCwgdmFsdWUgd2lsbCByZXR1cm4gZmxvYXQgYnkgZGVmYXVsdCwgYW5kIHRoaXMgd2lsbAor ICAgIC8vIG5vIGxvbmdlciBzaW1wbHkgcmV0dXJuIHZhbHVlKCkuCisgICAgaW50IGludFZhbHVl KCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiB2YWx1ZSgpOworICAgIH0KKwogICAgIGZs b2F0IHBlcmNlbnQoKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKHR5cGUoKSA9PSBQZXJj ZW50KTsKQEAgLTE1MSw2ICsxNjQsMTMgQEAgcHVibGljOgogICAgICAgICBtX2lzRmxvYXQgPSB0 cnVlOyAgICAKICAgICB9CiAKKyAgICB2b2lkIHNldFZhbHVlKExlbmd0aFR5cGUgdCwgRnJhY3Rp b25hbExheW91dFVuaXQgdmFsdWUpCisgICAgeworICAgICAgICBtX3R5cGUgPSB0OworICAgICAg ICBtX2Zsb2F0VmFsdWUgPSB2YWx1ZTsKKyAgICAgICAgbV9pc0Zsb2F0ID0gdHJ1ZTsgICAgCisg ICAgfQorCiAgICAgdm9pZCBzZXRWYWx1ZShmbG9hdCB2YWx1ZSkKICAgICB7CiAgICAgICAgICp0 aGlzID0gTGVuZ3RoKHZhbHVlLCBGaXhlZCk7Cg== 136299 2012-04-09 13:43:50 -0700 2012-04-09 17:03:19 -0700 Patch bug-83491-20120409134349.patch text/plain 4488 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA0LTA5ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVwYXJlIGh0bWwgY2xh c3NlcyBmb3Igc3ViLXBpeGVsIExheW91dFVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQ5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYnJpbmdzIHRoZSBlbnRpcmUgSFRNTCBm b2xkZXIgdXAgdG8gdGhlIGN1cnJlbnQgc3RhdGUgb2YgdGhlIHN1YnBpeGVsbGF5b3V0IGJyYW5j aC4gQWRkaW5nCisgICAgICAgIGFuIGludFZhbHVlIGZsYXZvciBvZiBMZW5ndGggdGhhdCBtYXBz IHRvIHRoZSBjdXJyZW50IHZhbHVlIGZ1bmN0aW9uIHdhcyBhbHNvIG5lY2Vzc2FyeSB0byBnZXQg dXMKKyAgICAgICAgdGhlcmUuIFNlZSBodHRwczovL3RyYWMud2Via2l0Lm9yZy93aWtpL0xheW91 dFVuaXQgYW5kIHRoZSBkZXNjcmlwdGlvbnMgYmVsb3cgZm9yIGRldGFpbHMuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL0hU TUxNYXJxdWVlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWFycXVlZUVsZW1l bnQ6OnNjcm9sbEFtb3VudCk6IEZpeGVzIGEgY29tcGlsZXIgZXJyb3Igd2hlbiBsZW5ndGggcmV0 dXJucyBhIGZsb2F0LCBhcworICAgICAgICB3ZSBpbnRlbmQgaXQgdG8gZG8gd2hlbiBzd2l0Y2hp bmcgdG8gc3ViLXBpeGVsIGxheW91dC4KKyAgICAgICAgKiBodG1sL0ltYWdlRG9jdW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudFBhcnNlcjo6ZmluaXNoKTogaW1hZ2VT aXplIGlzIGFsd2F5cyBpbnRlZ3JhbC4KKyAgICAgICAgKiBwbGF0Zm9ybS9MZW5ndGguaDoKKyAg ICAgICAgKFdlYkNvcmU6Okxlbmd0aDo6TGVuZ3RoKTogQWRkZWQgYSBjb25zdHJ1Y3RvciB0aGF0 IHRha2VzIGEgRnJhY3Rpb25hbExheW91dFVuaXQuCisgICAgICAgIChMZW5ndGgpOgorICAgICAg ICAoV2ViQ29yZTo6TGVuZ3RoOjppbnRWYWx1ZSk6IEN1cnJlbnRseSBtYXBzIGRpcmVjdGx5IHRv IExlbmd0aDo6dmFsdWUsIGJ1dCB0aGUgY3VycmVudCBsb2dpYyBvZiB2YWx1ZQorICAgICAgICB3 aWxsIGJlIG1pZ3JhdGVkIGhlcmUgd2hlbiB2YWx1ZSBpcyBjaGFuZ2VkIHRvIHJldHVybiBhIGZs b2F0LgorICAgICAgICAoV2ViQ29yZTo6TGVuZ3RoOjpzZXRWYWx1ZSk6IEFkZGVkIGEgdmFyaWFu dCB0aGF0IHRha2VzIGEgRnJhY3Rpb25hbExheW91dFVuaXQuCisKIDIwMTItMDQtMDkgIFZpY3Rv ciBDYXJidW5lICA8dmNhcmJ1bmVAYWRvYmUuY29tPgogCiAgICAgICAgIFNpbXBsaWZpZWQgdm9s dW1lIHNsaWRlciByZW5kZXJpbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXJx dWVlRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWFy cXVlZUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxMTM2MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNYXJxdWVlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBA QCBpbnQgSFRNTE1hcnF1ZWVFbGVtZW50OjpzY3JvbGxBbW91bnQoKSBjCiB7CiAgICAgYm9vbCBv azsKICAgICBpbnQgc2Nyb2xsQW1vdW50ID0gZmFzdEdldEF0dHJpYnV0ZShzY3JvbGxhbW91bnRB dHRyKS50b0ludCgmb2spOwotICAgIHJldHVybiBvayAmJiBzY3JvbGxBbW91bnQgPj0gMCA/IHNj cm9sbEFtb3VudCA6IFJlbmRlclN0eWxlOjppbml0aWFsTWFycXVlZUluY3JlbWVudCgpLnZhbHVl KCk7CisgICAgcmV0dXJuIG9rICYmIHNjcm9sbEFtb3VudCA+PSAwID8gc2Nyb2xsQW1vdW50IDog UmVuZGVyU3R5bGU6OmluaXRpYWxNYXJxdWVlSW5jcmVtZW50KCkuaW50VmFsdWUoKTsKIH0KICAg ICAKIHZvaWQgSFRNTE1hcnF1ZWVFbGVtZW50OjpzZXRTY3JvbGxBbW91bnQoaW50IHNjcm9sbEFt b3VudCwgRXhjZXB0aW9uQ29kZSYgZWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdl RG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1 bWVudC5jcHAJKHJldmlzaW9uIDExMzYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VE b2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIEltYWdl RG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgpCiAKICAgICAgICAgLy8gUmVwb3J0IHRoZSBuYXR1cmFs IGltYWdlIHNpemUgaW4gdGhlIHBhZ2UgdGl0bGUsIHJlZ2FyZGxlc3Mgb2Ygem9vbQogICAgICAg ICAvLyBsZXZlbC4KLSAgICAgICAgTGF5b3V0U2l6ZSBzaXplID0gY2FjaGVkSW1hZ2UtPmltYWdl U2l6ZUZvclJlbmRlcmVyKGRvY3VtZW50KCktPmltYWdlRWxlbWVudCgpLT5yZW5kZXJlcigpLCAx LjBmKTsKKyAgICAgICAgSW50U2l6ZSBzaXplID0gY2FjaGVkSW1hZ2UtPmltYWdlU2l6ZUZvclJl bmRlcmVyKGRvY3VtZW50KCktPmltYWdlRWxlbWVudCgpLT5yZW5kZXJlcigpLCAxLjBmKTsKICAg ICAgICAgaWYgKHNpemUud2lkdGgoKSkgewogICAgICAgICAgICAgLy8gQ29tcHV0ZSB0aGUgdGl0 bGUsIHdlIHVzZSB0aGUgZGVjb2RlZCBmaWxlbmFtZSBvZiB0aGUgcmVzb3VyY2UsIGZhbGxpbmcK ICAgICAgICAgICAgIC8vIGJhY2sgb24gdGhlIChkZWNvZGVkKSBob3N0bmFtZSBpZiB0aGVyZSBp cyBubyBwYXRoLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmgJKHJldmlzaW9uIDExMzYw OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNCw2ICsyNCw3IEBACiAjZGVmaW5lIExlbmd0aF9oCiAKICNpbmNsdWRlICJBbmltYXRpb25V dGlsaXRpZXMuaCIKKyNpbmNsdWRlICJMYXlvdXRUeXBlcy5oIgogI2luY2x1ZGUgPHd0Zi9Bc3Nl cnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL0Zhc3RBbGxvY0Jhc2UuaD4KICNpbmNsdWRlIDx3dGYv Rm9yd2FyZC5oPgpAQCAtNTUsNiArNTYsMTEgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAg CisgICAgTGVuZ3RoKEZyYWN0aW9uYWxMYXlvdXRVbml0IHYsIExlbmd0aFR5cGUgdCwgYm9vbCBx ID0gZmFsc2UpCisgICAgICAgIDogbV9mbG9hdFZhbHVlKHYudG9GbG9hdCgpKSwgbV9xdWlyayhx KSwgbV90eXBlKHQpLCBtX2lzRmxvYXQodHJ1ZSkKKyAgICB7CisgICAgfQorICAgIAogICAgIExl bmd0aChmbG9hdCB2LCBMZW5ndGhUeXBlIHQsIGJvb2wgcSA9IGZhbHNlKQogICAgIDogbV9mbG9h dFZhbHVlKHYpLCBtX3F1aXJrKHEpLCBtX3R5cGUodCksIG1faXNGbG9hdCh0cnVlKQogICAgIHsK QEAgLTExMiw2ICsxMTgsMTMgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gZ2V0SW50VmFsdWUo KTsKICAgICB9CiAKKyAgICAvLyBGSVhNRTogV2hlbiB3ZSBzd2l0Y2ggdG8gc3ViLXBpeGVsIGxh eW91dCwgdmFsdWUgd2lsbCByZXR1cm4gZmxvYXQgYnkgZGVmYXVsdCwgYW5kIHRoaXMgd2lsbCBp bmhlcml0CisgICAgLy8gdGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gb2YgdmFsdWUoKS4KKyAg ICBpbnQgaW50VmFsdWUoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIHZhbHVlKCk7Cisg ICAgfQorCiAgICAgZmxvYXQgcGVyY2VudCgpIGNvbnN0CiAgICAgewogICAgICAgICBBU1NFUlQo dHlwZSgpID09IFBlcmNlbnQpOwpAQCAtMTUxLDYgKzE2NCwxMyBAQCBwdWJsaWM6CiAgICAgICAg IG1faXNGbG9hdCA9IHRydWU7ICAgIAogICAgIH0KIAorICAgIHZvaWQgc2V0VmFsdWUoTGVuZ3Ro VHlwZSB0LCBGcmFjdGlvbmFsTGF5b3V0VW5pdCB2YWx1ZSkKKyAgICB7CisgICAgICAgIG1fdHlw ZSA9IHQ7CisgICAgICAgIG1fZmxvYXRWYWx1ZSA9IHZhbHVlOworICAgICAgICBtX2lzRmxvYXQg PSB0cnVlOyAgICAKKyAgICB9CisKICAgICB2b2lkIHNldFZhbHVlKGZsb2F0IHZhbHVlKQogICAg IHsKICAgICAgICAgKnRoaXMgPSBMZW5ndGgodmFsdWUsIEZpeGVkKTsK