2011-03-15 Alok priyadarshi <alokp@chromium.org>

        Reviewed by James Robinson.

        Remove unnecessary function WebPlugin::getBackingTextureId
        https://bugs.webkit.org/show_bug.cgi?id=56122

        It will be tested by Pepper2D and Pepper3D layout/smoke tests
        on the Chromium side.

        * public/WebPlugin.h:
        * src/WebPluginContainerImpl.cpp:
        (WebKit::WebPluginContainerImpl::platformLayer):

git-svn-id: svn://svn.chromium.org/blink/trunk@81143 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit/chromium/ChangeLog

+2011-03-15  Alok priyadarshi  <alokp@chromium.org>
+
+        Reviewed by James Robinson.
+
+        Remove unnecessary function WebPlugin::getBackingTextureId
+        https://bugs.webkit.org/show_bug.cgi?id=56122
+
+        It will be tested by Pepper2D and Pepper3D layout/smoke tests
+        on the Chromium side.
+
+        * public/WebPlugin.h:
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::platformLayer):
+
 2011-03-15  Mikhail Naganov  <mnaganov@chromium.org>
 
         Unreviewed. Update chromium deps to pick up the latest V8.

third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h

@@ -64,10 +64,6 @@ public:
     virtual void updateGeometry(
         const WebRect& frameRect, const WebRect& clipRect,
         const WebVector<WebRect>& cutOutsRects, bool isVisible) = 0;
-    
-    // If the plugin instance is backed by an OpenGL texture, return its ID in the
-    // compositors namespace. Otherwise return 0. Returns 0 by default.
-    virtual unsigned getBackingTextureId() { return 0; }
 
     virtual void updateFocus(bool) = 0;
     virtual void updateVisibility(bool) = 0;

third_party/WebKit/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -443,15 +443,7 @@ void WebPluginContainerImpl::willDestroyPluginLoadObserver(WebPluginLoadObserver
 #if USE(ACCELERATED_COMPOSITING)
 WebCore::LayerChromium* WebPluginContainerImpl::platformLayer() const
 {
-    // FIXME: In the event of a context lost, the texture needs to be recreated on the compositor's
-    // context and rebound to the platform layer here.
-    unsigned backingTextureId = m_webPlugin->getBackingTextureId();
-    if (!backingTextureId)
-        return 0;
-
-    m_platformLayer->setTextureId(backingTextureId);
-
-    return m_platformLayer.get();
+    return m_platformLayer->getTextureId() ? m_platformLayer.get() : 0;
 }
 #endif