22432 2008-11-22 19:36:26 -0800 Add tickmark plumbing support for scrollbars 2008-11-24 15:12:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 finnur.webkit finnur.webkit darin hyatt sam sullivan oldest_to_newest 99805 0 finnur.webkit 2008-11-22 19:36:26 -0800 Dave Hyatt and Darin Fischer (Google) have been in communication about adding tickmark support for WebKit's scrollbar. I have been implementing this on the Chromium side and this bug is meant to track the WebKit side of that effort. During my implementation I found that very little needs to change in WebKit to support this; effectively only three lines or so. I will be uploading a simple patch shortly. 99806 1 25385 finnur.webkit 2008-11-22 19:53:18 -0800 Created attachment 25385 Provide plumbing for scrollbar tickmark support 99863 2 25385 darin 2008-11-23 19:56:09 -0800 Comment on attachment 25385 Provide plumbing for scrollbar tickmark support > The painting code for the scrollbar > + just needed to call paintTickmarks at the right time and a default no-op implementation is > + provided, which the ports will need to override. Makes sense, and it seems fine to add this hook. I don't understand why tick marks are specific to vertical scrollbars, though. > This also provides a paintTickmark (singular) > + function definition, which paintTickmarks should call and the port also needs to override. I don't understand how this is helpful. If only the paintTickmarks function is going to call paintTickmark, then there's no reason for the paintTickmark function to be virtual or to be declared in the base class. Separate question: Is this going to be part of the Windows scrollbar theme, or is there going to be a separate one for Chrome? I'm not going to review this + or - because of my questions above. 99865 3 fishd 2008-11-23 20:11:36 -0800 > Separate question: Is this going to be part of the Windows scrollbar theme, or > is there going to be a separate one for Chrome? What we have right now is ScrollbarThemeChromium.cpp defined within PLATFORM(CHROMIUM). We are not building with PLATFORM(WIN), PLATFORM(MAC), or PLATFORM(GTK). You can see this here: http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/chromium/ScrollbarThemeChromium.cpp?view=markup http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp?view=markup http://src.chromium.org/viewvc/chrome/trunk/src/webkit/port/platform/chromium/ScrollbarThemeChromiumLinux.cpp?view=markup Once we land PLATFORM(CHROMIUM), our plan is to work to unify the scrollbar theme code across the various ports. This would likely involve inventing a WIN_THEME define, and so on. It is difficult to share the code until we have everything living in svn.webkit.org. 99871 4 25409 finnur.webkit 2008-11-23 21:19:30 -0800 Created attachment 25409 Second attempt Darin Adler, Thank you for taking a stab at this on a weekend day. You are right, the paintTickmarks call doesn't need to be specific to the vertical scrollbars. We (Chromium) don't want the tickmarks for horizontal scrollbars, but that doesn't mean others wont. I have removed that check. I also removed paintTickmark (singular). I thought it might make sense to provide guidance for the implementors of the tickmarks (for a given port), but you are right: we don't need that in the base class. 99969 5 25430 finnur.webkit 2008-11-24 07:49:52 -0800 Created attachment 25430 Slightly more recent... Slightly more recent (updated changelog, etc) 100040 6 25430 darin 2008-11-24 13:30:06 -0800 Comment on attachment 25430 Slightly more recent... This doesn't have the changes you described. It looks like an even older version of the patch than the original one you posted for review, without your name or email address. 100053 7 25449 finnur.webkit 2008-11-24 13:51:02 -0800 Created attachment 25449 Right version this time Ooops, my bad. Too early in the morning for me to be working. Sorry about that. :) Here is the right file... 100067 8 25449 darin 2008-11-24 14:31:30 -0800 Comment on attachment 25449 Right version this time r=me 100078 9 fishd 2008-11-24 15:12:12 -0800 http://trac.webkit.org/changeset/38730 25385 2008-11-22 19:53:18 -0800 2008-11-23 21:19:30 -0800 Provide plumbing for scrollbar tickmark support patch.txt text/plain 2715 finnur.webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODY5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDgtMTEtMjIgIEZpbm51ciBUaG9yYXJpbnNzb24gIDxmaW5udXIu d2Via2l0QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXhlczogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDMyCisKKyAgICAgICAgQWRkIHBsdW1iaW5nIGZvciB0aWNrbWFyayBzdXBwb3J0IGZvciB0 aGUgc2Nyb2xsYmFycy4gVGhlIHBhaW50aW5nIGNvZGUgZm9yIHRoZSBzY3JvbGxiYXIKKyAgICAg ICAganVzdCBuZWVkZWQgdG8gY2FsbCBwYWludFRpY2ttYXJrcyBhdCB0aGUgcmlnaHQgdGltZSBh bmQgYSBkZWZhdWx0IG5vLW9wIGltcGxlbWVudGF0aW9uIGlzCisgICAgICAgIHByb3ZpZGVkLCB3 aGljaCB0aGUgcG9ydHMgd2lsbCBuZWVkIHRvIG92ZXJyaWRlLiBUaGlzIGFsc28gcHJvdmlkZXMg YSBwYWludFRpY2ttYXJrIChzaW5ndWxhcikKKyAgICAgICAgZnVuY3Rpb24gZGVmaW5pdGlvbiwg d2hpY2ggcGFpbnRUaWNrbWFya3Mgc2hvdWxkIGNhbGwgYW5kIHRoZSBwb3J0IGFsc28gbmVlZHMg dG8gb3ZlcnJpZGUuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBD SEFOR0VECisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmg6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRUaWNrbWFya3MpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50VGlja21hcmspOgorCiAyMDA4 LTExLTIyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2Jp bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdlciBGcmV5dGhlci4KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCShyZXZpc2lvbiAz ODU5MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNDUsNiArMTQ1LDkgQEAgYm9vbCBTY3JvbGxiYXJUaGVtZUNvbXBv c2l0ZTo6cGFpbnQoU2NybwogICAgICAgICAgICAgcGFpbnRUcmFja1BpZWNlKGdyYXBoaWNzQ29u dGV4dCwgc2Nyb2xsYmFyLCBzdGFydFRyYWNrUmVjdCwgQmFja1RyYWNrUGFydCk7CiAgICAgICAg IGlmIChzY3JvbGxNYXNrICYgRm9yd2FyZFRyYWNrUGFydCkKICAgICAgICAgICAgIHBhaW50VHJh Y2tQaWVjZShncmFwaGljc0NvbnRleHQsIHNjcm9sbGJhciwgZW5kVHJhY2tSZWN0LCBGb3J3YXJk VHJhY2tQYXJ0KTsKKworICAgICAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IFZl cnRpY2FsU2Nyb2xsYmFyKQorICAgICAgICAgICAgcGFpbnRUaWNrbWFya3MoZ3JhcGhpY3NDb250 ZXh0LCBzY3JvbGxiYXIsIHRyYWNrUGFpbnRSZWN0KTsKICAgICB9CiAKICAgICAvLyBQYWludCB0 aGUgdGh1bWIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0 ZS5oCShyZXZpc2lvbiAzODU5MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVD b21wb3NpdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsOSBAQCBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCB2b2lkIHBhaW50VHJhY2tQaWVjZShHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxi YXIqLCBjb25zdCBJbnRSZWN0JiwgU2Nyb2xsYmFyUGFydCkge30KICAgICB2aXJ0dWFsIHZvaWQg cGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYs IFNjcm9sbGJhclBhcnQpIHt9CiAgICAgdmlydHVhbCB2b2lkIHBhaW50VGh1bWIoR3JhcGhpY3ND b250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpIHt9Ci0gICAgCisgICAgdmlydHVh bCB2b2lkIHBhaW50VGlja21hcmtzKEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0 IEludFJlY3QmKSB7fQorICAgIHZpcnR1YWwgdm9pZCBwYWludFRpY2ttYXJrKEdyYXBoaWNzQ29u dGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50Jikge30KKwogICAgIHZpcnR1YWwgSW50 UmVjdCBjb25zdHJhaW5UcmFja1JlY3RUb1RyYWNrUGllY2VzKFNjcm9sbGJhciosIGNvbnN0IElu dFJlY3QmIHJlY3QpIHsgcmV0dXJuIHJlY3Q7IH0KIH07CiAK 25409 2008-11-23 21:19:30 -0800 2008-11-24 07:49:52 -0800 Second attempt patch.txt text/plain 2476 finnur.webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDM4NjkzKQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDIyIEBADQorMjAwOC0xMS0yMiAgRmlubnVyIFRob3Jhcmluc3NvbiAgPGZp bm51ci53ZWJraXRAZ21haWwuY29tPg0KKw0KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuDQorDQorICAgICAgICBGaXhlczogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNDMyDQorDQorICAgICAgICBBZGQgcGx1bWJpbmcgZm9yIHRpY2ttYXJrIHN1 cHBvcnQgZm9yIHRoZSBzY3JvbGxiYXJzLiBUaGUgcGFpbnRpbmcgY29kZSBmb3IgdGhlIHNjcm9s bGJhcg0KKyAgICAgICAganVzdCBuZWVkZWQgdG8gY2FsbCBwYWludFRpY2ttYXJrcyBhdCB0aGUg cmlnaHQgdGltZSBhbmQgYSBkZWZhdWx0IG5vLW9wIGltcGxlbWVudGF0aW9uIGlzDQorICAgICAg ICBwcm92aWRlZCwgd2hpY2ggdGhlIHBvcnRzIHdpbGwgbmVlZCB0byBvdmVycmlkZS4NCisNCisg ICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRA0KKw0KKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5jcHA6DQorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBhaW50KToNCisgICAgICAgICogcGxhdGZv cm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuaDoNCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxi YXJUaGVtZUNvbXBvc2l0ZTo6cGFpbnRUaWNrbWFya3MpOg0KKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGJhclRoZW1lQ29tcG9zaXRlOjpwYWludFRpY2ttYXJrKToNCisNCiAyMDA4LTExLTIyICBO aWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2JpbGUuY29tPg0K IA0KICAgICAgICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVyLg0KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5jcHAJKHJldmlzaW9uIDM4NTkz KQ0KKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwCSh3b3Jr aW5nIGNvcHkpDQpAQCAtMTQ1LDYgKzE0NSw5IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21wb3Np dGU6OnBhaW50KFNjcm8NCiAgICAgICAgICAgICBwYWludFRyYWNrUGllY2UoZ3JhcGhpY3NDb250 ZXh0LCBzY3JvbGxiYXIsIHN0YXJ0VHJhY2tSZWN0LCBCYWNrVHJhY2tQYXJ0KTsNCiAgICAgICAg IGlmIChzY3JvbGxNYXNrICYgRm9yd2FyZFRyYWNrUGFydCkNCiAgICAgICAgICAgICBwYWludFRy YWNrUGllY2UoZ3JhcGhpY3NDb250ZXh0LCBzY3JvbGxiYXIsIGVuZFRyYWNrUmVjdCwgRm9yd2Fy ZFRyYWNrUGFydCk7DQorDQorICAgICAgICBwYWludFRpY2ttYXJrcyhncmFwaGljc0NvbnRleHQs IHNjcm9sbGJhciwgdHJhY2tQYWludFJlY3QpOw0KICAgICB9DQogDQogICAgIC8vIFBhaW50IHRo ZSB0aHVtYi4NCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRl LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9z aXRlLmgJKHJldmlzaW9uIDM4NTkzKQ0KKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhl bWVDb21wb3NpdGUuaAkod29ya2luZyBjb3B5KQ0KQEAgLTYyLDcgKzYyLDkgQEAgcHJvdGVjdGVk Og0KICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRUcmFja1BpZWNlKEdyYXBoaWNzQ29udGV4dCosIFNj cm9sbGJhciosIGNvbnN0IEludFJlY3QmLCBTY3JvbGxiYXJQYXJ0KSB7fQ0KICAgICB2aXJ0dWFs IHZvaWQgcGFpbnRCdXR0b24oR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50 UmVjdCYsIFNjcm9sbGJhclBhcnQpIHt9DQogICAgIHZpcnR1YWwgdm9pZCBwYWludFRodW1iKEdy YXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKSB7fQ0KLSAgICANCisg ICAgdmlydHVhbCB2b2lkIHBhaW50VGlja21hcmtzKEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJh ciosIGNvbnN0IEludFJlY3QmKSB7fQ0KKw0KICAgICB2aXJ0dWFsIEludFJlY3QgY29uc3RyYWlu VHJhY2tSZWN0VG9UcmFja1BpZWNlcyhTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0JiByZWN0KSB7 IHJldHVybiByZWN0OyB9DQogfTsNCiANCg== 25430 2008-11-24 07:49:52 -0800 2008-11-24 13:51:02 -0800 Slightly more recent... patch.txt text/plain 2545 finnur.webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODcwOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDgtMTEtMjQgIGZpbm51ciAgPHNldCBFTUFJTF9BRERSRVNTIGVu dmlyb25tZW50IHZhcmlhYmxlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeGVzOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI0MzIKKworICAgICAgICBBZGQgcGx1bWJpbmcgZm9yIHRpY2ttYXJrIHN1cHBvcnQgZm9y IHRoZSBzY3JvbGxiYXJzLiBUaGUgcGFpbnRpbmcgY29kZSBmb3IgdGhlIHNjcm9sbGJhcgorICAg ICAgICBqdXN0IG5lZWRlZCB0byBjYWxsIHBhaW50VGlja21hcmtzIGF0IHRoZSByaWdodCB0aW1l IGFuZCBhIGRlZmF1bHQgbm8tb3AgaW1wbGVtZW50YXRpb24gaXMKKyAgICAgICAgcHJvdmlkZWQs IHdoaWNoIHRoZSBwb3J0cyB3aWxsIG5lZWQgdG8gb3ZlcnJpZGUuCisKKyAgICAgICAgV0FSTklO RzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJU aGVtZUNvbXBvc2l0ZTo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhclRoZW1l Q29tcG9zaXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZTo6 cGFpbnRUaWNrbWFya3MpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDb21wb3Np dGU6OnBhaW50VGlja21hcmspOgorCiAyMDA4LTExLTI0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8 YXBAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJvd2UuCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkocmV2aXNpb24g Mzg1OTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTQ1LDYgKzE0NSw5IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21w b3NpdGU6OnBhaW50KFNjcm8KICAgICAgICAgICAgIHBhaW50VHJhY2tQaWVjZShncmFwaGljc0Nv bnRleHQsIHNjcm9sbGJhciwgc3RhcnRUcmFja1JlY3QsIEJhY2tUcmFja1BhcnQpOwogICAgICAg ICBpZiAoc2Nyb2xsTWFzayAmIEZvcndhcmRUcmFja1BhcnQpCiAgICAgICAgICAgICBwYWludFRy YWNrUGllY2UoZ3JhcGhpY3NDb250ZXh0LCBzY3JvbGxiYXIsIGVuZFRyYWNrUmVjdCwgRm9yd2Fy ZFRyYWNrUGFydCk7CisKKyAgICAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBW ZXJ0aWNhbFNjcm9sbGJhcikKKyAgICAgICAgICAgIHBhaW50VGlja21hcmtzKGdyYXBoaWNzQ29u dGV4dCwgc2Nyb2xsYmFyLCB0cmFja1BhaW50UmVjdCk7CiAgICAgfQogCiAgICAgLy8gUGFpbnQg dGhlIHRodW1iLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3Np dGUuaAkocmV2aXNpb24gMzg1OTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1l Q29tcG9zaXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDkgQEAgcHJvdGVjdGVkOgog ICAgIHZpcnR1YWwgdm9pZCBwYWludFRyYWNrUGllY2UoR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xs YmFyKiwgY29uc3QgSW50UmVjdCYsIFNjcm9sbGJhclBhcnQpIHt9CiAgICAgdmlydHVhbCB2b2lk IHBhaW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3Qm LCBTY3JvbGxiYXJQYXJ0KSB7fQogICAgIHZpcnR1YWwgdm9pZCBwYWludFRodW1iKEdyYXBoaWNz Q29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKSB7fQotICAgIAorICAgIHZpcnR1 YWwgdm9pZCBwYWludFRpY2ttYXJrcyhHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25z dCBJbnRSZWN0Jikge30KKyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRUaWNrbWFyayhHcmFwaGljc0Nv bnRleHQqLCBTY3JvbGxiYXIqLCBjb25zdCBJbnRQb2ludCYpIHt9CisKICAgICB2aXJ0dWFsIElu dFJlY3QgY29uc3RyYWluVHJhY2tSZWN0VG9UcmFja1BpZWNlcyhTY3JvbGxiYXIqLCBjb25zdCBJ bnRSZWN0JiByZWN0KSB7IHJldHVybiByZWN0OyB9CiB9OwogCg== 25449 2008-11-24 13:51:02 -0800 2008-11-24 14:31:30 -0800 Right version this time patch.txt text/plain 2339 finnur.webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODcyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMTEtMjQgIEZpbm51ciBUaG9yYXJpbnNzb24gIDxmaW5udXIu d2Via2l0QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXhlczogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDMyCisKKyAgICAgICAgQWRkIHBsdW1iaW5nIGZvciB0aWNrbWFyayBzdXBwb3J0IGZvciB0 aGUgc2Nyb2xsYmFycy4gVGhlIHBhaW50aW5nIGNvZGUgZm9yIHRoZSBzY3JvbGxiYXIKKyAgICAg ICAganVzdCBuZWVkZWQgdG8gY2FsbCBwYWludFRpY2ttYXJrcyBhdCB0aGUgcmlnaHQgdGltZSBh bmQgYSBkZWZhdWx0IG5vLW9wIGltcGxlbWVudGF0aW9uIGlzCisgICAgICAgIHByb3ZpZGVkLCB3 aGljaCB0aGUgcG9ydHMgd2lsbCBuZWVkIHRvIG92ZXJyaWRlLgorCisgICAgICAgIFdBUk5JTkc6 IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsYmFyVGhlbWVDb21wb3NpdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhl bWVDb21wb3NpdGU6OnBhaW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNv bXBvc2l0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnBh aW50VGlja21hcmtzKToKKwogMjAwOC0xMS0yNCAgR2xlbm4gV2lsc29uICA8Z3dpbHNvbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkocmV2aXNpb24gMzg1 OTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTQ1LDYgKzE0NSw4IEBAIGJvb2wgU2Nyb2xsYmFyVGhlbWVDb21wb3Np dGU6OnBhaW50KFNjcm8KICAgICAgICAgICAgIHBhaW50VHJhY2tQaWVjZShncmFwaGljc0NvbnRl eHQsIHNjcm9sbGJhciwgc3RhcnRUcmFja1JlY3QsIEJhY2tUcmFja1BhcnQpOwogICAgICAgICBp ZiAoc2Nyb2xsTWFzayAmIEZvcndhcmRUcmFja1BhcnQpCiAgICAgICAgICAgICBwYWludFRyYWNr UGllY2UoZ3JhcGhpY3NDb250ZXh0LCBzY3JvbGxiYXIsIGVuZFRyYWNrUmVjdCwgRm9yd2FyZFRy YWNrUGFydCk7CisKKyAgICAgICAgcGFpbnRUaWNrbWFya3MoZ3JhcGhpY3NDb250ZXh0LCBzY3Jv bGxiYXIsIHRyYWNrUGFpbnRSZWN0KTsKICAgICB9CiAKICAgICAvLyBQYWludCB0aGUgdGh1bWIu CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhclRoZW1lQ29tcG9zaXRlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXJUaGVtZUNvbXBvc2l0ZS5oCShyZXZp c2lvbiAzODU5MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGUu aAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVh bCB2b2lkIHBhaW50VHJhY2tQaWVjZShHcmFwaGljc0NvbnRleHQqLCBTY3JvbGxiYXIqLCBjb25z dCBJbnRSZWN0JiwgU2Nyb2xsYmFyUGFydCkge30KICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRCdXR0 b24oR3JhcGhpY3NDb250ZXh0KiwgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYsIFNjcm9sbGJh clBhcnQpIHt9CiAgICAgdmlydHVhbCB2b2lkIHBhaW50VGh1bWIoR3JhcGhpY3NDb250ZXh0Kiwg U2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpIHt9Ci0gICAgCisgICAgdmlydHVhbCB2b2lkIHBh aW50VGlja21hcmtzKEdyYXBoaWNzQ29udGV4dCosIFNjcm9sbGJhciosIGNvbnN0IEludFJlY3Qm KSB7fQorCiAgICAgdmlydHVhbCBJbnRSZWN0IGNvbnN0cmFpblRyYWNrUmVjdFRvVHJhY2tQaWVj ZXMoU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYgcmVjdCkgeyByZXR1cm4gcmVjdDsgfQogfTsK IAo=