66238 2011-08-15 10:26:01 -0700 Chromium Mac: Fix issue where scrollbar wouldn't be drawn until page finished loading 2011-08-17 01:28:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sail sail dglazkov jamesr thakis webkit.review.bot oldest_to_newest 451113 0 sail 2011-08-15 10:26:01 -0700 Chromium Mac: Force scrollbar to be drawn if user scrolls page while shouldSuspendScrollAnimations() is true 451132 1 103925 sail 2011-08-15 10:43:38 -0700 Created attachment 103925 Patch 451133 2 sail 2011-08-15 10:44:24 -0700 The chromium bug for this is: http://code.google.com/p/chromium/issues/detail?id=92602 451138 3 thakis 2011-08-15 10:48:41 -0700 Do you know how Safari / WebKit2 handles this (or why they're not affected by it)? 451192 4 sail 2011-08-15 12:03:48 -0700 (In reply to comment #3) > Do you know how Safari / WebKit2 handles this (or why they're not affected by it)? The short answer is that I don't know. As far as I can tell there are two differences between Chromium Mac and Safari: 1. in Safari smooth scrolling is enabled so ScrollAnimatorMac::scroll() ends up calling -[NSScrollAnimationHelper scrollToPoint:]. Maybe this ends up changing the alpha some how? 2. In Chromium Mac I added extra code to ScrollAnimatorChromiumMac::initialScrollbarPaintTimerFired() to keep the timer alive if we still hadn't loaded the page. See bug 65586. This makes it easier to reproduce the bug since we end up disabling drawing the scrollbar for longer. So I guess another question is how Safari handles bug 65586. Theoretically any site that takes longer than 0.1 second to load should cause Safari not to flash the scrollbar on load. But this doesn't happen, Safari flashes the scrollbar correctly on all sites that I tried. 451199 5 thakis 2011-08-15 12:09:11 -0700 Can you find out? 451460 6 103996 sail 2011-08-15 20:14:18 -0700 Created attachment 103996 Patch 451462 7 sail 2011-08-15 20:19:40 -0700 (In reply to comment #5) > Can you find out? Thanks for asking me to find out. After I dug deeper I found a bug in my implementation of wkScrollbarPainterForceFlashScrollers(). I have a disassembly of the GM version of all the wk* functions. I went back and verified that implementation matches the disassembly so there shouldn't be any more bugs of this sort. 451638 8 103996 thakis 2011-08-16 08:42:44 -0700 Comment on attachment 103996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103996&action=review Say "This reverts http://trac.webkit.org/changeset/92316" somewhere in the changelog. LGTM > Source/WebCore/ChangeLog:11 > + 3. ScrollAnimatorChromiumMac::scroll() is called before the ScrollAnimatorChromiumMac::m_initialScrollbarPaintTimer is fired. 4. At this point the scrollbar painter assumes the scrollbar is already visible (because of 1.) so the scrollbar's alpha stays at 0. Thus the scrollbar isn't visible until the page finishes loading. Linebreak before "4." > Source/WebCore/ChangeLog:14 > + Also, now that wkScrollbarPainterForceFlashScrollers is working correctly I don't the extra logic I added to the initialScrollbarPainterTimer handler. That logic restarted the timer if shouldSuspendScrollAnimations() was true. But isn't necessary since calling wkScrollbarPainterForceFlashScrollers() causes -[ScrollbarPainterDelegate setUpAnimation:...] to be called which does the exact same thing. "I don't *need*", "But *it* isn't" 451640 9 thakis 2011-08-16 08:43:39 -0700 (In reply to comment #7) > I went back and verified that implementation matches the disassembly so there shouldn't be any more bugs of this sort. Does that mean this comment "// TODO(sail): This doesn't match the implementation in WebKitSystemInterface." can be deleted? (not in this bug) 451683 10 103996 sail 2011-08-16 09:52:20 -0700 Comment on attachment 103996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103996&action=review >> Source/WebCore/ChangeLog:11 >> + 3. ScrollAnimatorChromiumMac::scroll() is called before the ScrollAnimatorChromiumMac::m_initialScrollbarPaintTimer is fired. 4. At this point the scrollbar painter assumes the scrollbar is already visible (because of 1.) so the scrollbar's alpha stays at 0. Thus the scrollbar isn't visible until the page finishes loading. > > Linebreak before "4." Fixed. >> Source/WebCore/ChangeLog:14 >> + Also, now that wkScrollbarPainterForceFlashScrollers is working correctly I don't the extra logic I added to the initialScrollbarPainterTimer handler. That logic restarted the timer if shouldSuspendScrollAnimations() was true. But isn't necessary since calling wkScrollbarPainterForceFlashScrollers() causes -[ScrollbarPainterDelegate setUpAnimation:...] to be called which does the exact same thing. > > "I don't *need*", "But *it* isn't" Fixed. 451685 11 104059 sail 2011-08-16 09:53:24 -0700 Created attachment 104059 Patch 451691 12 sail 2011-08-16 09:57:08 -0700 (In reply to comment #9) > (In reply to comment #7) > > I went back and verified that implementation matches the disassembly so there shouldn't be any more bugs of this sort. > > Does that mean this comment "// TODO(sail): This doesn't match the implementation in WebKitSystemInterface." can be deleted? (not in this bug) Oops, that still needs to be fixed. I'll work on that next. Filed bug 66311 to track this. 452090 13 sail 2011-08-16 20:26:00 -0700 change looks ok on try bots: http://build.chromium.org/p/tryserver.chromium/builders/mac_layout_rel/builds/272 http://build.chromium.org/p/tryserver.chromium/builders/win_layout/builds/1305 http://build.chromium.org/p/tryserver.chromium/builders/linux_layout_rel/builds/417 452098 14 thakis 2011-08-16 21:02:11 -0700 Looks great. jamesr / dglazkov, can one of you r+, please? 452170 15 104059 webkit.review.bot 2011-08-17 01:28:44 -0700 Comment on attachment 104059 Patch Clearing flags on attachment: 104059 Committed r93197: <http://trac.webkit.org/changeset/93197> 452171 16 webkit.review.bot 2011-08-17 01:28:49 -0700 All reviewed patches have been landed. Closing bug. 103925 2011-08-15 10:43:38 -0700 2011-08-15 20:14:15 -0700 Patch bug-66238-20110815104337.patch text/plain 3025 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwM2FkNDU4NDRiYjFhMzlk ZjI1MmNlYTJiMTBkOGRkZTk4M2M1MDk3Li5jMDJhMDdiNWNhZDhmZDkwZTE0ZjRmYjc5NjlmOGUw NzZmZDYxOGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDgtMTUgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtIE1hYzog Rm9yY2Ugc2Nyb2xsYmFyIHRvIGJlIGRyYXduIGlmIHVzZXIgc2Nyb2xscyBwYWdlIHdoaWxlIHNo b3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgaXMgdHJ1ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYyMzgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVybGF5IHNjcm9sbGJhcnMgd2VyZSBub3Qg dmlzaWJsZSBpZiB0aGUgdXNlciBzY3JvbGxlZCBhIHBhZ2Ugd2hpbGUgdGhlIHBhZ2Ugd2FzIGxv YWRpbmcuIFRoZSBzZXF1ZW5jZSBvZiBldmVudHMgbmVjZXNzYXJ5IHRvIHJlcHJvZHVjZSB0aGlz IGJ1ZyBhcmU6CisgICAgICAgICAgMS4gLVtTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUgc2Nyb2xs ZXJJbXA6YW5pbWF0ZUtub2JBbHBoYVRvOmR1cmF0aW9uOl0gaXMgY2FsbGVkCisgICAgICAgICAg Mi4gYW5pbWF0aW9uIGlzIGRlbGF5ZWQgYmVjYXVzZSBzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0 aW9ucygpIGlzIHRydWUKKyAgICAgICAgICAzLiBTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjpz Y3JvbGwoKSBpcyBjYWxsZWQgYmVmb3JlIHRoZSBTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjpt X2luaXRpYWxTY3JvbGxiYXJQYWludFRpbWVyIGlzIGZpcmVkLgorICAgICAgICBBdCB0aGlzIHBv aW50IHRoZSBzY3JvbGxiYXIgcGFpbnRlciBhc3N1bWVzIHRoZSBzY3JvbGxiYXIgaXMgYWxyZWFk eSB2aXNpYmxlIChiZWNhdXNlIG9mIDEuKSBzbyB0aGUgc2Nyb2xsYmFyJ3MgYWxwaGEgc3RheXMg YXQgMC4gVGh1cyB0aGUgc2Nyb2xsYmFyIGlzbid0IHZpc2libGUgdW50aWwgdGhlIHBhZ2UgZmlu aXNoZXMgbG9hZGluZy4KKworICAgICAgICBUbyBmaXggdGhpcyBJJ20gY2hhbmdpbmcgU2Nyb2xs QW5pbWF0b3JDaHJvbWl1bU1hYzo6c2Nyb2xsKCkgdG8gY2hlY2sgaWYgd2UgZGVsYXllZCBkcmF3 aW5nIHRoZSBzY3JvbGxiYXIgYW5kIGlmIHNvIHRoZW4gZXhwbGljaWx0eSBmb3JjZSB0aGUgc2Ny b2xsYmFyIHRvIGJlIHZpc2libGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3Jv bGxBbmltYXRvckNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0 b3JDaHJvbWl1bU1hYzo6c2Nyb2xsKToKKwogMjAxMS0wOC0xMSAgUGF2ZWwgUG9kaXZpbG92ICA8 cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcm9wZXJs eSB1cGRhdGUgY29uc29sZSBtZXNzYWdlIGNvdW50IGluIHNvdXJjZSBmcmFtZXMgYW5kIHJlc291 cmNlcyBwYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1tCmluZGV4IDVjNWFjMmIyYmU1OTIy MjU0MzI4YzE2NTBmOTgyOWYwZjgxMThjYzkuLjM3YmMwYzJhZTFhMWRkZTZmYTU2YWFmYjU0MmE1 MGQyMGFkMTQzMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbQpAQCAtNTAzLDYgKzUwMywx NiBAQCBib29sIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6OnNjcm9sbChTY3JvbGxiYXJPcmll bnRhdGlvbiBvcmllbnRhdGlvbiwgU2Nyb2xsRwogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdl TG9hZCA9IHRydWU7CiAKICNpZiAhRU5BQkxFKFNNT09USF9TQ1JPTExJTkcpCisgICAgLy8gSWYg ZHJhd2luZyB0aGUgc2Nyb2xsYmFyIHdhcyBkZWxheWVkIGJlY2F1c2UgdGhlIHBhZ2Ugd2FzIGxv YWRpbmcgdGhlbiBmb3JjZSBpdCB0byBiZSBkcmF3biBub3cuIElmIHdlIGRvbid0IGV4cGxpY2l0 bHkgZG8gdGhpcyB0aGVuCisgICAgLy8gdGhlIHNjcm9sbGJhciB3b24ndCBiZSB2aXNpYmxlIHVu dGlsIHRoZSBwYWdlIGZpbmlzaGVzIGxvYWRpbmcuCisgICAgaWYgKHNjcm9sbGJhclBhaW50VGlt ZXJJc0FjdGl2ZSgpKSB7CisgICAgICAgIFNjcm9sbGJhciogc2Nyb2xsYmFyID0gb3JpZW50YXRp b24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhciA/IG1fc2Nyb2xsYWJsZUFyZWEtPmhvcml6b250YWxT Y3JvbGxiYXIoKSA6IG1fc2Nyb2xsYWJsZUFyZWEtPnZlcnRpY2FsU2Nyb2xsYmFyKCk7CisgICAg ICAgIGlmIChzY3JvbGxiYXIpIHsKKyAgICAgICAgICAgIFdLU2Nyb2xsYmFyUGFpbnRlclJlZiBw YWludGVyID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVDaHJvbWl1bU1hYyo+ KFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lOjpuYXRpdmVUaGVtZSgpKS0+cGFpbnRlckZvclNjcm9s bGJhcihzY3JvbGxiYXIpOworICAgICAgICAgICAgW21fc2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRl LmdldCgpIHNjcm9sbGVySW1wOnBhaW50ZXIgYW5pbWF0ZUtub2JBbHBoYVRvOjEuMCBkdXJhdGlv bjowLjBdOworICAgICAgICB9CisgICAgfQorCiAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpz Y3JvbGwob3JpZW50YXRpb24sIGdyYW51bGFyaXR5LCBzdGVwLCBtdWx0aXBsaWVyKTsKICNlbmRp ZgogCg== 103996 2011-08-15 20:14:18 -0700 2011-08-16 09:53:21 -0700 Patch bug-66238-20110815201417.patch text/plain 4171 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwM2FkNDU4NDRiYjFhMzlk ZjI1MmNlYTJiMTBkOGRkZTk4M2M1MDk3Li44ZTQ2MWJkYjBkN2JmNDU2MjNlZGE1ZTA1ZDBkYWQy ZWI4ZDlmNTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDgtMTUgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtIE1hYzog Rml4IGlzc3VlIHdoZXJlIHNjcm9sbGJhciB3b3VsZG4ndCBiZSBkcmF3biB1bnRpbCBwYWdlIGZp bmlzaGVkIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2MjM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT3ZlcmxheSBzY3JvbGxiYXJzIHdlcmUgbm90IHZpc2libGUgaWYgdGhlIHVzZXIgc2Ny b2xsZWQgYSBwYWdlIHdoaWxlIHRoZSBwYWdlIHdhcyBsb2FkaW5nLiBUaGUgc2VxdWVuY2Ugb2Yg ZXZlbnRzIG5lY2Vzc2FyeSB0byByZXByb2R1Y2UgdGhpcyBidWcgd2VyZToKKyAgICAgICAgICAx LiAtW1Njcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSBzY3JvbGxlckltcDphbmltYXRlS25vYkFscGhh VG86ZHVyYXRpb246XSBpcyBjYWxsZWQKKyAgICAgICAgICAyLiBhbmltYXRpb24gaXMgZGVsYXll ZCBiZWNhdXNlIHNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgaXMgdHJ1ZQorICAgICAg ICAgIDMuIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6OnNjcm9sbCgpIGlzIGNhbGxlZCBiZWZv cmUgdGhlIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6Om1faW5pdGlhbFNjcm9sbGJhclBhaW50 VGltZXIgaXMgZmlyZWQuICAgICAgICAgIDQuIEF0IHRoaXMgcG9pbnQgdGhlIHNjcm9sbGJhciBw YWludGVyIGFzc3VtZXMgdGhlIHNjcm9sbGJhciBpcyBhbHJlYWR5IHZpc2libGUgKGJlY2F1c2Ug b2YgMS4pIHNvIHRoZSBzY3JvbGxiYXIncyBhbHBoYSBzdGF5cyBhdCAwLiBUaHVzIHRoZSBzY3Jv bGxiYXIgaXNuJ3QgdmlzaWJsZSB1bnRpbCB0aGUgcGFnZSBmaW5pc2hlcyBsb2FkaW5nLgorICAg ICAgICBJdCB0dXJucyBvdXQgdGhhdCB0aGUgcm9vdCBwcm9ibGVtIHdhcyB0aGF0IHdoZW4gdGhl IGluaXRpYWxTY3JvbGxiYXJQYWludGVyVGltZXIgZmlyZWQgSSB3YXNuJ3QgZmxhc2hpbmcgdGhl IHNjcm9sbGJhciBjb3JyZWN0bHkuIE15IGltcGxlbWVudGF0aW9uIG9mIHdrU2Nyb2xsYmFyUGFp bnRlckZvcmNlRmxhc2hTY3JvbGxlcnMoKSBqdXN0IGNhbGxlZCBmbGFzaFNjcm9sbGVycy4gVGhl IFNhZmFyaSBpbXBsZW1lbnRhdGlvbiBvZiB0aGlzIGZ1bmN0aW9uIGFsc28gY2FsbHMgaGlkZU92 ZXJsYXlTY3JvbGxlcnMuIENhbGxpbmcgaGlkZU92ZXJsYXlTY3JvbGxlcnMgY2F1c2VzIHRoZSBh bHBoYSB0byBjaGFuZ2UgdG8gMCB3aGljaCBwcmV2ZW50cyBzdGVwIDQgZnJvbSBoYXBwZW5pbmcu CisKKyAgICAgICAgQWxzbywgbm93IHRoYXQgd2tTY3JvbGxiYXJQYWludGVyRm9yY2VGbGFzaFNj cm9sbGVycyBpcyB3b3JraW5nIGNvcnJlY3RseSBJIGRvbid0IHRoZSBleHRyYSBsb2dpYyBJIGFk ZGVkIHRvIHRoZSBpbml0aWFsU2Nyb2xsYmFyUGFpbnRlclRpbWVyIGhhbmRsZXIuIFRoYXQgbG9n aWMgcmVzdGFydGVkIHRoZSB0aW1lciBpZiBzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygp IHdhcyB0cnVlLiBCdXQgaXNuJ3QgbmVjZXNzYXJ5IHNpbmNlIGNhbGxpbmcgd2tTY3JvbGxiYXJQ YWludGVyRm9yY2VGbGFzaFNjcm9sbGVycygpIGNhdXNlcyAtW1Njcm9sbGJhclBhaW50ZXJEZWxl Z2F0ZSBzZXRVcEFuaW1hdGlvbjouLi5dIHRvIGJlIGNhbGxlZCB3aGljaCBkb2VzIHRoZSBleGFj dCBzYW1lIHRoaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0 b3JDaHJvbWl1bU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yQ2hyb21p dW1NYWM6OmluaXRpYWxTY3JvbGxiYXJQYWludFRpbWVyRmlyZWQpOgorICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbToKKyAg ICAgICAgKHdrU2Nyb2xsYmFyUGFpbnRlckZvcmNlRmxhc2hTY3JvbGxlcnMpOgorCiAyMDExLTA4 LTExICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IHByb3Blcmx5IHVwZGF0ZSBjb25zb2xlIG1lc3NhZ2UgY291bnQgaW4g c291cmNlIGZyYW1lcyBhbmQgcmVzb3VyY2VzIHBhbmVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMu bW0KaW5kZXggNWM1YWMyYjJiZTU5MjIyNTQzMjhjMTY1MGY5ODI5ZjBmODExOGNjOS4uZjIxNWFh MjhkMTliYmZmZTZmZmEzNTExMTA2NGU4NzhmM2FkYTIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVt TWFjLm1tCkBAIC0xMjg5LDEwICsxMjg5LDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvckNocm9taXVt TWFjOjpzdG9wU2Nyb2xsYmFyUGFpbnRUaW1lcigpCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3JDaHJv bWl1bU1hYzo6aW5pdGlhbFNjcm9sbGJhclBhaW50VGltZXJGaXJlZChUaW1lcjxTY3JvbGxBbmlt YXRvckNocm9taXVtTWFjPiopCiB7Ci0gICAgaWYgKHNjcm9sbGFibGVBcmVhKCktPnNob3VsZFN1 c3BlbmRTY3JvbGxBbmltYXRpb25zKCkpCi0gICAgICAgIHN0YXJ0U2Nyb2xsYmFyUGFpbnRUaW1l cigpOwotICAgIGVsc2UKLSAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyRm9yY2VGbGFzaFNjcm9s bGVycyhtX3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyLmdldCgpKTsKKyAgICB3a1Njcm9sbGJh clBhaW50ZXJGb3JjZUZsYXNoU2Nyb2xsZXJzKG1fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXIu Z2V0KCkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJv bWl1bU1hYy5tbQppbmRleCA2NDAzZjA3NzI4MWJjYzE4MzkzZWMxZmYxYWRjNjhhMzkxMGVkYjA3 Li5kYTEzOWZhYWZjMmU5NzdlOWQ4MzYzMmEwMjkyNjk3OTliNWM0Y2ZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVz Q2hyb21pdW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Ny b2xsYmFyT3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tCkBAIC04OCw2ICs4OCw3IEBACiBA cHJvcGVydHkocmV0YWluKSBOU1Njcm9sbGVySW1wICp2ZXJ0aWNhbFNjcm9sbGVySW1wOwogQHBy b3BlcnR5KGFzc2lnbikgaWQgZGVsZWdhdGU7CiAKKy0gKHZvaWQpaGlkZU92ZXJsYXlTY3JvbGxl cnM7CiAtICh2b2lkKWZsYXNoU2Nyb2xsZXJzOwogLSAodm9pZCljb250ZW50QXJlYVNjcm9sbGVk OwogLSAodm9pZCljb250ZW50QXJlYVdpbGxEcmF3OwpAQCAtMzM4LDYgKzMzOSw3IEBAIHZvaWQg d2tEaWRFbmRTY3JvbGxHZXN0dXJlKFdLU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJSZWYgY29u dHJvbGxlcikKIAogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJGb3JjZUZsYXNoU2Nyb2xsZXJzKFdL U2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJSZWYgY29udHJvbGxlcikKIHsKKyAgICBbY29udHJv bGxlciBoaWRlT3ZlcmxheVNjcm9sbGVyc107CiAgICAgW2NvbnRyb2xsZXIgZmxhc2hTY3JvbGxl cnNdOwogfQogCg== 104059 2011-08-16 09:53:24 -0700 2011-08-17 01:28:44 -0700 Patch bug-66238-20110816095323.patch text/plain 4222 sail U3VidmVyc2lvbiBSZXZpc2lvbjogOTMwODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MGU4ZmM1MzEzOThiMmNk YjZjMDk4YmY5NjBhYTczNzlhODhiYmVhLi4wOWY3NGVjMmYxNWY0MDllMmUwODc0NTc1MjhhZjMy MGEyY2ZlZjJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMTYgIFNhaWxl c2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENocm9taXVtIE1hYzog Rml4IGlzc3VlIHdoZXJlIHNjcm9sbGJhciB3b3VsZG4ndCBiZSBkcmF3biB1bnRpbCBwYWdlIGZp bmlzaGVkIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2MjM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT3ZlcmxheSBzY3JvbGxiYXJzIHdlcmUgbm90IHZpc2libGUgaWYgdGhlIHVzZXIgc2Ny b2xsZWQgYSBwYWdlIHdoaWxlIHRoZSBwYWdlIHdhcyBsb2FkaW5nLiBUaGUgc2VxdWVuY2Ugb2Yg ZXZlbnRzIG5lY2Vzc2FyeSB0byByZXByb2R1Y2UgdGhpcyBidWcgd2VyZToKKyAgICAgICAgICAx LiAtW1Njcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSBzY3JvbGxlckltcDphbmltYXRlS25vYkFscGhh VG86ZHVyYXRpb246XSBpcyBjYWxsZWQKKyAgICAgICAgICAyLiBhbmltYXRpb24gaXMgZGVsYXll ZCBiZWNhdXNlIHNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgaXMgdHJ1ZQorICAgICAg ICAgIDMuIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6OnNjcm9sbCgpIGlzIGNhbGxlZCBiZWZv cmUgdGhlIFNjcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWM6Om1faW5pdGlhbFNjcm9sbGJhclBhaW50 VGltZXIgaXMgZmlyZWQuCisgICAgICAgICAgNC4gQXQgdGhpcyBwb2ludCB0aGUgc2Nyb2xsYmFy IHBhaW50ZXIgYXNzdW1lcyB0aGUgc2Nyb2xsYmFyIGlzIGFscmVhZHkgdmlzaWJsZSAoYmVjYXVz ZSBvZiAxLikgc28gdGhlIHNjcm9sbGJhcidzIGFscGhhIHN0YXlzIGF0IDAuIFRodXMgdGhlIHNj cm9sbGJhciBpc24ndCB2aXNpYmxlIHVudGlsIHRoZSBwYWdlIGZpbmlzaGVzIGxvYWRpbmcuCisg ICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IHRoZSByb290IHByb2JsZW0gd2FzIHRoYXQgd2hlbiB0 aGUgaW5pdGlhbFNjcm9sbGJhclBhaW50ZXJUaW1lciBmaXJlZCBJIHdhc24ndCBmbGFzaGluZyB0 aGUgc2Nyb2xsYmFyIGNvcnJlY3RseS4gTXkgaW1wbGVtZW50YXRpb24gb2Ygd2tTY3JvbGxiYXJQ YWludGVyRm9yY2VGbGFzaFNjcm9sbGVycygpIGp1c3QgY2FsbGVkIGZsYXNoU2Nyb2xsZXJzLiBU aGUgU2FmYXJpIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZnVuY3Rpb24gYWxzbyBjYWxscyBoaWRl T3ZlcmxheVNjcm9sbGVycy4gQ2FsbGluZyBoaWRlT3ZlcmxheVNjcm9sbGVycyBjYXVzZXMgdGhl IGFscGhhIHRvIGNoYW5nZSB0byAwIHdoaWNoIHByZXZlbnRzIHN0ZXAgNCBmcm9tIGhhcHBlbmlu Zy4KKworICAgICAgICBBbHNvLCBub3cgdGhhdCB3a1Njcm9sbGJhclBhaW50ZXJGb3JjZUZsYXNo U2Nyb2xsZXJzIGlzIHdvcmtpbmcgY29ycmVjdGx5IEkgZG9uJ3QgbmVlZCB0aGUgZXh0cmEgbG9n aWMgSSBhZGRlZCB0byB0aGUgaW5pdGlhbFNjcm9sbGJhclBhaW50ZXJUaW1lciBoYW5kbGVyLiBU aGF0IGxvZ2ljIHJlc3RhcnRlZCB0aGUgdGltZXIgaWYgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1h dGlvbnMoKSB3YXMgdHJ1ZS4gQnV0IHRoaXMgaXNuJ3QgbmVjZXNzYXJ5IHNpbmNlIGNhbGxpbmcg d2tTY3JvbGxiYXJQYWludGVyRm9yY2VGbGFzaFNjcm9sbGVycygpIGNhdXNlcyAtW1Njcm9sbGJh clBhaW50ZXJEZWxlZ2F0ZSBzZXRVcEFuaW1hdGlvbjouLi5dIHRvIGJlIGNhbGxlZCB3aGljaCBk b2VzIHRoZSBleGFjdCBzYW1lIHRoaW5nLiBSZW1vdmluZyB0aGUgZXh0cmEgbG9naWMgcmV2ZXJ0 cyBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC85MjMxNi4KKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjppbml0aWFsU2Nyb2xsYmFyUGFpbnRU aW1lckZpcmVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5 VXRpbGl0aWVzQ2hyb21pdW1NYWMubW06CisgICAgICAgICh3a1Njcm9sbGJhclBhaW50ZXJGb3Jj ZUZsYXNoU2Nyb2xsZXJzKToKKwogMjAxMS0wOC0xNSAgSmVmZnJleSBQZmF1ICA8anBmYXVAYXBw bGUuY29tPgogCiAgICAgICAgIE5ldyBYTUwgcGFyc2VyOiBhZGQgeG1sIG5hbWVzcGFjZSB0byB0 aGUgZGVmYXVsdCBtYXAgb2YgbmFtZXNwYWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbEFuaW1hdG9yQ2hyb21pdW1NYWMubW0KaW5k ZXggNWM1YWMyYjJiZTU5MjIyNTQzMjhjMTY1MGY5ODI5ZjBmODExOGNjOS4uZjIxNWFhMjhkMTli YmZmZTZmZmEzNTExMTA2NGU4NzhmM2FkYTIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1hYy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxBbmltYXRvckNocm9taXVtTWFjLm1t CkBAIC0xMjg5LDEwICsxMjg5LDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvckNocm9taXVtTWFjOjpz dG9wU2Nyb2xsYmFyUGFpbnRUaW1lcigpCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3JDaHJvbWl1bU1h Yzo6aW5pdGlhbFNjcm9sbGJhclBhaW50VGltZXJGaXJlZChUaW1lcjxTY3JvbGxBbmltYXRvckNo cm9taXVtTWFjPiopCiB7Ci0gICAgaWYgKHNjcm9sbGFibGVBcmVhKCktPnNob3VsZFN1c3BlbmRT Y3JvbGxBbmltYXRpb25zKCkpCi0gICAgICAgIHN0YXJ0U2Nyb2xsYmFyUGFpbnRUaW1lcigpOwot ICAgIGVsc2UKLSAgICAgICAgd2tTY3JvbGxiYXJQYWludGVyRm9yY2VGbGFzaFNjcm9sbGVycyht X3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyLmdldCgpKTsKKyAgICB3a1Njcm9sbGJhclBhaW50 ZXJGb3JjZUZsYXNoU2Nyb2xsZXJzKG1fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXIuZ2V0KCkp OwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhck92ZXJsYXlVdGlsaXRpZXNDaHJvbWl1bU1h Yy5tbQppbmRleCA2NDAzZjA3NzI4MWJjYzE4MzkzZWMxZmYxYWRjNjhhMzkxMGVkYjA3Li5kYTEz OWZhYWZjMmU5NzdlOWQ4MzYzMmEwMjkyNjk3OTliNWM0Y2ZiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJPdmVybGF5VXRpbGl0aWVzQ2hyb21p dW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFy T3ZlcmxheVV0aWxpdGllc0Nocm9taXVtTWFjLm1tCkBAIC04OCw2ICs4OCw3IEBACiBAcHJvcGVy dHkocmV0YWluKSBOU1Njcm9sbGVySW1wICp2ZXJ0aWNhbFNjcm9sbGVySW1wOwogQHByb3BlcnR5 KGFzc2lnbikgaWQgZGVsZWdhdGU7CiAKKy0gKHZvaWQpaGlkZU92ZXJsYXlTY3JvbGxlcnM7CiAt ICh2b2lkKWZsYXNoU2Nyb2xsZXJzOwogLSAodm9pZCljb250ZW50QXJlYVNjcm9sbGVkOwogLSAo dm9pZCljb250ZW50QXJlYVdpbGxEcmF3OwpAQCAtMzM4LDYgKzMzOSw3IEBAIHZvaWQgd2tEaWRF bmRTY3JvbGxHZXN0dXJlKFdLU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJSZWYgY29udHJvbGxl cikKIAogdm9pZCB3a1Njcm9sbGJhclBhaW50ZXJGb3JjZUZsYXNoU2Nyb2xsZXJzKFdLU2Nyb2xs YmFyUGFpbnRlckNvbnRyb2xsZXJSZWYgY29udHJvbGxlcikKIHsKKyAgICBbY29udHJvbGxlciBo aWRlT3ZlcmxheVNjcm9sbGVyc107CiAgICAgW2NvbnRyb2xsZXIgZmxhc2hTY3JvbGxlcnNdOwog fQogCg==