1 files changed, 1 insertions, 30 deletions
diff --git a/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp b/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp
index c50c8804e..9e740fdf0 100644
--- a/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp
+++ b/Source/WebKit/blackberry/WebKitSupport/GLES2Context.cpp
@@ -32,7 +32,6 @@
 #include "config.h"
 #include "GLES2Context.h"
 
-#include "BackingStoreCompositingSurface.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "SurfacePool.h"
@@ -48,21 +47,11 @@ using BlackBerry::Platform::Graphics::Window;
 namespace BlackBerry {
 namespace WebKit {
 
-BackingStoreCompositingSurface* GLES2Context::compositingSurface() const
-{
-    return SurfacePool::globalSurfacePool()->compositingSurface();
-}
-
 Platform::Graphics::Buffer* GLES2Context::buffer() const
 {
     if (m_window)
         return m_window->buffer();
 
-#if ENABLE_COMPOSITING_SURFACE
-    if (BackingStoreCompositingSurface* surface = compositingSurface())
-        return surface->backBuffer()->nativeBuffer();
-#endif
-
     ASSERT_NOT_REACHED();
     return 0;
 }
@@ -90,11 +79,6 @@ Platform::IntSize GLES2Context::surfaceSize() const
     if (m_window)
         return m_window->surfaceSize();
 
-#if ENABLE_COMPOSITING_SURFACE
-    if (BackingStoreCompositingSurface* surface = compositingSurface())
-        return surface->backBuffer()->surfaceSize();
-#endif
-
     ASSERT_NOT_REACHED();
     return Platform::IntSize();
 }
@@ -108,20 +92,7 @@ bool GLES2Context::swapBuffers()
 {
     ASSERT(glGetError() == GL_NO_ERROR);
 
-    // If there's a window the backing store will swap it when the time is right.
-    // Return early because there might be an unused but non-null compositing surface
-    if (m_window)
-        return true;
-
-#if ENABLE_COMPOSITING_SURFACE
-    if (BackingStoreCompositingSurface* surface = compositingSurface()) {
-        // Because we are rendering compositing contents into an off-screen pixmap and
-        // we need to blend the pixmap with the web page window surface we have to call
-        // glFinish() here.
-        glFinish();
-        surface->swapBuffers();
-    }
-#endif
+    // Nothing to do here, the backing store will swap it when the time is right.
 
     return true;
 }