43992 2010-08-13 15:15:22 -0700 [chromium] scrolling issues when accelerated compositor is enabled 2010-08-18 22:38:42 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 amarinichev webkit-unassigned commit-queue dglazkov fishd levin nduca vangelis webkit.review.bot oldest_to_newest 264514 0 amarinichev 2010-08-13 15:15:22 -0700 Run chrome with --enable-accelerated-compositing and load http://webkit.org/blog/386/3d-transforms/. Scroll down couple pages and reload. Further scrolling results in most of the page not being redrawn. Also, when running with --enable-accelerated-compositing, transformation matrix for scrolling is calculated incorrectly, which results in incorrect rendering. 265232 1 64521 amarinichev 2010-08-16 14:14:07 -0700 Created attachment 64521 proposed fix 265234 2 webkit.review.bot 2010-08-16 14:15:39 -0700 Attachment 64521 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:412: An else should appear on the same line as the preceding } [whitespace/newline] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 265246 3 64524 amarinichev 2010-08-16 14:48:19 -0700 Created attachment 64524 check-webkit-style happy is happy now 265305 4 64524 vangelis 2010-08-16 17:23:48 -0700 Comment on attachment 64524 check-webkit-style happy is happy now > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 163f6c5..ef0d9a6 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,32 @@ > +2010-08-16 Alexey Marinichev <amarinichev@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [chromium] scrolling issues when accelerated compositor is enabled > + https://bugs.webkit.org/show_bug.cgi?id=43992 > + > + No new tests. (OOPS!) > + > + * platform/graphics/chromium/LayerRendererChromium.cpp: > + (WebCore::LayerRendererChromium::drawLayers): > + > +2010-08-16 Alexey Marinichev <amarinichev@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [chromium] scrolling issues when accelerated compositor is enabled > + https://bugs.webkit.org/show_bug.cgi?id=43992 > + > + Corrected scroll position not being updated, and an off-by-half error. > + > + To test the former, follow instructions in the bug. To test the > + latter, change GL_NEAREST to GL_LINEAR in LayerRendererChromium.cpp. > + Scrolling should work properly for all window sizes, without blurring > + images and shifting them to the left. > + > + * platform/graphics/chromium/LayerRendererChromium.cpp: > + (WebCore::LayerRendererChromium::drawLayers): > + > 2010-08-16 Paul Sawaya <psawaya@apple.com> > > Reviewed by Chris Marrin. > diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp > index 2f70efa..abaa274 100644 > --- a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp > +++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp > @@ -390,8 +390,8 @@ void LayerRendererChromium::drawLayers(const IntRect& updateRect, const IntRect& > #error "Need to implement for your platform." > #endif > > - scrolledLayerMatrix.translate3d((int)floorf(0.5 * visibleRect.width()) - scrollDelta.x(), > - (int)floorf(0.5 * visibleRect.height()) + scaleFactor * scrollDelta.y(), 0); > + scrolledLayerMatrix.translate3d((0.5 * visibleRect.width()) - scrollDelta.x(), > + (0.5 * visibleRect.height()) + scaleFactor * scrollDelta.y(), 0); > scrolledLayerMatrix.scale3d(1, -1, 1); > > // Switch shaders to avoid RGB swizzling. > @@ -406,7 +406,10 @@ void LayerRendererChromium::drawLayers(const IntRect& updateRect, const IntRect& > > checkGLError(); > m_scrollPosition = scrollPosition; > - } > + } else if (abs(scrollDelta.y()) > contentRect.height() || abs(scrollDelta.x()) > contentRect.width()) > + // Scrolling larger than the contentRect size does not preserve any of the pixels, so there is > + // no need to copy framebuffer pixels back into the texture. > + m_scrollPosition = scrollPosition; > > // FIXME: The following check should go away when the compositor renders independently from its own thread. > // Ignore a 1x1 update rect at (0, 0) as that's used a way to kick off a redraw for the compositor. WebCore/ChangeLog:11 + (WebCore::LayerRendererChromium::drawLayers): There are two entries in the ChangeLog for this change. WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:  + scrolledLayerMatrix.translate3d((int)floorf(0.5 * visibleRect.width()) - scrollDelta.x(), Maybe remove the parenthesis around the 0.5* .. expressions as they're not needed anymore? 265329 5 64544 amarinichev 2010-08-16 18:11:24 -0700 Created attachment 64544 got rid of a redundant entry in the Changelog; removed unnecessary parentheses 265355 6 64544 levin 2010-08-16 21:21:00 -0700 Comment on attachment 64544 got rid of a redundant entry in the Changelog; removed unnecessary parentheses > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index 163f6c5..cbaecba 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,20 @@ > +2010-08-16 Alexey Marinichev <amarinichev@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [chromium] scrolling issues when accelerated compositor is enabled > + https://bugs.webkit.org/show_bug.cgi?id=43992 It would be nice to have some explanation of why the int cast/floorf call is being removed. (Is that the off-by-half bug?) > + Is it possible to create a layout test for this (that verifies the fix when accelerated compositing is on)? > diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp > + } else if (abs(scrollDelta.y()) > contentRect.height() || abs(scrollDelta.x()) > contentRect.width()) > + // Scrolling larger than the contentRect size does not preserve any of the pixels, so there is > + // no need to copy framebuffer pixels back into the texture. > + m_scrollPosition = scrollPosition; This should have {} around it since the else clause is more than one logical line. 265675 7 64613 amarinichev 2010-08-17 11:47:00 -0700 Created attachment 64613 added braces Layout test for the m_scrollPosition update is possible. I'd rather do it in a separate commit, it will take me some time to figure out how layout tests are written. Layout test for off by half error is not easy. It's trivial if GL_NEAREST is changed to GL_LINEAR; otherwise it might require multiple scrolls. Again, I'd rather do it in a separate commit. 265878 8 64613 levin 2010-08-17 17:53:39 -0700 Comment on attachment 64613 added braces I'm sorry, but there really should be a layout test submitted with the fix. 265917 9 vangelis 2010-08-17 20:09:56 -0700 (In reply to comment #8) > (From update of attachment 64613 [details]) > I'm sorry, but there really should be a layout test submitted with the fix. In all fairness, it's hard to make layout tests for these fixes without resorting to grabbing snapshots from the browser. Unfortunately, we don't yet have the compositor running in chromium's testshell which makes it impossible at the moment to do any automated testing on it. 266540 10 fishd 2010-08-18 22:00:50 -0700 Since this is a Chromium only change, and Chromium isn't able to run the compositor layout tests yet, I don't think we should hold up this patch for a layout test. We should make sure there is a bug filed to add a layout test for this patch, and make it be blocked by the bug to enable the compositor layout tests for Chromium. 266541 11 levin 2010-08-18 22:08:13 -0700 (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 64613 [details] [details]) > > I'm sorry, but there really should be a layout test submitted with the fix. > > In all fairness, it's hard to make layout tests for these fixes without resorting to grabbing snapshots from the browser. Unfortunately, we don't yet have the compositor running in chromium's testshell which makes it impossible at the moment to do any automated testing on it. It seems simple. There could be a pixel test that produces the bad result. When the compositor is turned on, this pixel test would catch regressions. As of now, there is no such pixel test which is really unfortunate. 266550 12 64613 commit-queue 2010-08-18 22:38:37 -0700 Comment on attachment 64613 added braces Clearing flags on attachment: 64613 Committed r65651: <http://trac.webkit.org/changeset/65651> 266551 13 commit-queue 2010-08-18 22:38:42 -0700 All reviewed patches have been landed. Closing bug. 64521 2010-08-16 14:14:07 -0700 2010-08-16 18:11:24 -0700 proposed fix 0001-Done.patch text/plain 2971 amarinichev RnJvbSA0YmRlZTE2ODhiNjRiYjZhNzI1YjJiOWRhNzk5MGE2ZmZlZWE3M2I4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZXkgTWFyaW5pY2hldiA8YW1hcmluaWNoZXZAY2hyb21p dW0ub3JnPgpEYXRlOiBGcmksIDEzIEF1ZyAyMDEwIDE1OjU2OjA5IC0wNzAwClN1YmplY3Q6IFtQ QVRDSF0gRG9uZS4KCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCAgICB8ICAgIDggKysrKysrLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE2M2Y2YzUuLmNiYWVj YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDgtMTYgIEFsZXhleSBNYXJpbmljaGV2ICA8YW1hcmlu aWNoZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtjaHJvbWl1bV0gc2Nyb2xsaW5nIGlzc3VlcyB3aGVuIGFjY2VsZXJhdGVk IGNvbXBvc2l0b3IgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDM5OTIKKworICAgICAgICBDb3JyZWN0ZWQgc2Nyb2xsIHBvc2l0aW9u IG5vdCBiZWluZyB1cGRhdGVkLCBhbmQgYW4gb2ZmLWJ5LWhhbGYgZXJyb3IuCisKKyAgICAgICAg VG8gdGVzdCB0aGUgZm9ybWVyLCBmb2xsb3cgaW5zdHJ1Y3Rpb25zIGluIHRoZSBidWcuICBUbyB0 ZXN0IHRoZQorICAgICAgICBsYXR0ZXIsIGNoYW5nZSBHTF9ORUFSRVNUIHRvIEdMX0xJTkVBUiBp biBMYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwLgorICAgICAgICBTY3JvbGxpbmcgc2hvdWxkIHdv cmsgcHJvcGVybHkgZm9yIGFsbCB3aW5kb3cgc2l6ZXMsIHdpdGhvdXQgYmx1cnJpbmcKKyAgICAg ICAgaW1hZ2VzIGFuZCBzaGlmdGluZyB0aGVtIHRvIHRoZSBsZWZ0LgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyk6CisKIDIwMTAt MDgtMTYgIFBhdWwgU2F3YXlhICA8cHNhd2F5YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQ2hyaXMgTWFycmluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IDJmNzBlZmEu LmEzOWEyZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTM5MCw4ICszOTAsOCBAQCB2 b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyhjb25zdCBJbnRSZWN0JiB1cGRh dGVSZWN0LCBjb25zdCBJbnRSZWN0JgogI2Vycm9yICJOZWVkIHRvIGltcGxlbWVudCBmb3IgeW91 ciBwbGF0Zm9ybS4iCiAjZW5kaWYKIAotICAgICAgICBzY3JvbGxlZExheWVyTWF0cml4LnRyYW5z bGF0ZTNkKChpbnQpZmxvb3JmKDAuNSAqIHZpc2libGVSZWN0LndpZHRoKCkpIC0gc2Nyb2xsRGVs dGEueCgpLAotICAgICAgICAgICAgKGludClmbG9vcmYoMC41ICogdmlzaWJsZVJlY3QuaGVpZ2h0 KCkpICsgc2NhbGVGYWN0b3IgKiBzY3JvbGxEZWx0YS55KCksIDApOworICAgICAgICBzY3JvbGxl ZExheWVyTWF0cml4LnRyYW5zbGF0ZTNkKCgwLjUgKiB2aXNpYmxlUmVjdC53aWR0aCgpKSAtIHNj cm9sbERlbHRhLngoKSwKKyAgICAgICAgICAgICgwLjUgKiB2aXNpYmxlUmVjdC5oZWlnaHQoKSkg KyBzY2FsZUZhY3RvciAqIHNjcm9sbERlbHRhLnkoKSwgMCk7CiAgICAgICAgIHNjcm9sbGVkTGF5 ZXJNYXRyaXguc2NhbGUzZCgxLCAtMSwgMSk7CiAKICAgICAgICAgLy8gU3dpdGNoIHNoYWRlcnMg dG8gYXZvaWQgUkdCIHN3aXp6bGluZy4KQEAgLTQwNyw2ICs0MDcsMTAgQEAgdm9pZCBMYXllclJl bmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMoY29uc3QgSW50UmVjdCYgdXBkYXRlUmVjdCwgY29u c3QgSW50UmVjdCYKICAgICAgICAgY2hlY2tHTEVycm9yKCk7CiAgICAgICAgIG1fc2Nyb2xsUG9z aXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKICAgICB9CisgICAgLy8gU2Nyb2xsaW5nIGxhcmdlciB0 aGFuIHRoZSBjb250ZW50UmVjdCBzaXplIGRvZXMgbm90IHByZXNlcnZlIGFueSBvZiB0aGUgcGl4 ZWxzLCBzbyB0aGVyZSBpcworICAgIC8vIG5vIG5lZWQgdG8gY29weSBmcmFtZWJ1ZmZlciBwaXhl bHMgYmFjayBpbnRvIHRoZSB0ZXh0dXJlLgorICAgIGVsc2UgaWYgKGFicyhzY3JvbGxEZWx0YS55 KCkpID4gY29udGVudFJlY3QuaGVpZ2h0KCkgfHwgYWJzKHNjcm9sbERlbHRhLngoKSkgPiBjb250 ZW50UmVjdC53aWR0aCgpKQorICAgICAgICBtX3Njcm9sbFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRp b247CiAKICAgICAvLyBGSVhNRTogVGhlIGZvbGxvd2luZyBjaGVjayBzaG91bGQgZ28gYXdheSB3 aGVuIHRoZSBjb21wb3NpdG9yIHJlbmRlcnMgaW5kZXBlbmRlbnRseSBmcm9tIGl0cyBvd24gdGhy ZWFkLgogICAgIC8vIElnbm9yZSBhIDF4MSB1cGRhdGUgcmVjdCBhdCAoMCwgMCkgYXMgdGhhdCdz IHVzZWQgYSB3YXkgdG8ga2ljayBvZmYgYSByZWRyYXcgZm9yIHRoZSBjb21wb3NpdG9yLgotLSAK MS43LjEKCg== 64524 2010-08-16 14:48:19 -0700 2010-08-16 18:11:24 -0700 check-webkit-style happy is happy now 0001-Done.patch text/plain 2975 amarinichev ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTYzZjZjNS4uZWYwZDlhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMC0wOC0xNiAgQWxleGV5IE1hcmlu aWNoZXYgIDxhbWFyaW5pY2hldkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBzY3JvbGxpbmcgaXNzdWVzIHdo ZW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRvciBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzk5MgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJS ZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJv bWl1bTo6ZHJhd0xheWVycyk6CisKKzIwMTAtMDgtMTYgIEFsZXhleSBNYXJpbmljaGV2ICA8YW1h cmluaWNoZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gc2Nyb2xsaW5nIGlzc3VlcyB3aGVuIGFjY2VsZXJh dGVkIGNvbXBvc2l0b3IgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDM5OTIKKworICAgICAgICBDb3JyZWN0ZWQgc2Nyb2xsIHBvc2l0 aW9uIG5vdCBiZWluZyB1cGRhdGVkLCBhbmQgYW4gb2ZmLWJ5LWhhbGYgZXJyb3IuCisKKyAgICAg ICAgVG8gdGVzdCB0aGUgZm9ybWVyLCBmb2xsb3cgaW5zdHJ1Y3Rpb25zIGluIHRoZSBidWcuICBU byB0ZXN0IHRoZQorICAgICAgICBsYXR0ZXIsIGNoYW5nZSBHTF9ORUFSRVNUIHRvIEdMX0xJTkVB UiBpbiBMYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwLgorICAgICAgICBTY3JvbGxpbmcgc2hvdWxk IHdvcmsgcHJvcGVybHkgZm9yIGFsbCB3aW5kb3cgc2l6ZXMsIHdpdGhvdXQgYmx1cnJpbmcKKyAg ICAgICAgaW1hZ2VzIGFuZCBzaGlmdGluZyB0aGVtIHRvIHRoZSBsZWZ0LgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyk6CisKIDIw MTAtMDgtMTYgIFBhdWwgU2F3YXlhICA8cHNhd2F5YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQ2hyaXMgTWFycmluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IDJmNzBl ZmEuLmFiYWEyNzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTM5MCw4ICszOTAsOCBA QCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyhjb25zdCBJbnRSZWN0JiB1 cGRhdGVSZWN0LCBjb25zdCBJbnRSZWN0JgogI2Vycm9yICJOZWVkIHRvIGltcGxlbWVudCBmb3Ig eW91ciBwbGF0Zm9ybS4iCiAjZW5kaWYKIAotICAgICAgICBzY3JvbGxlZExheWVyTWF0cml4LnRy YW5zbGF0ZTNkKChpbnQpZmxvb3JmKDAuNSAqIHZpc2libGVSZWN0LndpZHRoKCkpIC0gc2Nyb2xs RGVsdGEueCgpLAotICAgICAgICAgICAgKGludClmbG9vcmYoMC41ICogdmlzaWJsZVJlY3QuaGVp Z2h0KCkpICsgc2NhbGVGYWN0b3IgKiBzY3JvbGxEZWx0YS55KCksIDApOworICAgICAgICBzY3Jv bGxlZExheWVyTWF0cml4LnRyYW5zbGF0ZTNkKCgwLjUgKiB2aXNpYmxlUmVjdC53aWR0aCgpKSAt IHNjcm9sbERlbHRhLngoKSwKKyAgICAgICAgICAgICgwLjUgKiB2aXNpYmxlUmVjdC5oZWlnaHQo KSkgKyBzY2FsZUZhY3RvciAqIHNjcm9sbERlbHRhLnkoKSwgMCk7CiAgICAgICAgIHNjcm9sbGVk TGF5ZXJNYXRyaXguc2NhbGUzZCgxLCAtMSwgMSk7CiAKICAgICAgICAgLy8gU3dpdGNoIHNoYWRl cnMgdG8gYXZvaWQgUkdCIHN3aXp6bGluZy4KQEAgLTQwNiw3ICs0MDYsMTAgQEAgdm9pZCBMYXll clJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMoY29uc3QgSW50UmVjdCYgdXBkYXRlUmVjdCwg Y29uc3QgSW50UmVjdCYKIAogICAgICAgICBjaGVja0dMRXJyb3IoKTsKICAgICAgICAgbV9zY3Jv bGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwotICAgIH0KKyAgICB9IGVsc2UgaWYgKGFicyhz Y3JvbGxEZWx0YS55KCkpID4gY29udGVudFJlY3QuaGVpZ2h0KCkgfHwgYWJzKHNjcm9sbERlbHRh LngoKSkgPiBjb250ZW50UmVjdC53aWR0aCgpKQorICAgICAgICAvLyBTY3JvbGxpbmcgbGFyZ2Vy IHRoYW4gdGhlIGNvbnRlbnRSZWN0IHNpemUgZG9lcyBub3QgcHJlc2VydmUgYW55IG9mIHRoZSBw aXhlbHMsIHNvIHRoZXJlIGlzCisgICAgICAgIC8vIG5vIG5lZWQgdG8gY29weSBmcmFtZWJ1ZmZl ciBwaXhlbHMgYmFjayBpbnRvIHRoZSB0ZXh0dXJlLgorICAgICAgICBtX3Njcm9sbFBvc2l0aW9u ID0gc2Nyb2xsUG9zaXRpb247CiAKICAgICAvLyBGSVhNRTogVGhlIGZvbGxvd2luZyBjaGVjayBz aG91bGQgZ28gYXdheSB3aGVuIHRoZSBjb21wb3NpdG9yIHJlbmRlcnMgaW5kZXBlbmRlbnRseSBm cm9tIGl0cyBvd24gdGhyZWFkLgogICAgIC8vIElnbm9yZSBhIDF4MSB1cGRhdGUgcmVjdCBhdCAo MCwgMCkgYXMgdGhhdCdzIHVzZWQgYSB3YXkgdG8ga2ljayBvZmYgYSByZWRyYXcgZm9yIHRoZSBj b21wb3NpdG9yLgo= 64544 2010-08-16 18:11:24 -0700 2010-08-17 11:47:00 -0700 got rid of a redundant entry in the Changelog; removed unnecessary parentheses 0001-Done.patch text/plain 2583 amarinichev ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTYzZjZjNS4uY2JhZWNiYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOC0xNiAgQWxleGV5IE1hcmlu aWNoZXYgIDxhbWFyaW5pY2hldkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBzY3JvbGxpbmcgaXNzdWVzIHdo ZW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRvciBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzk5MgorCisgICAgICAgIENvcnJlY3RlZCBz Y3JvbGwgcG9zaXRpb24gbm90IGJlaW5nIHVwZGF0ZWQsIGFuZCBhbiBvZmYtYnktaGFsZiBlcnJv ci4KKworICAgICAgICBUbyB0ZXN0IHRoZSBmb3JtZXIsIGZvbGxvdyBpbnN0cnVjdGlvbnMgaW4g dGhlIGJ1Zy4gIFRvIHRlc3QgdGhlCisgICAgICAgIGxhdHRlciwgY2hhbmdlIEdMX05FQVJFU1Qg dG8gR0xfTElORUFSIGluIExheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAuCisgICAgICAgIFNjcm9s bGluZyBzaG91bGQgd29yayBwcm9wZXJseSBmb3IgYWxsIHdpbmRvdyBzaXplcywgd2l0aG91dCBi bHVycmluZworICAgICAgICBpbWFnZXMgYW5kIHNoaWZ0aW5nIHRoZW0gdG8gdGhlIGxlZnQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21p dW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5 ZXJzKToKKwogMjAxMC0wOC0xNiAgUGF1bCBTYXdheWEgIDxwc2F3YXlhQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBNYXJyaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAK aW5kZXggMmY3MGVmYS4uY2ZiMDhhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAtMzkw LDggKzM5MCw4IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0 IEludFJlY3QmIHVwZGF0ZVJlY3QsIGNvbnN0IEludFJlY3QmCiAjZXJyb3IgIk5lZWQgdG8gaW1w bGVtZW50IGZvciB5b3VyIHBsYXRmb3JtLiIKICNlbmRpZgogCi0gICAgICAgIHNjcm9sbGVkTGF5 ZXJNYXRyaXgudHJhbnNsYXRlM2QoKGludClmbG9vcmYoMC41ICogdmlzaWJsZVJlY3Qud2lkdGgo KSkgLSBzY3JvbGxEZWx0YS54KCksCi0gICAgICAgICAgICAoaW50KWZsb29yZigwLjUgKiB2aXNp YmxlUmVjdC5oZWlnaHQoKSkgKyBzY2FsZUZhY3RvciAqIHNjcm9sbERlbHRhLnkoKSwgMCk7Cisg ICAgICAgIHNjcm9sbGVkTGF5ZXJNYXRyaXgudHJhbnNsYXRlM2QoMC41ICogdmlzaWJsZVJlY3Qu d2lkdGgoKSAtIHNjcm9sbERlbHRhLngoKSwKKyAgICAgICAgICAgIDAuNSAqIHZpc2libGVSZWN0 LmhlaWdodCgpICsgc2NhbGVGYWN0b3IgKiBzY3JvbGxEZWx0YS55KCksIDApOwogICAgICAgICBz Y3JvbGxlZExheWVyTWF0cml4LnNjYWxlM2QoMSwgLTEsIDEpOwogCiAgICAgICAgIC8vIFN3aXRj aCBzaGFkZXJzIHRvIGF2b2lkIFJHQiBzd2l6emxpbmcuCkBAIC00MDYsNyArNDA2LDEwIEBAIHZv aWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IEludFJlY3QmIHVwZGF0 ZVJlY3QsIGNvbnN0IEludFJlY3QmCiAKICAgICAgICAgY2hlY2tHTEVycm9yKCk7CiAgICAgICAg IG1fc2Nyb2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKLSAgICB9CisgICAgfSBlbHNlIGlm IChhYnMoc2Nyb2xsRGVsdGEueSgpKSA+IGNvbnRlbnRSZWN0LmhlaWdodCgpIHx8IGFicyhzY3Jv bGxEZWx0YS54KCkpID4gY29udGVudFJlY3Qud2lkdGgoKSkKKyAgICAgICAgLy8gU2Nyb2xsaW5n IGxhcmdlciB0aGFuIHRoZSBjb250ZW50UmVjdCBzaXplIGRvZXMgbm90IHByZXNlcnZlIGFueSBv ZiB0aGUgcGl4ZWxzLCBzbyB0aGVyZSBpcworICAgICAgICAvLyBubyBuZWVkIHRvIGNvcHkgZnJh bWVidWZmZXIgcGl4ZWxzIGJhY2sgaW50byB0aGUgdGV4dHVyZS4KKyAgICAgICAgbV9zY3JvbGxQ b3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwogCiAgICAgLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcg Y2hlY2sgc2hvdWxkIGdvIGF3YXkgd2hlbiB0aGUgY29tcG9zaXRvciByZW5kZXJzIGluZGVwZW5k ZW50bHkgZnJvbSBpdHMgb3duIHRocmVhZC4KICAgICAvLyBJZ25vcmUgYSAxeDEgdXBkYXRlIHJl Y3QgYXQgKDAsIDApIGFzIHRoYXQncyB1c2VkIGEgd2F5IHRvIGtpY2sgb2ZmIGEgcmVkcmF3IGZv ciB0aGUgY29tcG9zaXRvci4K 64613 2010-08-17 11:47:00 -0700 2010-08-18 22:38:37 -0700 added braces 0001-Done.patch text/plain 2833 amarinichev ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTYzZjZjNS4uNDdhYjE2MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wOC0xNiAgQWxleGV5IE1hcmlu aWNoZXYgIDxhbWFyaW5pY2hldkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBzY3JvbGxpbmcgaXNzdWVzIHdo ZW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRvciBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzk5MgorCisgICAgICAgIENvcnJlY3RlZCBz Y3JvbGwgcG9zaXRpb24gbm90IGJlaW5nIHVwZGF0ZWQsIGFuZCBhbiBvZmYtYnktaGFsZiBlcnJv ci4KKyAgICAgICAgSW50IGNhc3QgYW5kIGZsb29yZiBhcmUgdGFrZW4gb3V0IGJlY2F1c2UgdGhl eSBwcm9kdWNlIGluY29ycmVjdAorICAgICAgICB0cmFuc2Zvcm1hdGlvbiBtYXRyaXguICBUaGUg aW5mb3JtYXRpb24gbG9zdCB0aGVyZSBpcyBub3QgaW1tZWRpYXRlbHkKKyAgICAgICAgb2J2aW91 cyBiZWNhdXNlIG9mIHJvdW5kaW5nIHRoYXQgaGFwcGVucyB3aGVuIHRleHR1cmUgaXMgbWFwcGVk IHdpdGgKKyAgICAgICAgR0xfTkVBUkVTVCBmaWx0ZXJpbmcgbW9kZS4gIFRoZXNlIGVycm9ycyBh Y2N1bXVsYXRlLCBhbmQgYWZ0ZXIgc29tZQorICAgICAgICBzY3JvbGxpbmcgaXQgYmVjb21lcyBt b3JlIGFwcGFyZW50LgorCisgICAgICAgIFRvIHRlc3QgdGhlIGZvcm1lciwgZm9sbG93IGluc3Ry dWN0aW9ucyBpbiB0aGUgYnVnLiAgVG8gdGVzdCB0aGUKKyAgICAgICAgbGF0dGVyLCBjaGFuZ2Ug R0xfTkVBUkVTVCB0byBHTF9MSU5FQVIgaW4gTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcC4KKyAg ICAgICAgU2Nyb2xsaW5nIHNob3VsZCB3b3JrIHByb3Blcmx5IGZvciBhbGwgd2luZG93IHNpemVz LCB3aXRob3V0IGJsdXJyaW5nCisgICAgICAgIGltYWdlcyBhbmQgc2hpZnRpbmcgdGhlbSB0byB0 aGUgbGVmdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVu ZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21p dW06OmRyYXdMYXllcnMpOgorCiAyMDEwLTA4LTE2ICBQYXVsIFNhd2F5YSAgPHBzYXdheWFAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENocmlzIE1hcnJpbi4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVt LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNo cm9taXVtLmNwcAppbmRleCAyZjcwZWZhLi42YmI4MmIwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u Y3BwCkBAIC0zOTAsOCArMzkwLDggQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdM YXllcnMoY29uc3QgSW50UmVjdCYgdXBkYXRlUmVjdCwgY29uc3QgSW50UmVjdCYKICNlcnJvciAi TmVlZCB0byBpbXBsZW1lbnQgZm9yIHlvdXIgcGxhdGZvcm0uIgogI2VuZGlmCiAKLSAgICAgICAg c2Nyb2xsZWRMYXllck1hdHJpeC50cmFuc2xhdGUzZCgoaW50KWZsb29yZigwLjUgKiB2aXNpYmxl UmVjdC53aWR0aCgpKSAtIHNjcm9sbERlbHRhLngoKSwKLSAgICAgICAgICAgIChpbnQpZmxvb3Jm KDAuNSAqIHZpc2libGVSZWN0LmhlaWdodCgpKSArIHNjYWxlRmFjdG9yICogc2Nyb2xsRGVsdGEu eSgpLCAwKTsKKyAgICAgICAgc2Nyb2xsZWRMYXllck1hdHJpeC50cmFuc2xhdGUzZCgwLjUgKiB2 aXNpYmxlUmVjdC53aWR0aCgpIC0gc2Nyb2xsRGVsdGEueCgpLAorICAgICAgICAgICAgMC41ICog dmlzaWJsZVJlY3QuaGVpZ2h0KCkgKyBzY2FsZUZhY3RvciAqIHNjcm9sbERlbHRhLnkoKSwgMCk7 CiAgICAgICAgIHNjcm9sbGVkTGF5ZXJNYXRyaXguc2NhbGUzZCgxLCAtMSwgMSk7CiAKICAgICAg ICAgLy8gU3dpdGNoIHNoYWRlcnMgdG8gYXZvaWQgUkdCIHN3aXp6bGluZy4KQEAgLTQwNiw2ICs0 MDYsMTAgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMoY29uc3QgSW50 UmVjdCYgdXBkYXRlUmVjdCwgY29uc3QgSW50UmVjdCYKIAogICAgICAgICBjaGVja0dMRXJyb3Io KTsKICAgICAgICAgbV9zY3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOworICAgIH0gZWxz ZSBpZiAoYWJzKHNjcm9sbERlbHRhLnkoKSkgPiBjb250ZW50UmVjdC5oZWlnaHQoKSB8fCBhYnMo c2Nyb2xsRGVsdGEueCgpKSA+IGNvbnRlbnRSZWN0LndpZHRoKCkpIHsKKyAgICAgICAgLy8gU2Ny b2xsaW5nIGxhcmdlciB0aGFuIHRoZSBjb250ZW50UmVjdCBzaXplIGRvZXMgbm90IHByZXNlcnZl IGFueSBvZiB0aGUgcGl4ZWxzLCBzbyB0aGVyZSBpcworICAgICAgICAvLyBubyBuZWVkIHRvIGNv cHkgZnJhbWVidWZmZXIgcGl4ZWxzIGJhY2sgaW50byB0aGUgdGV4dHVyZS4KKyAgICAgICAgbV9z Y3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBU aGUgZm9sbG93aW5nIGNoZWNrIHNob3VsZCBnbyBhd2F5IHdoZW4gdGhlIGNvbXBvc2l0b3IgcmVu ZGVycyBpbmRlcGVuZGVudGx5IGZyb20gaXRzIG93biB0aHJlYWQuCg==