[BlackBerry] Removing doubly defined methods in BackingStore.cpp

https://bugs.webkit.org/show_bug.cgi?id=81664

Patch by Nima Ghanavatian <nghanavatian@rim.com> on 2012-03-20
Reviewed by Rob Buis.

* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::drawAndBlendLayersForDirectRendering):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/blackberry/Api/BackingStore.cpp b/Source/WebKit/blackberry/Api/BackingStore.cpp
index b4a4addf1141b4eb0e3bf62a7226c7510e913dd0..e5806b3aa7302d568d87c90aa2d1800a281d3d29 100644 (file)
--- a/Source/WebKit/blackberry/Api/BackingStore.cpp
+++ b/Source/WebKit/blackberry/Api/BackingStore.cpp
@@ -2541,46 +2541,6 @@ bool BackingStorePrivate::drawLayersOnCommitIfNeeded()
     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
-}
-
-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());

diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
index 23027682728bcb4b2ecb3852debf02f1810ab0e6..c1bf4b7182a4d6c12bc0399f77c7340b7bd4e371 100644 (file)
--- a/Source/WebKit/blackberry/ChangeLog
+++ b/Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-20  Nima Ghanavatian  <nghanavatian@rim.com>
+
+        [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  <mifenton@rim.com>
 
         [BlackBerry] Crash when dragging the FCC caret over an invalid node.