Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit.org/repository/webkit/trunk@129343)

New snapshot with build fixes for latest qtbase

1 files changed, 0 insertions, 72 deletions

diff --git a/Source/WebKit/blackberry/Api/BackingStore.cpp b/Source/WebKit/blackberry/Api/BackingStore.cpp
index 5aacd73ea..be2f9ebd3 100644
--- a/Source/WebKit/blackberry/Api/BackingStore.cpp
+++ b/Source/WebKit/blackberry/Api/BackingStore.cpp
@@ -20,7 +20,6 @@
 #include "BackingStore.h"
 
 #include "BackingStoreClient.h"
-#include "BackingStoreCompositingSurface.h"
 #include "BackingStoreTile.h"
 #include "BackingStore_p.h"
 #include "FatFingers.h"
@@ -62,7 +61,6 @@
 #define DEBUG_WEBCORE_REQUESTS 0
 #define DEBUG_VISUALIZE 0
 #define DEBUG_TILEMATRIX 0
-#define DEBUG_COMPOSITING_DIRTY_REGION 0
 
 using namespace WebCore;
 using namespace std;
@@ -293,10 +291,6 @@ void BackingStorePrivate::suspendScreenAndBackingStoreUpdates()
     ++m_suspendScreenUpdates;
 
     BlackBerry::Platform::userInterfaceThreadMessageClient()->syncToCurrentMessage();
-
-#if USE(ACCELERATED_COMPOSITING)
-    m_webPage->d->resetCompositingSurface();
-#endif
 }
 
 void BackingStorePrivate::resumeScreenAndBackingStoreUpdates(BackingStore::ResumeUpdateOperation op)
@@ -1489,9 +1483,6 @@ void BackingStorePrivate::blitContents(const Platform::IntRect& dstRect,
         if (compositor->drawsRootLayer())
             paintDefaultBackground(contents, transformation, false /*flush*/);
     }
-
-    if (!isOpenGLCompositing())
-        blendCompositingSurface(dstRect);
 #endif
 
 #if ENABLE_SCROLLBARS
@@ -1659,60 +1650,6 @@ Platform::IntRect BackingStorePrivate::blitTileRect(TileBuffer* tileBuffer,
     return dirtyRect;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
-void BackingStorePrivate::blendCompositingSurface(const Platform::IntRect& dstRect)
-{
-    if (!BlackBerry::Platform::userInterfaceThreadMessageClient()->isCurrentThread()) {
-        typedef void (BlackBerry::WebKit::BackingStorePrivate::*FunctionType)(const Platform::IntRect&);
-        BlackBerry::Platform::userInterfaceThreadMessageClient()->dispatchMessage(
-            BlackBerry::Platform::createMethodCallMessage<FunctionType, BackingStorePrivate, Platform::IntRect>(
-                &BackingStorePrivate::blendCompositingSurface, this, dstRect));
-        return;
-    }
-
-    BackingStoreCompositingSurface* compositingSurface =
-        SurfacePool::globalSurfacePool()->compositingSurface();
-
-    if (!compositingSurface || !m_webPage->isVisible())
-        return;
-
-    WebCore::LayerRenderingResults lastCompositingResults = m_webPage->d->lastCompositingResults();
-    for (size_t i = 0; i < lastCompositingResults.holePunchRectSize(); i++) {
-        Platform::IntRect holePunchRect = lastCompositingResults.holePunchRect(i);
-
-        holePunchRect.intersect(dstRect);
-        holePunchRect.intersect(Platform::IntRect(
-            Platform::IntPoint(0, 0), surfaceSize()));
-
-        if (!holePunchRect.isEmpty())
-            clearWindow(holePunchRect, 0, 0, 0, 0);
-    }
-
-    CompositingSurfaceBuffer* frontBuffer = compositingSurface->frontBuffer();
-
-    IntRectList rects = lastCompositingResults.dirtyRegion.rects();
-    for (size_t i = 0; i < rects.size(); ++i) {
-        rects[i].intersect(dstRect);
-#if DEBUG_COMPOSITING_DIRTY_REGION
-        clearBuffer(buffer(), rects[i], 255, 0, 0, 128);
-#endif
-        blitToWindow(rects[i], frontBuffer->nativeBuffer(), rects[i], true /*blend*/, 255);
-    }
-}
-
-void BackingStorePrivate::clearCompositingSurface()
-{
-    BackingStoreCompositingSurface* compositingSurface =
-        SurfacePool::globalSurfacePool()->compositingSurface();
-
-    if (!compositingSurface)
-        return;
-
-    CompositingSurfaceBuffer* frontBuffer = compositingSurface->frontBuffer();
-    BlackBerry::Platform::Graphics::clearBuffer(frontBuffer->nativeBuffer(), Platform::IntRect(Platform::IntPoint(), frontBuffer->surfaceSize()), 0, 0, 0, 0);
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
 void BackingStorePrivate::blitHorizontalScrollbar(const Platform::IntPoint& scrollPosition)
 {
     if (!m_webPage->isVisible())
@@ -2614,15 +2551,6 @@ void BackingStorePrivate::drawAndBlendLayersForDirectRendering(const Platform::I
     // Check if rendering caused a commit and we need to redraw the layers.
     if (WebPageCompositorPrivate* compositor = m_webPage->d->compositor())
         compositor->drawLayers(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