1 files changed, 5 insertions, 20 deletions
diff --git a/Source/WebKit/blackberry/Api/WebOverlay.cpp b/Source/WebKit/blackberry/Api/WebOverlay.cpp
index abafe7139..e01694cef 100644
--- a/Source/WebKit/blackberry/Api/WebOverlay.cpp
+++ b/Source/WebKit/blackberry/Api/WebOverlay.cpp
@@ -215,10 +215,13 @@ WebPagePrivate* WebOverlayPrivate::page() const
 
 WebOverlayOverride* WebOverlayPrivate::override()
 {
+    if (!m_override)
+        m_override = adoptPtr(new WebOverlayOverride(this));
+
     // Page might have changed if we were removed from the page and added to
     // some other page.
-    if (m_override)
-        m_override->d->setPage(page());
+    m_override->d->setPage(page());
+
     return m_override.get();
 }
 
@@ -244,16 +247,6 @@ WebOverlayPrivateWebKitThread::WebOverlayPrivateWebKitThread(GraphicsLayerClient
     m_layerCompositingThread = m_layer->platformLayer()->layerCompositingThread();
 }
 
-WebOverlayOverride* WebOverlayPrivateWebKitThread::override()
-{
-    if (!m_override) {
-        WebOverlayPrivate* tmp = new WebOverlayPrivateCompositingThread(m_layerCompositingThread.get());
-        m_override = adoptPtr(new WebOverlayOverride(tmp, true));
-    }
-
-    return WebOverlayPrivate::override();
-}
-
 FloatPoint WebOverlayPrivateWebKitThread::position() const
 {
     return m_layer->position();
@@ -499,14 +492,6 @@ void WebOverlayPrivateCompositingThread::setClient(WebOverlayClient* client)
         m_layerCompositingThreadClient->setClient(q, client);
 }
 
-WebOverlayOverride* WebOverlayPrivateCompositingThread::override()
-{
-    if (!m_override)
-        m_override = adoptPtr(new WebOverlayOverride(this, false));
-
-    return WebOverlayPrivate::override();
-}
-
 FloatPoint WebOverlayPrivateCompositingThread::position() const
 {
     return m_layerCompositingThread->position();