53386 2011-01-29 16:08:20 -0800 Fix fat build for both 32-bit and 64-bit under llvm-gcc 4.2 2011-01-29 16:22:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 342163 0 mjs 2011-01-29 16:08:20 -0800 Fix fat build for both 32-bit and 64-bit under llvm-gcc 4.2 342164 1 80579 mjs 2011-01-29 16:09:07 -0800 Created attachment 80579 Patch 342165 2 80579 mitz 2011-01-29 16:11:54 -0800 Comment on attachment 80579 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80579&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:353 > + isHorizontallyStretched = (stretchAmount.width() == 0) ? false : true; > + isVerticallyStretched = (stretchAmount.height() == 0) ? false : true; Simply isHorizontallyStretched = stretchAmount.width(); should do. 342167 3 mjs 2011-01-29 16:22:59 -0800 Committed r77075: <http://trac.webkit.org/changeset/77075> 80579 2011-01-29 16:09:07 -0800 2011-01-29 16:11:54 -0800 Patch bug-53386-20110129160906.patch text/plain 10088 mjs SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MDc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDEtMjkgIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGaXggZmF0IGJ1aWxkIGZvciBib3RoIDMyLWJpdCBhbmQgNjQt Yml0IHVuZGVyIGxsdm0tZ2NjIDQuMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTMzODYKKworICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxBbmlt YXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmVsYXN0aWNEZWx0YUZvclJlYm91bmREZWx0 YSk6CisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxXaGVlbE11bHRpcGxpZXIpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNtb290aFNjcm9sbFdpdGhFdmVudCk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6YmVnaW5TY3JvbGxHZXN0dXJlKToKKyAg ICAgICAgKFdlYkNvcmU6OnJvdW5kVG93YXJkWmVybyk6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxBbmltYXRvck1hYzo6c25hcFJ1YmJlckJhbmRUaW1lckZpcmVkKToKKwogMjAxMS0wMS0yOSAg RGFuaWVsIEJhdGVzICA8ZGJhdGVzQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFj aWVqIFN0YWNob3dpYWsuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs QW5pbWF0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1Njcm9sbEFuaW1hdG9yTWFjLm1tCShyZXZpc2lvbiA3NzA3MSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjEz LDkgKzIxMyw5IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbEIKICNp ZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKIHN0YXRpYyBjb25zdCBmbG9hdCBzY3JvbGxWZWxv Y2l0eVplcm9pbmdUaW1lb3V0ID0gMC4xMGY7Ci1zdGF0aWMgY29uc3QgZmxvYXQgcnViYmVyYmFu ZFN0aWZmbmVzcyA9IDIwLjBmOwotc3RhdGljIGNvbnN0IGZsb2F0IHJ1YmJlcmJhbmREaXJlY3Rp b25Mb2NrU3RyZXRjaFJhdGlvID0gMS4wZjsKLXN0YXRpYyBjb25zdCBmbG9hdCBydWJiZXJiYW5k TWluaW11bVJlcXVpcmVkRGVsdGFCZWZvcmVTdHJldGNoID0gMTAuMGY7CitzdGF0aWMgY29uc3Qg ZmxvYXQgcnViYmVyYmFuZFN0aWZmbmVzcyA9IDIwOworc3RhdGljIGNvbnN0IGZsb2F0IHJ1YmJl cmJhbmREaXJlY3Rpb25Mb2NrU3RyZXRjaFJhdGlvID0gMTsKK3N0YXRpYyBjb25zdCBmbG9hdCBy dWJiZXJiYW5kTWluaW11bVJlcXVpcmVkRGVsdGFCZWZvcmVTdHJldGNoID0gMTA7CiBzdGF0aWMg Y29uc3QgZmxvYXQgcnViYmVyYmFuZEFtcGxpdHVkZSA9IDAuMzFmOwogc3RhdGljIGNvbnN0IGZs b2F0IHJ1YmJlcmJhbmRQZXJpb2QgPSAxLjZmOwogCkBAIC0yMzAsNyArMjMwLDcgQEAgc3RhdGlj IGZsb2F0IGVsYXN0aWNEZWx0YUZvclRpbWVEZWx0YShmbAogCiBzdGF0aWMgZmxvYXQgZWxhc3Rp Y0RlbHRhRm9yUmVib3VuZERlbHRhKGZsb2F0IGRlbHRhKQogewotICAgIGZsb2F0IHN0aWZmbmVz cyA9IHN0ZDo6bWF4KHJ1YmJlcmJhbmRTdGlmZm5lc3MsIDEuMCk7CisgICAgZmxvYXQgc3RpZmZu ZXNzID0gc3RkOjptYXgocnViYmVyYmFuZFN0aWZmbmVzcywgMS4wZik7CiAgICAgcmV0dXJuIGRl bHRhIC8gc3RpZmZuZXNzOwogfQogCkBAIC0yNDEsNyArMjQxLDcgQEAgc3RhdGljIGZsb2F0IHJl Ym91bmREZWx0YUZvckVsYXN0aWNEZWx0YQogCiBzdGF0aWMgZmxvYXQgc2Nyb2xsV2hlZWxNdWx0 aXBsaWVyKCkKIHsKLSAgICBzdGF0aWMgZmxvYXQgbXVsdGlwbGllciA9IC0xLjA7CisgICAgc3Rh dGljIGZsb2F0IG11bHRpcGxpZXIgPSAtMTsKICAgICBpZiAobXVsdGlwbGllciA8IDApIHsKICAg ICAgICAgbXVsdGlwbGllciA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNd IGZsb2F0Rm9yS2V5OkAiTlNTY3JvbGxXaGVlbE11bHRpcGxpZXIiXTsKICAgICAgICAgaWYgKG11 bHRpcGxpZXIgPD0gMCkKQEAgLTMzOSw5ICszMzksOSBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFj OjpzbW9vdGhTY3JvbGxXaXRoCiAKICAgICAvLyBTbGlnaHRseSBwcmVmZXIgc2Nyb2xsaW5nIHZl cnRpY2FsbHkgYnkgYXBwbHlpbmcgdGhlID0gY2FzZSB0byBkZWx0YVkKICAgICBpZiAoZmFic2Yo ZGVsdGFZKSA+PSBmYWJzZihkZWx0YVgpKQotICAgICAgICBkZWx0YVggPSAwLjA7CisgICAgICAg IGRlbHRhWCA9IDA7CiAgICAgZWxzZQotICAgICAgICBkZWx0YVkgPSAwLjA7CisgICAgICAgIGRl bHRhWSA9IDA7CiAgICAgCiAgICAgYm9vbCBpc1ZlcnRpY2FsbHlTdHJldGNoZWQgPSBmYWxzZTsK ICAgICBib29sIGlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkID0gZmFsc2U7CkBAIC0zNDksOCArMzQ5 LDggQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aAogICAgIAogICAg IEludFNpemUgc3RyZXRjaEFtb3VudCA9IG1fc2Nyb2xsYWJsZUFyZWEtPm92ZXJoYW5nQW1vdW50 KCk7CiAKLSAgICBpc0hvcml6b250YWxseVN0cmV0Y2hlZCA9IChzdHJldGNoQW1vdW50LndpZHRo KCkgPT0gMC4wKSA/IGZhbHNlIDogdHJ1ZTsKLSAgICBpc1ZlcnRpY2FsbHlTdHJldGNoZWQgPSAo c3RyZXRjaEFtb3VudC5oZWlnaHQoKSA9PSAwLjApID8gZmFsc2UgOiB0cnVlOworICAgIGlzSG9y aXpvbnRhbGx5U3RyZXRjaGVkID0gKHN0cmV0Y2hBbW91bnQud2lkdGgoKSA9PSAwKSA/IGZhbHNl IDogdHJ1ZTsKKyAgICBpc1ZlcnRpY2FsbHlTdHJldGNoZWQgPSAoc3RyZXRjaEFtb3VudC5oZWln aHQoKSA9PSAwKSA/IGZhbHNlIDogdHJ1ZTsKIAogICAgIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNl IHBoYXNlID0gd2hlZWxFdmVudC5waGFzZSgpOwogCkBAIC0zNjAsOSArMzYwLDkgQEAgdm9pZCBT Y3JvbGxBbmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aAogCiAgICAgQ0ZUaW1lSW50ZXJ2YWwg dGltZURlbHRhID0gd2hlZWxFdmVudC50aW1lc3RhbXAoKSAtIG1fbGFzdE1vbWVtdHVtU2Nyb2xs VGltZXN0YW1wOwogICAgIGlmIChtX2luU2Nyb2xsR2VzdHVyZSB8fCBtX21vbWVudHVtU2Nyb2xs SW5Qcm9ncmVzcykgewotICAgICAgICBpZiAobV9sYXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAg JiYgdGltZURlbHRhID4gMC4wICYmIHRpbWVEZWx0YSA8IHNjcm9sbFZlbG9jaXR5WmVyb2luZ1Rp bWVvdXQpIHsKLSAgICAgICAgICAgIG1fbW9tZW50dW1WZWxvY2l0eS5zZXRXaWR0aChldmVudENv YWxsZXNjZWREZWx0YVggLyB0aW1lRGVsdGEpOwotICAgICAgICAgICAgbV9tb21lbnR1bVZlbG9j aXR5LnNldEhlaWdodChldmVudENvYWxsZXNjZWREZWx0YVkgLyB0aW1lRGVsdGEpOworICAgICAg ICBpZiAobV9sYXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAgJiYgdGltZURlbHRhID4gMCAmJiB0 aW1lRGVsdGEgPCBzY3JvbGxWZWxvY2l0eVplcm9pbmdUaW1lb3V0KSB7CisgICAgICAgICAgICBt X21vbWVudHVtVmVsb2NpdHkuc2V0V2lkdGgoZXZlbnRDb2FsbGVzY2VkRGVsdGFYIC8gKGZsb2F0 KXRpbWVEZWx0YSk7CisgICAgICAgICAgICBtX21vbWVudHVtVmVsb2NpdHkuc2V0SGVpZ2h0KGV2 ZW50Q29hbGxlc2NlZERlbHRhWSAvIChmbG9hdCl0aW1lRGVsdGEpOwogICAgICAgICAgICAgbV9s YXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAgPSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgpOwogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9sYXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAg PSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgpOwpAQCAtMzcyLDIyICszNzIsMjIgQEAgdm9pZCBTY3Jv bGxBbmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aAogICAgICAgICBpZiAoaXNWZXJ0aWNhbGx5 U3RyZXRjaGVkKSB7CiAgICAgICAgICAgICBpZiAoIWlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkICYm IHBpbm5lZEluRGlyZWN0aW9uKGRlbHRhWCwgMCkpIHsgICAgICAgICAgICAgICAgCiAgICAgICAg ICAgICAgICAgLy8gU3RyZXRjaGluZyBvbmx5IGluIHRoZSB2ZXJ0aWNhbC4KLSAgICAgICAgICAg ICAgICBpZiAoZGVsdGFZICE9IDAuMCAmJiAoZmFic2YoZGVsdGFYIC8gZGVsdGFZKSA8IHJ1YmJl cmJhbmREaXJlY3Rpb25Mb2NrU3RyZXRjaFJhdGlvKSkKLSAgICAgICAgICAgICAgICAgICAgZGVs dGFYID0gMC4wOworICAgICAgICAgICAgICAgIGlmIChkZWx0YVkgIT0gMCAmJiAoZmFic2YoZGVs dGFYIC8gZGVsdGFZKSA8IHJ1YmJlcmJhbmREaXJlY3Rpb25Mb2NrU3RyZXRjaFJhdGlvKSkKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFYID0gMDsKICAgICAgICAgICAgICAgICBlbHNlIGlmIChm YWJzZihkZWx0YVgpIDwgcnViYmVyYmFuZE1pbmltdW1SZXF1aXJlZERlbHRhQmVmb3JlU3RyZXRj aCkgewogICAgICAgICAgICAgICAgICAgICBtX292ZXJmbG93U2Nyb2xsRGVsdGEuc2V0V2lkdGgo bV9vdmVyZmxvd1Njcm9sbERlbHRhLndpZHRoKCkgKyBkZWx0YVgpOwotICAgICAgICAgICAgICAg ICAgICBkZWx0YVggPSAwLjA7CisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7CiAgICAg ICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgIG1fb3ZlcmZsb3dTY3JvbGxE ZWx0YS5zZXRXaWR0aChtX292ZXJmbG93U2Nyb2xsRGVsdGEud2lkdGgoKSArIGRlbHRhWCk7CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAoaXNIb3Jpem9udGFsbHlTdHJldGNoZWQp IHsKICAgICAgICAgICAgIC8vIFN0cmV0Y2hpbmcgb25seSBpbiB0aGUgaG9yaXpvbnRhbC4KICAg ICAgICAgICAgIGlmIChwaW5uZWRJbkRpcmVjdGlvbigwLCBkZWx0YVkpKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKGRlbHRhWCAhPSAwLjAgJiYgKGZhYnNmKGRlbHRhWSAvIGRlbHRhWCkgPCBydWJi ZXJiYW5kRGlyZWN0aW9uTG9ja1N0cmV0Y2hSYXRpbykpCi0gICAgICAgICAgICAgICAgICAgIGRl bHRhWSA9IDAuMDsKKyAgICAgICAgICAgICAgICBpZiAoZGVsdGFYICE9IDAgJiYgKGZhYnNmKGRl bHRhWSAvIGRlbHRhWCkgPCBydWJiZXJiYW5kRGlyZWN0aW9uTG9ja1N0cmV0Y2hSYXRpbykpCisg ICAgICAgICAgICAgICAgICAgIGRlbHRhWSA9IDA7CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAo ZmFic2YoZGVsdGFZKSA8IHJ1YmJlcmJhbmRNaW5pbXVtUmVxdWlyZWREZWx0YUJlZm9yZVN0cmV0 Y2gpIHsKICAgICAgICAgICAgICAgICAgICAgbV9vdmVyZmxvd1Njcm9sbERlbHRhLnNldEhlaWdo dChtX292ZXJmbG93U2Nyb2xsRGVsdGEuaGVpZ2h0KCkgKyBkZWx0YVkpOwotICAgICAgICAgICAg ICAgICAgICBkZWx0YVkgPSAwLjA7CisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA9IDA7CiAg ICAgICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgIG1fb3ZlcmZsb3dTY3Jv bGxEZWx0YS5zZXRIZWlnaHQobV9vdmVyZmxvd1Njcm9sbERlbHRhLmhlaWdodCgpICsgZGVsdGFZ KTsKICAgICAgICAgICAgIH0KQEAgLTM5Nyw3ICszOTcsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9y TWFjOjpzbW9vdGhTY3JvbGxXaXRoCiAgICAgICAgICAgICAgICAgaWYgKGZhYnNmKGRlbHRhWSkg Pj0gZmFic2YoZGVsdGFYKSkgewogICAgICAgICAgICAgICAgICAgICBpZiAoZmFic2YoZGVsdGFY KSA8IHJ1YmJlcmJhbmRNaW5pbXVtUmVxdWlyZWREZWx0YUJlZm9yZVN0cmV0Y2gpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS5zZXRXaWR0aChtX292ZXJm bG93U2Nyb2xsRGVsdGEud2lkdGgoKSArIGRlbHRhWCk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBkZWx0YVggPSAwLjA7CisgICAgICAgICAgICAgICAgICAgICAgICBkZWx0YVggPSAwOwogICAg ICAgICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIG1fb3ZlcmZs b3dTY3JvbGxEZWx0YS5zZXRXaWR0aChtX292ZXJmbG93U2Nyb2xsRGVsdGEud2lkdGgoKSArIGRl bHRhWCk7CiAgICAgICAgICAgICAgICAgfQpAQCAtNDA2LDcgKzQwNiw3IEBAIHZvaWQgU2Nyb2xs QW5pbWF0b3JNYWM6OnNtb290aFNjcm9sbFdpdGgKICAgICAgICAgfQogICAgIH0KIAotICAgIGlm IChkZWx0YVggIT0gMC4wIHx8IGRlbHRhWSAhPSAwLjApIHsKKyAgICBpZiAoZGVsdGFYICE9IDAg fHwgZGVsdGFZICE9IDApIHsKICAgICAgICAgaWYgKCEoc2hvdWxkU3RyZXRjaCB8fCBpc1ZlcnRp Y2FsbHlTdHJldGNoZWQgfHwgaXNIb3Jpem9udGFsbHlTdHJldGNoZWQpKSB7CiAgICAgICAgICAg ICBpZiAoZGVsdGFZICE9IDApIHsKICAgICAgICAgICAgICAgICBkZWx0YVkgKj0gc2Nyb2xsV2hl ZWxNdWx0aXBsaWVyKCk7CkBAIC00MTgsOCArNDE4LDggQEAgdm9pZCBTY3JvbGxBbmltYXRvck1h Yzo6c21vb3RoU2Nyb2xsV2l0aAogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgaWYgKCFhbGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZygpKSB7Ci0gICAgICAgICAg ICAgICAgZGVsdGFYID0gMC4wOwotICAgICAgICAgICAgICAgIGV2ZW50Q29hbGxlc2NlZERlbHRh WCA9IDAuMDsKKyAgICAgICAgICAgICAgICBkZWx0YVggPSAwOworICAgICAgICAgICAgICAgIGV2 ZW50Q29hbGxlc2NlZERlbHRhWCA9IDA7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKChkZWx0YVgg IT0gMCkgJiYgIWlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkICYmICFwaW5uZWRJbkRpcmVjdGlvbihk ZWx0YVgsIDApKSB7CiAgICAgICAgICAgICAgICAgZGVsdGFYICo9IHNjcm9sbFdoZWVsTXVsdGlw bGllcigpOwogCkBAIC00MjcsMTIgKzQyNywxMiBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpz bW9vdGhTY3JvbGxXaXRoCiAgICAgICAgICAgICAgICAgaW1tZWRpYXRlU2Nyb2xsQnlEZWx0YVgo ZGVsdGFYKTsKICAgICAgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5zZXRDb25zdHJhaW5z U2Nyb2xsaW5nVG9Db250ZW50RWRnZSh0cnVlKTsKIAotICAgICAgICAgICAgICAgIGRlbHRhWCA9 IDAuMDsKKyAgICAgICAgICAgICAgICBkZWx0YVggPSAwOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgCiAgICAgICAgICAgICBpZiAoIWFsbG93c1ZlcnRpY2FsU3RyZXRjaGluZygpKSB7Ci0g ICAgICAgICAgICAgICAgZGVsdGFZID0gMC4wOwotICAgICAgICAgICAgICAgIGV2ZW50Q29hbGxl c2NlZERlbHRhWSA9IDAuMDsKKyAgICAgICAgICAgICAgICBkZWx0YVkgPSAwOworICAgICAgICAg ICAgICAgIGV2ZW50Q29hbGxlc2NlZERlbHRhWSA9IDA7CiAgICAgICAgICAgICB9IGVsc2UgaWYg KChkZWx0YVkgIT0gMCkgJiYgIWlzVmVydGljYWxseVN0cmV0Y2hlZCAmJiAhcGlubmVkSW5EaXJl Y3Rpb24oMCwgZGVsdGFZKSkgewogICAgICAgICAgICAgICAgIGRlbHRhWSAqPSBzY3JvbGxXaGVl bE11bHRpcGxpZXIoKTsKIApAQCAtNDQwLDcgKzQ0MCw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JN YWM6OnNtb290aFNjcm9sbFdpdGgKICAgICAgICAgICAgICAgICBpbW1lZGlhdGVTY3JvbGxCeURl bHRhWShkZWx0YVkpOwogICAgICAgICAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPnNldENvbnN0 cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKHRydWUpOwogCi0gICAgICAgICAgICAgICAgZGVs dGFZID0gMC4wOworICAgICAgICAgICAgICAgIGRlbHRhWSA9IDA7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAKICAgICAgICAgICAgIEludFNpemUgc3RyZXRjaEFtb3VudCA9IG1fc2Nyb2xs YWJsZUFyZWEtPm92ZXJoYW5nQW1vdW50KCk7CkBAIC00NzEsNyArNDcxLDcgQEAgdm9pZCBTY3Jv bGxBbmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aAogICAgIGlmIChtX21vbWVudHVtU2Nyb2xs SW5Qcm9ncmVzcyAmJiBwaGFzZSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUVuZGVkKSB7CiAg ICAgICAgIG1fbW9tZW50dW1TY3JvbGxJblByb2dyZXNzID0gZmFsc2U7CiAgICAgICAgIG1faWdu b3JlTW9tZW50dW1TY3JvbGxzID0gZmFsc2U7Ci0gICAgICAgIG1fbGFzdE1vbWVtdHVtU2Nyb2xs VGltZXN0YW1wID0gMC4wOworICAgICAgICBtX2xhc3RNb21lbXR1bVNjcm9sbFRpbWVzdGFtcCA9 IDA7CiAgICAgfQogfQogCkBAIC00ODAsNyArNDgwLDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1h Yzo6YmVnaW5TY3JvbGxHZXN0dQogICAgIG1faW5TY3JvbGxHZXN0dXJlID0gdHJ1ZTsKICAgICBt X21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAgIG1faWdub3JlTW9tZW50dW1T Y3JvbGxzID0gZmFsc2U7Ci0gICAgbV9sYXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAgPSAwLjA7 CisgICAgbV9sYXN0TW9tZW10dW1TY3JvbGxUaW1lc3RhbXAgPSAwOwogICAgIG1fbW9tZW50dW1W ZWxvY2l0eSA9IEZsb2F0U2l6ZSgpOwogCiAgICAgSW50U2l6ZSBzdHJldGNoQW1vdW50ID0gbV9z Y3JvbGxhYmxlQXJlYS0+b3ZlcmhhbmdBbW91bnQoKTsKQEAgLTUxOSw3ICs1MTksNyBAQCB2b2lk IFNjcm9sbEFuaW1hdG9yTWFjOjpzbmFwUnViYmVyQmFuZCgpCiAKIHN0YXRpYyBpbmxpbmUgZmxv YXQgcm91bmRUb3dhcmRaZXJvKGZsb2F0IG51bSkKIHsKLSAgICByZXR1cm4gbnVtID4gMC4wID8g Y2VpbGYobnVtIC0gMC41KSA6IGZsb29yZihudW0gKyAwLjUpOworICAgIHJldHVybiBudW0gPiAw ID8gY2VpbGYobnVtIC0gMC41ZikgOiBmbG9vcmYobnVtICsgMC41Zik7CiB9CiAKIHN0YXRpYyBp bmxpbmUgZmxvYXQgcm91bmRUb0RldmljZVBpeGVsVG93YXJkWmVybyhmbG9hdCBudW0pCkBAIC01 NjcsMTAgKzU2NywxMCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbmFwUnViYmVyQmFuZFRp CiAgICAgICAgICAgICAgICAgbV9vcmlnVmVsb2NpdHkuc2V0SGVpZ2h0KDApOwogICAgICAgICB9 CiAKLSAgICAgICAgRmxvYXRQb2ludCBkZWx0YShyb3VuZFRvRGV2aWNlUGl4ZWxUb3dhcmRaZXJv KGVsYXN0aWNEZWx0YUZvclRpbWVEZWx0YShtX3N0YXJ0U3RyZXRjaC53aWR0aCgpLCAtbV9vcmln VmVsb2NpdHkud2lkdGgoKSwgdGltZURlbHRhKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg cm91bmRUb0RldmljZVBpeGVsVG93YXJkWmVybyhlbGFzdGljRGVsdGFGb3JUaW1lRGVsdGEobV9z dGFydFN0cmV0Y2guaGVpZ2h0KCksIC1tX29yaWdWZWxvY2l0eS5oZWlnaHQoKSwgdGltZURlbHRh KSkpOworICAgICAgICBGbG9hdFBvaW50IGRlbHRhKHJvdW5kVG9EZXZpY2VQaXhlbFRvd2FyZFpl cm8oZWxhc3RpY0RlbHRhRm9yVGltZURlbHRhKG1fc3RhcnRTdHJldGNoLndpZHRoKCksIC1tX29y aWdWZWxvY2l0eS53aWR0aCgpLCAoZmxvYXQpdGltZURlbHRhKSksCisgICAgICAgICAgICAgICAg ICAgICAgICAgcm91bmRUb0RldmljZVBpeGVsVG93YXJkWmVybyhlbGFzdGljRGVsdGFGb3JUaW1l RGVsdGEobV9zdGFydFN0cmV0Y2guaGVpZ2h0KCksIC1tX29yaWdWZWxvY2l0eS5oZWlnaHQoKSwg KGZsb2F0KXRpbWVEZWx0YSkpKTsKIAotICAgICAgICBpZiAoZmFicyhkZWx0YS54KCkpID49IDEu MCB8fCBmYWJzKGRlbHRhLnkoKSkgPj0gMS4wKSB7CisgICAgICAgIGlmIChmYWJzKGRlbHRhLngo KSkgPj0gMSB8fCBmYWJzKGRlbHRhLnkoKSkgPj0gMSkgewogICAgICAgICAgICAgRmxvYXRQb2lu dCBuZXdPcmlnaW4gPSBtX29yaWdPcmlnaW4gKyBkZWx0YTsKIAogICAgICAgICAgICAgbV9zY3Jv bGxhYmxlQXJlYS0+c2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UoZmFsc2UpOwo=