Title: [151735] trunk/Source/WebKit/blackberry
- Revision
- 151735
- Author
- [email protected]
- Date
- 2013-06-19 08:30:25 -0700 (Wed, 19 Jun 2013)
Log Message
[BlackBerry] Prevent loss of tile buffers in BackingStorePrivate::render()
https://bugs.webkit.org/show_bug.cgi?id=117799
https://jira.bbqnx.net/browse/BRWSR-11712
JIRA413289
Patch by Jakob Petsovits <[email protected]> on 2013-06-19
Reviewed by Carlos Garcia Campos.
Discovered by Xuefei Ren.
If, in rare cases, renderContents() returns false,
the for() loop in render() will take a tile buffer from
the surface pool but due to aborting the iteration early,
won't put it into the new tile map. In order to prevent
losing the buffer, we need to put it back into the
surface pool before continuing.
* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::render):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (151734 => 151735)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2013-06-19 15:23:32 UTC (rev 151734)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2013-06-19 15:30:25 UTC (rev 151735)
@@ -1171,8 +1171,11 @@
const Platform::FloatPoint documentDirtyRectOrigin = viewportAccessor->toDocumentContents(dirtyRect.location(), currentScale);
const Platform::IntRect dstRect(dirtyRect.location() - tileOrigin, dirtyRect.size());
- if (!renderContents(nativeBuffer, dstRect, currentScale, documentDirtyRectOrigin, RenderRootLayer))
+ if (!renderContents(nativeBuffer, dstRect, currentScale, documentDirtyRectOrigin, RenderRootLayer)) {
+ // Put the buffer back into the surface pool so it doesn't get lost.
+ SurfacePool::globalSurfacePool()->addBackBuffer(backBuffer);
continue;
+ }
// Add the newly rendered region to the tile so it can keep track for blits.
backBuffer->addRenderedRegion(dirtyRect);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151734 => 151735)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-19 15:23:32 UTC (rev 151734)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-19 15:30:25 UTC (rev 151735)
@@ -1,3 +1,24 @@
+2013-06-19 Jakob Petsovits <[email protected]>
+
+ [BlackBerry] Prevent loss of tile buffers in BackingStorePrivate::render()
+ https://bugs.webkit.org/show_bug.cgi?id=117799
+ https://jira.bbqnx.net/browse/BRWSR-11712
+ JIRA413289
+
+ Reviewed by Carlos Garcia Campos.
+
+ Discovered by Xuefei Ren.
+
+ If, in rare cases, renderContents() returns false,
+ the for() loop in render() will take a tile buffer from
+ the surface pool but due to aborting the iteration early,
+ won't put it into the new tile map. In order to prevent
+ losing the buffer, we need to put it back into the
+ surface pool before continuing.
+
+ * Api/BackingStore.cpp:
+ (BlackBerry::WebKit::BackingStorePrivate::render):
+
2013-06-17 Tiancheng Jiang <[email protected]>
Cache FatFinger Text Result.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes