80894 2012-03-12 14:49:39 -0700 Fix rounding in scrollbar rect calculations 2012-03-12 16:51:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric jchaffraix leviw simon.fraser thorton webkit.review.bot oldest_to_newest 576561 0 eae 2012-03-12 14:49:39 -0700 Fix usage of subpixel units in RenderScrollbar::buttonRect and RenderScrollbar::trackRect. 576580 1 131422 eae 2012-03-12 14:59:59 -0700 Created attachment 131422 Patch 576635 2 131422 eric 2012-03-12 15:43:24 -0700 Comment on attachment 131422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131422&action=review > Source/WebCore/ChangeLog:16 > + Add dummy isIntegerValue function, will be replaced with actual > + implementation once LayoutUnit is remapped to FractionalLayoutUnit. What is this actual implementation going to do? Check that the value is mod 60? 576637 3 leviw 2012-03-12 15:45:35 -0700 (In reply to comment #2) > (From update of attachment 131422 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=131422&action=review > > > Source/WebCore/ChangeLog:16 > > + Add dummy isIntegerValue function, will be replaced with actual > > + implementation once LayoutUnit is remapped to FractionalLayoutUnit. > > What is this actual implementation going to do? Check that the value is mod 60? Yup :) 576649 4 131431 eae 2012-03-12 15:57:10 -0700 Created attachment 131431 Patch for landing 576655 5 eae 2012-03-12 15:58:55 -0700 (Fixed typo in ChangeLog) 576727 6 131431 webkit.review.bot 2012-03-12 16:51:26 -0700 Comment on attachment 131431 Patch for landing Clearing flags on attachment: 131431 Committed r110505: <http://trac.webkit.org/changeset/110505> 576728 7 webkit.review.bot 2012-03-12 16:51:31 -0700 All reviewed patches have been landed. Closing bug. 131422 2012-03-12 14:59:59 -0700 2012-03-12 15:57:06 -0700 Patch bug-80894-20120312145958.patch text/plain 7002 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDQ3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAzLTEyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcm91bmRpbmcgaW4gc2Ny b2xsYmFyIHJlY3QgY2FsdWNsYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDg5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZpeCB1c2FnZSBvZiBzdWJwaXhlbCB1bml0cyBpbiBSZW5kZXJTY3Jv bGxiYXI6OmJ1dHRvblJlY3QgYW5kCisgICAgICAgIFJlbmRlclNjcm9sbGJhcjo6dHJhY2tSZWN0 LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvTGF5b3V0VHlwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OmlzSW50ZWdl clZhbHVlKToKKyAgICAgICAgQWRkIGR1bW15IGlzSW50ZWdlclZhbHVlIGZ1bmN0aW9uLCB3aWxs IGJlIHJlcGxhY2VkIHdpdGggYWN0dWFsCisgICAgICAgIGltcGxlbWVudGF0aW9uIG9uY2UgTGF5 b3V0VW5pdCBpcyByZW1hcHBlZCB0byBGcmFjdGlvbmFsTGF5b3V0VW5pdC4KKyAgICAgICAgCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTY3JvbGxiYXI6OmJ1dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy U2Nyb2xsYmFyOjp0cmFja1JlY3QpOgorICAgICAgICBDaGFuZ2UgcmVjdCBjYWxjdWxhdGlvbnMg dG8gdXNlIHBpeGVsIHNuYXBwZWQgdmFsdWVzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clNjcm9sbGJhclBhcnQuaDoKKyAgICAgICAgKFJlbmRlclNjcm9sbGJhclBhcnQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyUGFydDo6bWFyZ2luVG9wKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNjcm9sbGJhclBhcnQ6Om1hcmdpbkJvdHRvbSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTY3JvbGxiYXJQYXJ0OjptYXJnaW5MZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclNjcm9sbGJhclBhcnQ6Om1hcmdpblJpZ2h0KToKKyAgICAgICAgQWRkIEFTU0VSVCB0 byBlbnN1cmUgdGhhdCBzY3JvbGxiYXIgcGFydHMgYXJlIGFsd2F5cyBhbGlnbmVkIHRvIGRldmlj ZQorICAgICAgICBwaXhlbHMuCisKIDIwMTItMDMtMTIgIFNjb3R0IEJ5ZXIgIDxzY290dGJ5ZXJA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIENsZWFudXAgb2Jzb2xldGUgZmlsZXMuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0VHlwZXMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0VHlwZXMuaAkocmV2aXNpb24gMTEwNDM1KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFR5cGVzLmgJKHdvcmtpbmcgY29weSkKQEAg LTE1MCw2ICsxNTAsMTEgQEAgaW5saW5lIExheW91dFVuaXQgY2xhbXBUb0xheW91dFVuaXQoZG91 YgogICAgIHJldHVybiBjbGFtcFRvSW50ZWdlcih2YWx1ZSk7CiB9CiAKK2lubGluZSBib29sIGlz SW50ZWdlclZhbHVlKGNvbnN0IExheW91dFVuaXQpCit7CisgICAgcmV0dXJuIHRydWU7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIExheW91dFR5cGVzX2gKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCShyZXZpc2lv biAxMTA0MzUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjk3LDI3ICsyOTcsMjYgQEAgSW50UmVjdCBSZW5kZXJTY3Jv bGxiYXI6OmJ1dHRvblJlY3QoU2NybwogICAgIAogICAgIGJvb2wgaXNIb3Jpem9udGFsID0gb3Jp ZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyOwogICAgIGlmIChwYXJ0VHlwZSA9PSBC YWNrQnV0dG9uU3RhcnRQYXJ0KQotICAgICAgICByZXR1cm4gSW50UmVjdChsb2NhdGlvbigpLCBJ bnRTaXplKGlzSG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+d2lkdGgoKSA6IHdpZHRoKCksIGlz SG9yaXpvbnRhbCA/IGhlaWdodCgpIDogcGFydFJlbmRlcmVyLT5oZWlnaHQoKSkpOworICAgICAg ICByZXR1cm4gSW50UmVjdChsb2NhdGlvbigpLCBJbnRTaXplKGlzSG9yaXpvbnRhbCA/IHBhcnRS ZW5kZXJlci0+cGl4ZWxTbmFwcGVkV2lkdGgoKSA6IHdpZHRoKCksIGlzSG9yaXpvbnRhbCA/IGhl aWdodCgpIDogcGFydFJlbmRlcmVyLT5waXhlbFNuYXBwZWRIZWlnaHQoKSkpOwogICAgIGlmIChw YXJ0VHlwZSA9PSBGb3J3YXJkQnV0dG9uRW5kUGFydCkKLSAgICAgICAgcmV0dXJuIEludFJlY3Qo aXNIb3Jpem9udGFsID8geCgpICsgd2lkdGgoKSAtIHBhcnRSZW5kZXJlci0+d2lkdGgoKSA6IHgo KSwKLSAgICAgICAgCi0gICAgICAgICAgICAgICAgICAgICAgIGlzSG9yaXpvbnRhbCA/IHkoKSA6 IHkoKSArIGhlaWdodCgpIC0gcGFydFJlbmRlcmVyLT5oZWlnaHQoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgaXNIb3Jpem9udGFsID8gcGFydFJlbmRlcmVyLT53aWR0aCgpIDogd2lkdGgoKSwK LSAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVu ZGVyZXItPmhlaWdodCgpKTsKKyAgICAgICAgcmV0dXJuIEludFJlY3QoaXNIb3Jpem9udGFsID8g eCgpICsgd2lkdGgoKSAtIHBhcnRSZW5kZXJlci0+cGl4ZWxTbmFwcGVkV2lkdGgoKSA6IHgoKSwK KyAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8geSgpIDogeSgpICsgaGVpZ2h0 KCkgLSBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpLAorICAgICAgICAgICAgICAg ICAgICAgICBpc0hvcml6b250YWwgPyBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZFdpZHRoKCkg OiB3aWR0aCgpLAorICAgICAgICAgICAgICAgICAgICAgICBpc0hvcml6b250YWwgPyBoZWlnaHQo KSA6IHBhcnRSZW5kZXJlci0+cGl4ZWxTbmFwcGVkSGVpZ2h0KCkpOwogICAgIAogICAgIGlmIChw YXJ0VHlwZSA9PSBGb3J3YXJkQnV0dG9uU3RhcnRQYXJ0KSB7CiAgICAgICAgIEludFJlY3QgcHJl dmlvdXNCdXR0b24gPSBidXR0b25SZWN0KEJhY2tCdXR0b25TdGFydFBhcnQpOwogICAgICAgICBy ZXR1cm4gSW50UmVjdChpc0hvcml6b250YWwgPyB4KCkgKyBwcmV2aW91c0J1dHRvbi53aWR0aCgp IDogeCgpLAogICAgICAgICAgICAgICAgICAgICAgICBpc0hvcml6b250YWwgPyB5KCkgOiB5KCkg KyBwcmV2aW91c0J1dHRvbi5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jp em9udGFsID8gcGFydFJlbmRlcmVyLT53aWR0aCgpIDogd2lkdGgoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPmhlaWdodCgp KTsKKyAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gcGFydFJlbmRlcmVyLT5w aXhlbFNuYXBwZWRXaWR0aCgpIDogd2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgaXNI b3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgp KTsKICAgICB9CiAgICAgCiAgICAgSW50UmVjdCBmb2xsb3dpbmdCdXR0b24gPSBidXR0b25SZWN0 KEZvcndhcmRCdXR0b25FbmRQYXJ0KTsKLSAgICByZXR1cm4gSW50UmVjdChpc0hvcml6b250YWwg PyB4KCkgKyB3aWR0aCgpIC0gZm9sbG93aW5nQnV0dG9uLndpZHRoKCkgLSBwYXJ0UmVuZGVyZXIt PndpZHRoKCkgOiB4KCksCi0gICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8geSgpIDog eSgpICsgaGVpZ2h0KCkgLSBmb2xsb3dpbmdCdXR0b24uaGVpZ2h0KCkgLSBwYXJ0UmVuZGVyZXIt PmhlaWdodCgpLAotICAgICAgICAgICAgICAgICAgIGlzSG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJl ci0+d2lkdGgoKSA6IHdpZHRoKCksCi0gICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8g aGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPmhlaWdodCgpKTsKKyAgICByZXR1cm4gSW50UmVjdChp c0hvcml6b250YWwgPyB4KCkgKyB3aWR0aCgpIC0gZm9sbG93aW5nQnV0dG9uLndpZHRoKCkgLSBw YXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZFdpZHRoKCkgOiB4KCksCisgICAgICAgICAgICAgICAg ICAgaXNIb3Jpem9udGFsID8geSgpIDogeSgpICsgaGVpZ2h0KCkgLSBmb2xsb3dpbmdCdXR0b24u aGVpZ2h0KCkgLSBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpLAorICAgICAgICAg ICAgICAgICAgIGlzSG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+cGl4ZWxTbmFwcGVkV2lkdGgo KSA6IHdpZHRoKCksCisgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkg OiBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpKTsKIH0KIAogSW50UmVjdCBSZW5k ZXJTY3JvbGxiYXI6OnRyYWNrUmVjdChpbnQgc3RhcnRMZW5ndGgsIGludCBlbmRMZW5ndGgpCkBA IC0zMjcsMTYgKzMyNiwxNiBAQCBJbnRSZWN0IFJlbmRlclNjcm9sbGJhcjo6dHJhY2tSZWN0KGlu dCBzCiAgICAgICAgIHBhcnQtPmxheW91dCgpOwogCiAgICAgaWYgKG9yaWVudGF0aW9uKCkgPT0g SG9yaXpvbnRhbFNjcm9sbGJhcikgewotICAgICAgICBpbnQgbWFyZ2luTGVmdCA9IHBhcnQgPyBw YXJ0LT5tYXJnaW5MZWZ0KCkgOiAwOwotICAgICAgICBpbnQgbWFyZ2luUmlnaHQgPSBwYXJ0ID8g cGFydC0+bWFyZ2luUmlnaHQoKSA6IDA7CisgICAgICAgIGludCBtYXJnaW5MZWZ0ID0gcGFydCA/ IHN0YXRpY19jYXN0PGludD4ocGFydC0+bWFyZ2luTGVmdCgpKSA6IDA7CisgICAgICAgIGludCBt YXJnaW5SaWdodCA9IHBhcnQgPyBzdGF0aWNfY2FzdDxpbnQ+KHBhcnQtPm1hcmdpblJpZ2h0KCkp IDogMDsKICAgICAgICAgc3RhcnRMZW5ndGggKz0gbWFyZ2luTGVmdDsKICAgICAgICAgZW5kTGVu Z3RoICs9IG1hcmdpblJpZ2h0OwogICAgICAgICBpbnQgdG90YWxMZW5ndGggPSBzdGFydExlbmd0 aCArIGVuZExlbmd0aDsKICAgICAgICAgcmV0dXJuIEludFJlY3QoeCgpICsgc3RhcnRMZW5ndGgs IHkoKSwgd2lkdGgoKSAtIHRvdGFsTGVuZ3RoLCBoZWlnaHQoKSk7CiAgICAgfQogICAgIAotICAg IGludCBtYXJnaW5Ub3AgPSBwYXJ0ID8gcGFydC0+bWFyZ2luVG9wKCkgOiAwOwotICAgIGludCBt YXJnaW5Cb3R0b20gPSBwYXJ0ID8gcGFydC0+bWFyZ2luQm90dG9tKCkgOiAwOworICAgIGludCBt YXJnaW5Ub3AgPSBwYXJ0ID8gc3RhdGljX2Nhc3Q8aW50PihwYXJ0LT5tYXJnaW5Ub3AoKSkgOiAw OworICAgIGludCBtYXJnaW5Cb3R0b20gPSBwYXJ0ID8gc3RhdGljX2Nhc3Q8aW50PihwYXJ0LT5t YXJnaW5Cb3R0b20oKSkgOiAwOwogICAgIHN0YXJ0TGVuZ3RoICs9IG1hcmdpblRvcDsKICAgICBl bmRMZW5ndGggKz0gbWFyZ2luQm90dG9tOwogICAgIGludCB0b3RhbExlbmd0aCA9IHN0YXJ0TGVu Z3RoICsgZW5kTGVuZ3RoOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNj cm9sbGJhclBhcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyU2Nyb2xsYmFyUGFydC5oCShyZXZpc2lvbiAxMTA0MzUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyUGFydC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0 NiwxMyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKCk7CiAgICAgCiAgICAgdm9pZCBwYWludEludG9SZWN0KEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgTGF5b3V0UmVjdCYpOwotICAgIAorCisgICAgLy8g U2Nyb2xsYmFyIHBhcnRzIG5lZWRzIHRvIGJlIHJlbmRlcmVkIGF0IGRldmljZSBwaXhlbCBib3Vu ZGFyaWVzLgorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBtYXJnaW5Ub3AoKSBjb25zdCB7IEFTU0VS VChpc0ludGVnZXJWYWx1ZShtX21hcmdpblRvcCkpOyByZXR1cm4gbV9tYXJnaW5Ub3A7IH0KKyAg ICB2aXJ0dWFsIExheW91dFVuaXQgbWFyZ2luQm90dG9tKCkgY29uc3QgeyBBU1NFUlQoaXNJbnRl Z2VyVmFsdWUobV9tYXJnaW5Cb3R0b20pKTsgcmV0dXJuIG1fbWFyZ2luQm90dG9tOyB9CisgICAg dmlydHVhbCBMYXlvdXRVbml0IG1hcmdpbkxlZnQoKSBjb25zdCB7IEFTU0VSVChpc0ludGVnZXJW YWx1ZShtX21hcmdpbkxlZnQpKTsgcmV0dXJuIG1fbWFyZ2luTGVmdDsgfQorICAgIHZpcnR1YWwg TGF5b3V0VW5pdCBtYXJnaW5SaWdodCgpIGNvbnN0IHsgQVNTRVJUKGlzSW50ZWdlclZhbHVlKG1f bWFyZ2luUmlnaHQpKTsgcmV0dXJuIG1fbWFyZ2luUmlnaHQ7IH0KKwogcHJvdGVjdGVkOgogICAg IHZpcnR1YWwgdm9pZCBzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0 IFJlbmRlclN0eWxlKiBuZXdTdHlsZSk7CiAgICAgdmlydHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdl KFN0eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKTsK 131431 2012-03-12 15:57:10 -0700 2012-03-12 16:51:26 -0700 Patch for landing bug-80894-20120312155709.patch text/plain 6990 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDQ5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAzLTEyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggcm91bmRpbmcgaW4gc2Ny b2xsYmFyIHJlY3QgY2FsY3VsYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDg5NAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgorCisgICAgICAgIEZpeCB1c2FnZSBvZiBzdWJwaXhlbCB1bml0cyBpbiBSZW5kZXJTY3JvbGxi YXI6OmJ1dHRvblJlY3QgYW5kCisgICAgICAgIFJlbmRlclNjcm9sbGJhcjo6dHJhY2tSZWN0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAg KiByZW5kZXJpbmcvTGF5b3V0VHlwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OmlzSW50ZWdlclZh bHVlKToKKyAgICAgICAgQWRkIGR1bW15IGlzSW50ZWdlclZhbHVlIGZ1bmN0aW9uLCB3aWxsIGJl IHJlcGxhY2VkIHdpdGggYWN0dWFsCisgICAgICAgIGltcGxlbWVudGF0aW9uIG9uY2UgTGF5b3V0 VW5pdCBpcyByZW1hcHBlZCB0byBGcmFjdGlvbmFsTGF5b3V0VW5pdC4KKyAgICAgICAgCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTY3JvbGxiYXI6OmJ1dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Ny b2xsYmFyOjp0cmFja1JlY3QpOgorICAgICAgICBDaGFuZ2UgcmVjdCBjYWxjdWxhdGlvbnMgdG8g dXNlIHBpeGVsIHNuYXBwZWQgdmFsdWVzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNj cm9sbGJhclBhcnQuaDoKKyAgICAgICAgKFJlbmRlclNjcm9sbGJhclBhcnQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyU2Nyb2xsYmFyUGFydDo6bWFyZ2luVG9wKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNjcm9sbGJhclBhcnQ6Om1hcmdpbkJvdHRvbSk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTY3JvbGxiYXJQYXJ0OjptYXJnaW5MZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNjcm9sbGJhclBhcnQ6Om1hcmdpblJpZ2h0KToKKyAgICAgICAgQWRkIEFTU0VSVCB0byBl bnN1cmUgdGhhdCBzY3JvbGxiYXIgcGFydHMgYXJlIGFsd2F5cyBhbGlnbmVkIHRvIGRldmljZQor ICAgICAgICBwaXhlbHMuCisKIDIwMTItMDMtMTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBh cHBsZS5jb20+CiAKICAgICAgICAgY2xhbmcgYnVpbGQgZml4CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvTGF5b3V0VHlwZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGF5b3V0VHlwZXMuaAkocmV2aXNpb24gMTEwNDkzKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0xheW91dFR5cGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw2ICsxNTAs MTEgQEAgaW5saW5lIExheW91dFVuaXQgY2xhbXBUb0xheW91dFVuaXQoZG91YgogICAgIHJldHVy biBjbGFtcFRvSW50ZWdlcih2YWx1ZSk7CiB9CiAKK2lubGluZSBib29sIGlzSW50ZWdlclZhbHVl KGNvbnN0IExheW91dFVuaXQpCit7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIExheW91dFR5cGVzX2gKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCShyZXZpc2lvbiAxMTA0OTMpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjk3LDI3ICsyOTcsMjYgQEAgSW50UmVjdCBSZW5kZXJTY3JvbGxiYXI6OmJ1dHRv blJlY3QoU2NybwogICAgIAogICAgIGJvb2wgaXNIb3Jpem9udGFsID0gb3JpZW50YXRpb24oKSA9 PSBIb3Jpem9udGFsU2Nyb2xsYmFyOwogICAgIGlmIChwYXJ0VHlwZSA9PSBCYWNrQnV0dG9uU3Rh cnRQYXJ0KQotICAgICAgICByZXR1cm4gSW50UmVjdChsb2NhdGlvbigpLCBJbnRTaXplKGlzSG9y aXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+d2lkdGgoKSA6IHdpZHRoKCksIGlzSG9yaXpvbnRhbCA/ IGhlaWdodCgpIDogcGFydFJlbmRlcmVyLT5oZWlnaHQoKSkpOworICAgICAgICByZXR1cm4gSW50 UmVjdChsb2NhdGlvbigpLCBJbnRTaXplKGlzSG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+cGl4 ZWxTbmFwcGVkV2lkdGgoKSA6IHdpZHRoKCksIGlzSG9yaXpvbnRhbCA/IGhlaWdodCgpIDogcGFy dFJlbmRlcmVyLT5waXhlbFNuYXBwZWRIZWlnaHQoKSkpOwogICAgIGlmIChwYXJ0VHlwZSA9PSBG b3J3YXJkQnV0dG9uRW5kUGFydCkKLSAgICAgICAgcmV0dXJuIEludFJlY3QoaXNIb3Jpem9udGFs ID8geCgpICsgd2lkdGgoKSAtIHBhcnRSZW5kZXJlci0+d2lkdGgoKSA6IHgoKSwKLSAgICAgICAg Ci0gICAgICAgICAgICAgICAgICAgICAgIGlzSG9yaXpvbnRhbCA/IHkoKSA6IHkoKSArIGhlaWdo dCgpIC0gcGFydFJlbmRlcmVyLT5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgaXNI b3Jpem9udGFsID8gcGFydFJlbmRlcmVyLT53aWR0aCgpIDogd2lkdGgoKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPmhlaWdo dCgpKTsKKyAgICAgICAgcmV0dXJuIEludFJlY3QoaXNIb3Jpem9udGFsID8geCgpICsgd2lkdGgo KSAtIHBhcnRSZW5kZXJlci0+cGl4ZWxTbmFwcGVkV2lkdGgoKSA6IHgoKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgaXNIb3Jpem9udGFsID8geSgpIDogeSgpICsgaGVpZ2h0KCkgLSBwYXJ0UmVu ZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpLAorICAgICAgICAgICAgICAgICAgICAgICBpc0hv cml6b250YWwgPyBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZFdpZHRoKCkgOiB3aWR0aCgpLAor ICAgICAgICAgICAgICAgICAgICAgICBpc0hvcml6b250YWwgPyBoZWlnaHQoKSA6IHBhcnRSZW5k ZXJlci0+cGl4ZWxTbmFwcGVkSGVpZ2h0KCkpOwogICAgIAogICAgIGlmIChwYXJ0VHlwZSA9PSBG b3J3YXJkQnV0dG9uU3RhcnRQYXJ0KSB7CiAgICAgICAgIEludFJlY3QgcHJldmlvdXNCdXR0b24g PSBidXR0b25SZWN0KEJhY2tCdXR0b25TdGFydFBhcnQpOwogICAgICAgICByZXR1cm4gSW50UmVj dChpc0hvcml6b250YWwgPyB4KCkgKyBwcmV2aW91c0J1dHRvbi53aWR0aCgpIDogeCgpLAogICAg ICAgICAgICAgICAgICAgICAgICBpc0hvcml6b250YWwgPyB5KCkgOiB5KCkgKyBwcmV2aW91c0J1 dHRvbi5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gcGFy dFJlbmRlcmVyLT53aWR0aCgpIDogd2lkdGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgaXNI b3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPmhlaWdodCgpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gcGFydFJlbmRlcmVyLT5waXhlbFNuYXBwZWRX aWR0aCgpIDogd2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8g aGVpZ2h0KCkgOiBwYXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpKTsKICAgICB9CiAg ICAgCiAgICAgSW50UmVjdCBmb2xsb3dpbmdCdXR0b24gPSBidXR0b25SZWN0KEZvcndhcmRCdXR0 b25FbmRQYXJ0KTsKLSAgICByZXR1cm4gSW50UmVjdChpc0hvcml6b250YWwgPyB4KCkgKyB3aWR0 aCgpIC0gZm9sbG93aW5nQnV0dG9uLndpZHRoKCkgLSBwYXJ0UmVuZGVyZXItPndpZHRoKCkgOiB4 KCksCi0gICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8geSgpIDogeSgpICsgaGVpZ2h0 KCkgLSBmb2xsb3dpbmdCdXR0b24uaGVpZ2h0KCkgLSBwYXJ0UmVuZGVyZXItPmhlaWdodCgpLAot ICAgICAgICAgICAgICAgICAgIGlzSG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+d2lkdGgoKSA6 IHdpZHRoKCksCi0gICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkgOiBw YXJ0UmVuZGVyZXItPmhlaWdodCgpKTsKKyAgICByZXR1cm4gSW50UmVjdChpc0hvcml6b250YWwg PyB4KCkgKyB3aWR0aCgpIC0gZm9sbG93aW5nQnV0dG9uLndpZHRoKCkgLSBwYXJ0UmVuZGVyZXIt PnBpeGVsU25hcHBlZFdpZHRoKCkgOiB4KCksCisgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9u dGFsID8geSgpIDogeSgpICsgaGVpZ2h0KCkgLSBmb2xsb3dpbmdCdXR0b24uaGVpZ2h0KCkgLSBw YXJ0UmVuZGVyZXItPnBpeGVsU25hcHBlZEhlaWdodCgpLAorICAgICAgICAgICAgICAgICAgIGlz SG9yaXpvbnRhbCA/IHBhcnRSZW5kZXJlci0+cGl4ZWxTbmFwcGVkV2lkdGgoKSA6IHdpZHRoKCks CisgICAgICAgICAgICAgICAgICAgaXNIb3Jpem9udGFsID8gaGVpZ2h0KCkgOiBwYXJ0UmVuZGVy ZXItPnBpeGVsU25hcHBlZEhlaWdodCgpKTsKIH0KIAogSW50UmVjdCBSZW5kZXJTY3JvbGxiYXI6 OnRyYWNrUmVjdChpbnQgc3RhcnRMZW5ndGgsIGludCBlbmRMZW5ndGgpCkBAIC0zMjcsMTYgKzMy NiwxNiBAQCBJbnRSZWN0IFJlbmRlclNjcm9sbGJhcjo6dHJhY2tSZWN0KGludCBzCiAgICAgICAg IHBhcnQtPmxheW91dCgpOwogCiAgICAgaWYgKG9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNj cm9sbGJhcikgewotICAgICAgICBpbnQgbWFyZ2luTGVmdCA9IHBhcnQgPyBwYXJ0LT5tYXJnaW5M ZWZ0KCkgOiAwOwotICAgICAgICBpbnQgbWFyZ2luUmlnaHQgPSBwYXJ0ID8gcGFydC0+bWFyZ2lu UmlnaHQoKSA6IDA7CisgICAgICAgIGludCBtYXJnaW5MZWZ0ID0gcGFydCA/IHN0YXRpY19jYXN0 PGludD4ocGFydC0+bWFyZ2luTGVmdCgpKSA6IDA7CisgICAgICAgIGludCBtYXJnaW5SaWdodCA9 IHBhcnQgPyBzdGF0aWNfY2FzdDxpbnQ+KHBhcnQtPm1hcmdpblJpZ2h0KCkpIDogMDsKICAgICAg ICAgc3RhcnRMZW5ndGggKz0gbWFyZ2luTGVmdDsKICAgICAgICAgZW5kTGVuZ3RoICs9IG1hcmdp blJpZ2h0OwogICAgICAgICBpbnQgdG90YWxMZW5ndGggPSBzdGFydExlbmd0aCArIGVuZExlbmd0 aDsKICAgICAgICAgcmV0dXJuIEludFJlY3QoeCgpICsgc3RhcnRMZW5ndGgsIHkoKSwgd2lkdGgo KSAtIHRvdGFsTGVuZ3RoLCBoZWlnaHQoKSk7CiAgICAgfQogICAgIAotICAgIGludCBtYXJnaW5U b3AgPSBwYXJ0ID8gcGFydC0+bWFyZ2luVG9wKCkgOiAwOwotICAgIGludCBtYXJnaW5Cb3R0b20g PSBwYXJ0ID8gcGFydC0+bWFyZ2luQm90dG9tKCkgOiAwOworICAgIGludCBtYXJnaW5Ub3AgPSBw YXJ0ID8gc3RhdGljX2Nhc3Q8aW50PihwYXJ0LT5tYXJnaW5Ub3AoKSkgOiAwOworICAgIGludCBt YXJnaW5Cb3R0b20gPSBwYXJ0ID8gc3RhdGljX2Nhc3Q8aW50PihwYXJ0LT5tYXJnaW5Cb3R0b20o KSkgOiAwOwogICAgIHN0YXJ0TGVuZ3RoICs9IG1hcmdpblRvcDsKICAgICBlbmRMZW5ndGggKz0g bWFyZ2luQm90dG9tOwogICAgIGludCB0b3RhbExlbmd0aCA9IHN0YXJ0TGVuZ3RoICsgZW5kTGVu Z3RoOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclBhcnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFy UGFydC5oCShyZXZpc2lvbiAxMTA0OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyU2Nyb2xsYmFyUGFydC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0NiwxMyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCk7CiAg ICAgCiAgICAgdm9pZCBwYWludEludG9SZWN0KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IExheW91 dFBvaW50JiwgY29uc3QgTGF5b3V0UmVjdCYpOwotICAgIAorCisgICAgLy8gU2Nyb2xsYmFyIHBh cnRzIG5lZWRzIHRvIGJlIHJlbmRlcmVkIGF0IGRldmljZSBwaXhlbCBib3VuZGFyaWVzLgorICAg IHZpcnR1YWwgTGF5b3V0VW5pdCBtYXJnaW5Ub3AoKSBjb25zdCB7IEFTU0VSVChpc0ludGVnZXJW YWx1ZShtX21hcmdpblRvcCkpOyByZXR1cm4gbV9tYXJnaW5Ub3A7IH0KKyAgICB2aXJ0dWFsIExh eW91dFVuaXQgbWFyZ2luQm90dG9tKCkgY29uc3QgeyBBU1NFUlQoaXNJbnRlZ2VyVmFsdWUobV9t YXJnaW5Cb3R0b20pKTsgcmV0dXJuIG1fbWFyZ2luQm90dG9tOyB9CisgICAgdmlydHVhbCBMYXlv dXRVbml0IG1hcmdpbkxlZnQoKSBjb25zdCB7IEFTU0VSVChpc0ludGVnZXJWYWx1ZShtX21hcmdp bkxlZnQpKTsgcmV0dXJuIG1fbWFyZ2luTGVmdDsgfQorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBt YXJnaW5SaWdodCgpIGNvbnN0IHsgQVNTRVJUKGlzSW50ZWdlclZhbHVlKG1fbWFyZ2luUmlnaHQp KTsgcmV0dXJuIG1fbWFyZ2luUmlnaHQ7IH0KKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9p ZCBzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxl KiBuZXdTdHlsZSk7CiAgICAgdmlydHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVy ZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKTsK