Title: [111398] trunk/Source/WebKit/blackberry
- Revision
- 111398
- Author
- [email protected]
- Date
- 2012-03-20 08:31:16 -0700 (Tue, 20 Mar 2012)
Log Message
[BlackBerry] Removing doubly defined methods in BackingStore.cpp
https://bugs.webkit.org/show_bug.cgi?id=81664
Patch by Nima Ghanavatian <[email protected]> on 2012-03-20
Reviewed by Rob Buis.
* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::drawAndBlendLayersForDirectRendering):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (111397 => 111398)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-03-20 15:24:49 UTC (rev 111397)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-03-20 15:31:16 UTC (rev 111398)
@@ -2568,47 +2568,7 @@
blendCompositingSurface(visibleDirtyRect);
#endif
}
-
-bool BackingStorePrivate::drawLayersOnCommitIfNeeded()
-{
- // Check if rendering caused a commit and we need to redraw the layers
- if (!m_needsDrawLayersOnCommit)
- return false;
-
- m_needsDrawLayersOnCommit = false;
- m_webPage->d->drawLayersOnCommit();
-
- return true;
-}
-
-void BackingStorePrivate::drawAndBlendLayersForDirectRendering(const Platform::IntRect& dirtyRect)
-{
- ASSERT(BlackBerry::Platform::userInterfaceThreadMessageClient()->isCurrentThread());
- if (!BlackBerry::Platform::userInterfaceThreadMessageClient()->isCurrentThread())
- return;
-
- // Because we're being called sync from the WebKit thread, we can use
- // regular WebPage size and transformation functions without concerns.
- WebCore::IntRect contentsRect = visibleContentsRect();
- WebCore::FloatRect untransformedContentsRect = m_webPage->d->mapFromTransformedFloatRect(WebCore::FloatRect(contentsRect));
- WebCore::IntRect contentsScreenRect = m_client->mapFromTransformedContentsToTransformedViewport(contentsRect);
- WebCore::IntRect dstRect = intersection(contentsScreenRect,
- WebCore::IntRect(WebCore::IntPoint(0, 0), m_webPage->d->transformedViewportSize()));
-
- // Check if rendering caused a commit and we need to redraw the layers.
- m_needsDrawLayersOnCommit = false;
- m_webPage->d->drawSubLayers(dstRect, untransformedContentsRect);
-
-#if ENABLE_COMPOSITING_SURFACE
- // See above comment about sync calling, visibleContentsRect() is safe here.
- Platform::IntRect visibleDirtyRect = dirtyRect;
- visibleDirtyRect.intersect(visibleContentsRect());
- visibleDirtyRect = m_client->mapFromTransformedContentsToTransformedViewport(visibleDirtyRect);
-
- blendCompositingSurface(visibleDirtyRect);
#endif
-}
-#endif
bool BackingStorePrivate::isActive() const
{
Modified: trunk/Source/WebKit/blackberry/ChangeLog (111397 => 111398)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-20 15:24:49 UTC (rev 111397)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-20 15:31:16 UTC (rev 111398)
@@ -1,3 +1,13 @@
+2012-03-20 Nima Ghanavatian <[email protected]>
+
+ [BlackBerry] Removing doubly defined methods in BackingStore.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=81664
+
+ Reviewed by Rob Buis.
+
+ * Api/BackingStore.cpp:
+ (BlackBerry::WebKit::BackingStorePrivate::drawAndBlendLayersForDirectRendering):
+
2012-03-20 Mike Fenton <[email protected]>
[BlackBerry] Crash when dragging the FCC caret over an invalid node.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
