21006 2008-09-22 13:53:28 -0700 Make the viewless Mac scrollbar paint 2008-09-22 14:03:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 92190 0 hyatt 2008-09-22 13:53:28 -0700 Make the viewless Mac scrollbar paint with the Aqua style. 92191 1 23667 hyatt 2008-09-22 13:54:01 -0700 Created attachment 23667 Patch 92192 2 23667 darin 2008-09-22 13:56:00 -0700 Comment on attachment 23667 Patch #include <Carbon/Carbon.h> I'm surprised you need this. Doesn't it compile without it? #if !USE(NSSCROLLER) I'd put the #if USE(NSSCROLLER) case first, just because it's so much smaller. r=me 23667 2008-09-22 13:54:01 -0700 2008-09-22 13:56:00 -0700 Patch patch.txt text/plain 10541 hyatt SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM2Nzc0 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMDgtMDkt MjIgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBjb2RlIHRo YXQgcGFpbnRzIGFuIE5TVmlldy1sZXNzIHNjcm9sbGVyIHVzaW5nIEhJVGhlbWVEcmF3VHJhY2su ICBUaGlzIHNjcm9sbGJhciBpcyBzdGlsbCBub3QKKyAgICAgICAgc3dpdGNoZWQgb24uICBUaGVy ZSBhcmUgc3RpbGwgYSBmZXcgbW9yZSByZWZpbmVtZW50cyB0byBtYWtlIHRvIHRoZSByZW5kZXJp bmcgYW5kIGJlaGF2aW9yLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50KToKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50VHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50QnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGJhclRoZW1lQ29tcG9zaXRlOjpwYWludFRodW1iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvU2Nyb2xsYmFyVGhlbWVNYWMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFy VGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZU1hYzo6YmFja0J1 dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVNYWM6OmZvcndhcmRC dXR0b25SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnNjcm9sbGJhclBhcnRUb0hJUHJlc3NlZFN0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lTWFjOjpwYWludCk6CisgICAg ICAgICogcGxhdGZvcm0vbWFjL1dpZGdldE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OldpZGdl dDo6aW52YWxpZGF0ZVJlY3QpOgorCiAyMDA4LTA5LTIyICBDaHJpcyBNYXJyaW4gIDxjbWFycmlu QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnCkluZGV4OiBwbGF0 Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0v U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCShyZXZpc2lvbiAzNjc2NikKKysrIHBsYXRmb3Jt L1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIs NiBAQCBzdGF0aWMgUGFnZSogcGFnZUZvclNjcm9sbFZpZXcoU2Nyb2xsVmllCiB9CiAjZW5kaWYK IAotI2lmICFVU0UoTlNTQ1JPTExFUikKIGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBh aW50KFNjcm9sbGJhciogc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4 dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKIHsKICAgICAvLyBDcmVhdGUgdGhlIFNjcm9s bGJhckNvbnRyb2xQYXJ0TWFzayBiYXNlZCBvbiB0aGUgZGFtYWdlUmVjdApAQCAtMTYwLDcgKzE1 OSw2IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50KFNjcm8KIAogICAgIHJl dHVybiB0cnVlOwogfQotI2VuZGlmCiAKIFNjcm9sbGJhclBhcnQgU2Nyb2xsYmFyVGhlbWVDb21w b3NpdGU6OmhpdFRlc3QoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIGNvbnN0IFBsYXRmb3JtTW91c2VF dmVudCYgZXZ0KQogewpJbmRleDogcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5oCShyZXZpc2lv biAzNjc2NikKKysrIHBsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTMzLDkgKzMzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBTY3Jv bGxiYXJUaGVtZUNvbXBvc2l0ZSA6IHB1YmxpYyBTY3JvbGxiYXJUaGVtZSB7CiBwdWJsaWM6Ci0j aWYgIVVTRShOU1NDUk9MTEVSKQogICAgIHZpcnR1YWwgYm9vbCBwYWludChTY3JvbGxiYXIqLCBH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwotI2Vu ZGlmCisKICAgICB2aXJ0dWFsIFNjcm9sbGJhclBhcnQgaGl0VGVzdChTY3JvbGxiYXIqLCBjb25z dCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKIAogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlUGFy dChTY3JvbGxiYXIqLCBTY3JvbGxiYXJQYXJ0KTsKQEAgLTU5LDkgKzU4LDkgQEAgcHJvdGVjdGVk OgogCiAgICAgdmlydHVhbCBpbnQgbWluaW11bVRodW1iTGVuZ3RoKFNjcm9sbGJhciopOwogCi0g ICAgdmlydHVhbCB2b2lkIHBhaW50VHJhY2soR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwg Y29uc3QgSW50UmVjdCYsIFNjcm9sbGJhckNvbnRyb2xQYXJ0TWFzaykgPSAwOwotICAgIHZpcnR1 YWwgdm9pZCBwYWludEJ1dHRvbihHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25zdCBJ bnRSZWN0JiwgU2Nyb2xsYmFyUGFydCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBwYWludFRodW1i KEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKSA9IDA7CisgICAg dmlydHVhbCB2b2lkIHBhaW50VHJhY2soR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29u c3QgSW50UmVjdCYsIFNjcm9sbGJhckNvbnRyb2xQYXJ0TWFzaykge30KKyAgICB2aXJ0dWFsIHZv aWQgcGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVj dCYsIFNjcm9sbGJhclBhcnQpIHt9CisgICAgdmlydHVhbCB2b2lkIHBhaW50VGh1bWIoR3JhcGhp Y3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpIHt9CiB9OwogCiB9CkluZGV4 OiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9y bS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMuaAkocmV2aXNpb24gMzY3NjYpCisrKyBwbGF0Zm9ybS9t YWMvU2Nyb2xsYmFyVGhlbWVNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsOCBAQCBw dWJsaWM6CiAgICAgU2Nyb2xsYmFyVGhlbWVNYWMoKTsKICAgICB2aXJ0dWFsIH5TY3JvbGxiYXJU aGVtZU1hYygpOwogCisgICAgdmlydHVhbCBib29sIHBhaW50KFNjcm9sbGJhciosIEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCk7CisKICAgICB2aXJ0 dWFsIGludCBzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNpemUgPSBSZWd1bGFy U2Nyb2xsYmFyKTsKICAgICAKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNDb250cm9sVGludHMo KSBjb25zdCB7IHJldHVybiB0cnVlOyB9CkBAIC01NiwxMCArNTgsNiBAQCBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCBpbnQgbWluaW11bVRodW1iTGVuZ3RoKFNjcm9sbGJhciopOwogICAgIAogICAg IHZpcnR1YWwgYm9vbCBzaG91bGRDZW50ZXJPblRodW1iKFNjcm9sbGJhciosIGNvbnN0IFBsYXRm b3JtTW91c2VFdmVudCYpOwotCi0gICAgdmlydHVhbCB2b2lkIHBhaW50VHJhY2soR3JhcGhpY3ND b250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYsIFNjcm9sbGJhckNvbnRyb2xQYXJ0 TWFzayk7Ci0gICAgdmlydHVhbCB2b2lkIHBhaW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCosIFNj cm9sbGJhciosIGNvbnN0IEludFJlY3QmLCBTY3JvbGxiYXJQYXJ0KTsKLSAgICB2aXJ0dWFsIHZv aWQgcGFpbnRUaHVtYihHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0 Jik7CiB9OwogCiB9CkluZGV4OiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyVGhlbWVNYWMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gcGxhdGZvcm0vbWFjL1Njcm9sbGJhclRoZW1lTWFjLm1tCShyZXZpc2lvbiAz Njc2NikKKysrIHBsYXRmb3JtL21hYy9TY3JvbGxiYXJUaGVtZU1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMzQsNiArMzQsOCBAQAogI2luY2x1ZGUgIlNjcm9sbGJhckNsaWVudC5oIgogI2luY2x1 ZGUgIlNldHRpbmdzLmgiCiAKKyNpbmNsdWRlIDxDYXJib24vQ2FyYm9uLmg+CisKIC8vIEZJWE1F OiBUaGVyZSBhcmUgcmVwYWludGluZyBwcm9ibGVtcyBkdWUgdG8gQXF1YSBzY3JvbGwgYmFyIGJ1 dHRvbnMnIHZpc3VhbCBvdmVyZmxvdy4KIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKQEAgLTU2LDYg KzU4LDcgQEAgc3RhdGljIGludCBjQnV0dG9uTGVuZ3RoW10gPSB7IDE0LCAxMCB9Owogc3RhdGlj IGludCBjVGh1bWJNaW5MZW5ndGhbXSA9IHsgMjYsIDIwIH07CiAKIHN0YXRpYyBpbnQgY091dGVy QnV0dG9uTGVuZ3RoW10gPSB7IDE2LCAxNCB9OyAvLyBUaGUgb3V0ZXIgYnV0dG9uIGluIGEgZG91 YmxlIGJ1dHRvbiBwYWlyIGlzIGEgYml0IGJpZ2dlci4KK3N0YXRpYyBpbnQgY091dGVyQnV0dG9u T3ZlcmxhcCA9IDI7CiAKIHN0YXRpYyBmbG9hdCBnSW5pdGlhbEJ1dHRvbkRlbGF5ID0gMC41ZjsK IHN0YXRpYyBmbG9hdCBnQXV0b3Njcm9sbEJ1dHRvbkRlbGF5ID0gMC4wNWY7CkBAIC0xNTYsOSAr MTU5LDkgQEAgSW50UmVjdCBTY3JvbGxiYXJUaGVtZU1hYzo6YmFja0J1dHRvblJlYwogICAgIGJv b2wgb3V0ZXJCdXR0b24gPSBwYXJ0ID09IEJhY2tCdXR0b25TdGFydFBhcnQgJiYgKGJ1dHRvbnNQ bGFjZW1lbnQoKSA9PSBTY3JvbGxiYXJCdXR0b25zRG91YmxlU3RhcnQgfHwgYnV0dG9uc1BsYWNl bWVudCgpID09IFNjcm9sbGJhckJ1dHRvbnNEb3VibGVCb3RoKTsKICAgICBpZiAob3V0ZXJCdXR0 b24pIHsKICAgICAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFs U2Nyb2xsYmFyKQotICAgICAgICAgICAgcmVzdWx0ID0gSW50UmVjdChzY3JvbGxiYXItPngoKSwg c2Nyb2xsYmFyLT55KCksIGNPdXRlckJ1dHRvbkxlbmd0aFtzY3JvbGxiYXItPmNvbnRyb2xTaXpl KCldLCB0aGlja25lc3MpOworICAgICAgICAgICAgcmVzdWx0ID0gSW50UmVjdChzY3JvbGxiYXIt PngoKSwgc2Nyb2xsYmFyLT55KCksIGNPdXRlckJ1dHRvbkxlbmd0aFtzY3JvbGxiYXItPmNvbnRy b2xTaXplKCldICsgcGFpbnRpbmcgPyBjT3V0ZXJCdXR0b25PdmVybGFwIDogMCwgdGhpY2tuZXNz KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVzdWx0ID0gSW50UmVjdChzY3JvbGxiYXIt PngoKSwgc2Nyb2xsYmFyLT55KCksIHRoaWNrbmVzcywgY091dGVyQnV0dG9uTGVuZ3RoW3Njcm9s bGJhci0+Y29udHJvbFNpemUoKV0pOworICAgICAgICAgICAgcmVzdWx0ID0gSW50UmVjdChzY3Jv bGxiYXItPngoKSwgc2Nyb2xsYmFyLT55KCksIHRoaWNrbmVzcywgY091dGVyQnV0dG9uTGVuZ3Ro W3Njcm9sbGJhci0+Y29udHJvbFNpemUoKV0gKyBwYWludGluZyA/IGNPdXRlckJ1dHRvbk92ZXJs YXAgOiAwKTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCkBAIC0xOTIsMTAg KzE5NSwxNSBAQCBJbnRSZWN0IFNjcm9sbGJhclRoZW1lTWFjOjpmb3J3YXJkQnV0dG9uCiAgICAg CiAgICAgYm9vbCBvdXRlckJ1dHRvbiA9IHBhcnQgPT0gRm9yd2FyZEJ1dHRvbkVuZFBhcnQgJiYg KGJ1dHRvbnNQbGFjZW1lbnQoKSA9PSBTY3JvbGxiYXJCdXR0b25zRG91YmxlRW5kIHx8IGJ1dHRv bnNQbGFjZW1lbnQoKSA9PSBTY3JvbGxiYXJCdXR0b25zRG91YmxlQm90aCk7CiAgICAgaWYgKG91 dGVyQnV0dG9uKSB7Ci0gICAgICAgIGlmIChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gSG9y aXpvbnRhbFNjcm9sbGJhcikKKyAgICAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9 PSBIb3Jpem9udGFsU2Nyb2xsYmFyKSB7CiAgICAgICAgICAgICByZXN1bHQgPSBJbnRSZWN0KHNj cm9sbGJhci0+eCgpICsgc2Nyb2xsYmFyLT53aWR0aCgpIC0gb3V0ZXJCdXR0b25MZW5ndGgsIHNj cm9sbGJhci0+eSgpLCBvdXRlckJ1dHRvbkxlbmd0aCwgdGhpY2tuZXNzKTsKLSAgICAgICAgZWxz ZQorICAgICAgICAgICAgaWYgKHBhaW50aW5nKQorICAgICAgICAgICAgICAgIHJlc3VsdC5pbmZs YXRlWChjT3V0ZXJCdXR0b25PdmVybGFwKTsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IHJlc3VsdCA9IEludFJlY3Qoc2Nyb2xsYmFyLT54KCksIHNjcm9sbGJhci0+eSgpICsgc2Nyb2xs YmFyLT5oZWlnaHQoKSAtIG91dGVyQnV0dG9uTGVuZ3RoLCB0aGlja25lc3MsIG91dGVyQnV0dG9u TGVuZ3RoKTsKKyAgICAgICAgICAgIGlmIChwYWludGluZykKKyAgICAgICAgICAgICAgICByZXN1 bHQuaW5mbGF0ZVkoY091dGVyQnV0dG9uT3ZlcmxhcCk7CisgICAgICAgIH0KICAgICAgICAgcmV0 dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCkBAIC0yNzcsMjkgKzI4NSw1MyBAQCBib29sIFNjcm9s bGJhclRoZW1lTWFjOjpzaG91bGRDZW50ZXJPblRoCiAgICAgcmV0dXJuIGV2dC5hbHRLZXkoKTsK IH0KIAotdm9pZCBTY3JvbGxiYXJUaGVtZU1hYzo6cGFpbnRUcmFjayhHcmFwaGljc0NvbnRleHQq IGdyYXBoaWNzQ29udGV4dCwgU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIGNvbnN0IEludFJlY3QmIHRy YWNrUmVjdCwgU2Nyb2xsYmFyQ29udHJvbFBhcnRNYXNrKQotewogI2lmICFVU0UoTlNTQ1JPTExF UikKLSAgICBncmFwaGljc0NvbnRleHQtPmZpbGxSZWN0KHRyYWNrUmVjdCwgQ29sb3IoMjU1LCAy NTUsIDI1NSkpOwotI2VuZGlmCi19Ci0KLXZvaWQgU2Nyb2xsYmFyVGhlbWVNYWM6OnBhaW50QnV0 dG9uKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBTY3JvbGxiYXIqIHNjcm9sbGJh ciwgY29uc3QgSW50UmVjdCYgYnV0dG9uUmVjdCwgU2Nyb2xsYmFyUGFydCBwYXJ0KQorc3RhdGlj IGludCBzY3JvbGxiYXJQYXJ0VG9ISVByZXNzZWRTdGF0ZShTY3JvbGxiYXJQYXJ0IHBhcnQpCiB7 Ci0jaWYgIVVTRShOU1NDUk9MTEVSKQotICAgIGJvb2wgb3V0ZXJCdXR0b24gPSAocGFydCA9PSBG b3J3YXJkQnV0dG9uRW5kUGFydCAmJiAoYnV0dG9uc1BsYWNlbWVudCgpID09IFNjcm9sbGJhckJ1 dHRvbnNEb3VibGVFbmQgfHwgYnV0dG9uc1BsYWNlbWVudCgpID09IFNjcm9sbGJhckJ1dHRvbnNE b3VibGVCb3RoKSkgfHwKLSAgICAgICAgICAgICAgICAgICAgICAgKHBhcnQgPT0gQmFja0J1dHRv blN0YXJ0UGFydCAmJiAoYnV0dG9uc1BsYWNlbWVudCgpID09IFNjcm9sbGJhckJ1dHRvbnNEb3Vi bGVTdGFydCB8fCBidXR0b25zUGxhY2VtZW50KCkgPT0gU2Nyb2xsYmFyQnV0dG9uc0RvdWJsZUJv dGgpKTsKLSAgICBpZiAob3V0ZXJCdXR0b24pCi0gICAgICAgIGdyYXBoaWNzQ29udGV4dC0+Zmls bFJlY3QoYnV0dG9uUmVjdCwgQ29sb3IoMTI4LCAxMjgsIDEyOCkpOwotICAgIGVsc2UKLSAgICAg ICAgZ3JhcGhpY3NDb250ZXh0LT5maWxsUmVjdChidXR0b25SZWN0LCBDb2xvcig2NCwgNjQsIDY0 KSk7Ci0jZW5kaWYKKyAgICBzd2l0Y2ggKHBhcnQpIHsKKyAgICAgICAgY2FzZSBCYWNrQnV0dG9u U3RhcnRQYXJ0OgorICAgICAgICAgICAgcmV0dXJuIGtUaGVtZVRvcE91dHNpZGVBcnJvd1ByZXNz ZWQ7CisgICAgICAgIGNhc2UgQmFja0J1dHRvbkVuZFBhcnQ6CisgICAgICAgICAgICByZXR1cm4g a1RoZW1lVG9wT3V0c2lkZUFycm93UHJlc3NlZDsgLy8gVGhpcyBkb2VzIG5vdCBtYWtlIG11Y2gg c2Vuc2UuICBGb3Igc29tZSByZWFzb24gdGhlIG91dHNpZGUgY29uc3RhbnQgaXMgcmVxdWlyZWQu CisgICAgICAgIGNhc2UgRm9yd2FyZEJ1dHRvblN0YXJ0UGFydDoKKyAgICAgICAgICAgIHJldHVy biBrVGhlbWVUb3BJbnNpZGVBcnJvd1ByZXNzZWQ7CisgICAgICAgIGNhc2UgRm9yd2FyZEJ1dHRv bkVuZFBhcnQ6CisgICAgICAgICAgICByZXR1cm4ga1RoZW1lQm90dG9tT3V0c2lkZUFycm93UHJl c3NlZDsKKyAgICAgICAgY2FzZSBUaHVtYlBhcnQ6CisgICAgICAgICAgICByZXR1cm4ga1RoZW1l VGh1bWJQcmVzc2VkOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIDA7Cisg ICAgfQogfQorI2VuZGlmCiAKLXZvaWQgU2Nyb2xsYmFyVGhlbWVNYWM6OnBhaW50VGh1bWIoR3Jh cGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIFNjcm9sbGJhciogc2Nyb2xsYmFyLCBjb25z dCBJbnRSZWN0JiB0aHVtYlJlY3QpCitib29sIFNjcm9sbGJhclRoZW1lTWFjOjpwYWludChTY3Jv bGxiYXIqIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBkYW1hZ2VSZWN0KQogewogI2lmICFVU0UoTlNTQ1JPTExFUikKLSAgICBncmFwaGljc0NvbnRl eHQtPmZpbGxSZWN0KHRodW1iUmVjdCwgQ29sb3IoMTkyLCAxOTIsIDE5MikpOworICAgIEhJVGhl bWVUcmFja0RyYXdJbmZvIHRyYWNrSW5mbzsKKyAgICB0cmFja0luZm8udmVyc2lvbiA9IDA7Cisg ICAgdHJhY2tJbmZvLmtpbmQgPSBzY3JvbGxiYXItPmNvbnRyb2xTaXplKCkgPT0gUmVndWxhclNj cm9sbGJhciA/IGtUaGVtZU1lZGl1bVNjcm9sbEJhciA6IGtUaGVtZVNtYWxsU2Nyb2xsQmFyOwor ICAgIHRyYWNrSW5mby5ib3VuZHMgPSBzY3JvbGxiYXItPmZyYW1lR2VvbWV0cnkoKTsKKyAgICB0 cmFja0luZm8ubWluID0gMDsKKyAgICB0cmFja0luZm8ubWF4ID0gc2Nyb2xsYmFyLT5tYXhpbXVt KCk7CisgICAgdHJhY2tJbmZvLnZhbHVlID0gc2Nyb2xsYmFyLT5jdXJyZW50UG9zKCk7CisgICAg dHJhY2tJbmZvLnRyYWNrSW5mby5zY3JvbGxiYXIudmlld3NpemUgPSBzY3JvbGxiYXItPnBhZ2VT dGVwKCk7CisgICAgdHJhY2tJbmZvLmF0dHJpYnV0ZXMgPSAwOworICAgIGlmIChzY3JvbGxiYXIt Pm9yaWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKKyAgICAgICAgdHJhY2tJbmZv LmF0dHJpYnV0ZXMgfD0ga1RoZW1lVHJhY2tIb3Jpem9udGFsOworICAgIHRyYWNrSW5mby5lbmFi bGVTdGF0ZSA9IHNjcm9sbGJhci0+Y2xpZW50KCktPmlzQWN0aXZlKCkgPyBrVGhlbWVUcmFja0Fj dGl2ZSA6IGtUaGVtZVRyYWNrSW5hY3RpdmU7CisgICAgaWYgKCFzY3JvbGxiYXItPmVuYWJsZWQo KSkKKyAgICAgICAgdHJhY2tJbmZvLmVuYWJsZVN0YXRlID0ga1RoZW1lVHJhY2tEaXNhYmxlZDsK KyAgICBpZiAoaGFzVGh1bWIoc2Nyb2xsYmFyKSkKKyAgICAgICAgdHJhY2tJbmZvLmF0dHJpYnV0 ZXMgfD0ga1RoZW1lVHJhY2tTaG93VGh1bWI7CisgICAgZWxzZSBpZiAoIWhhc0J1dHRvbnMoc2Ny b2xsYmFyKSkKKyAgICAgICAgdHJhY2tJbmZvLmVuYWJsZVN0YXRlID0ga1RoZW1lVHJhY2tOb3Ro aW5nVG9TY3JvbGw7CisgICAgdHJhY2tJbmZvLnRyYWNrSW5mby5zY3JvbGxiYXIucHJlc3NTdGF0 ZSA9IHNjcm9sbGJhclBhcnRUb0hJUHJlc3NlZFN0YXRlKHNjcm9sbGJhci0+cHJlc3NlZFBhcnQo KSk7CisgICAgCisgICAgSElUaGVtZURyYXdUcmFjaygmdHJhY2tJbmZvLCAwLCBjb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKSwga0hJVGhlbWVPcmllbnRhdGlvbk5vcm1hbCk7CisgICAgcmV0dXJu IHRydWU7CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogfQogCkluZGV4OiBwbGF0 Zm9ybS9tYWMvV2lkZ2V0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL21hYy9XaWRnZXRN YWMubW0JKHJldmlzaW9uIDM2NzY2KQorKysgcGxhdGZvcm0vbWFjL1dpZGdldE1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtMjMxLDYgKzIzMSwxMiBAQCB2b2lkIFdpZGdldDo6cGFpbnQoR3JhcGhp Y3NDb250ZXh0KiBwLCBjCiAKIHZvaWQgV2lkZ2V0OjppbnZhbGlkYXRlUmVjdChjb25zdCBJbnRS ZWN0JiByKQogeworICAgIGlmICghcGxhdGZvcm1XaWRnZXQoKSAmJiBwYXJlbnQoKSkgeworICAg ICAgICBJbnRQb2ludCBuZXdQb2ludCA9IHBhcmVudCgpLT5jb252ZXJ0Q2hpbGRUb1NlbGYodGhp cywgci5sb2NhdGlvbigpKTsKKyAgICAgICAgcGFyZW50KCktPmludmFsaWRhdGVSZWN0KEludFJl Y3QobmV3UG9pbnQsIHIuc2l6ZSgpKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBC RUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgW3BsYXRmb3JtV2lkZ2V0KCkgc2V0TmVl ZHNEaXNwbGF5SW5SZWN0OiByXTsKICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwo=