- Revision
- 138223
- Author
- pi...@chromium.org
- Date
- 2012-12-19 21:50:30 -0800 (Wed, 19 Dec 2012)
Log Message
[chromium] Remove old setBackingTextureId/setBackingIOSurfaceId API on WebPluginContainer
https://bugs.webkit.org/show_bug.cgi?id=105472
Reviewed by James Robinson.
This is not called anymore by chromium (as of r173545), using
setWebPlugin instead.
* public/WebPluginContainer.h:
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::WebPluginContainerImpl):
* src/WebPluginContainerImpl.h:
(WebPluginContainerImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138222 => 138223)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:50:30 UTC (rev 138223)
@@ -1,3 +1,19 @@
+2012-12-19 Antoine Labour <pi...@chromium.org>
+
+ [chromium] Remove old setBackingTextureId/setBackingIOSurfaceId API on WebPluginContainer
+ https://bugs.webkit.org/show_bug.cgi?id=105472
+
+ Reviewed by James Robinson.
+
+ This is not called anymore by chromium (as of r173545), using
+ setWebPlugin instead.
+
+ * public/WebPluginContainer.h:
+ * src/WebPluginContainerImpl.cpp:
+ (WebKit::WebPluginContainerImpl::WebPluginContainerImpl):
+ * src/WebPluginContainerImpl.h:
+ (WebPluginContainerImpl):
+
2012-12-19 Mark Pilgrim <pilg...@chromium.org>
[Chromium] add setIDBFactory method for embedders to call
Modified: trunk/Source/WebKit/chromium/public/WebPluginContainer.h (138222 => 138223)
--- trunk/Source/WebKit/chromium/public/WebPluginContainer.h 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/public/WebPluginContainer.h 2012-12-20 05:50:30 UTC (rev 138223)
@@ -64,25 +64,7 @@
// Causes the container to report its current geometry via
// WebPlugin::updateGeometry.
virtual void reportGeometry() = 0;
-
- // Sets the id of the texture used for hw-accel compositing.
- // The default value for id is zero which indicates software rendering.
- // A non-zero value will trigger hw-accelerated compositing.
- virtual void setBackingTextureId(unsigned) = 0;
- // Notifies the container that the plugin allocated a new IOSurface for
- // its rendering, and that the compositor should bind to this texture
- // and use it for subsequent rendering. A non-zero ioSurfaceId triggers
- // hardware-accelerated compositing; a zero value switches back to the
- // software rendered path. (This entry point is used only on Mac OS,
- // but is defined on all platforms for simplicity.)
- virtual void setBackingIOSurfaceId(int width,
- int height,
- uint32_t ioSurfaceId) = 0;
- // Called when the backing texture is ready to be composited.
- // FIXME: consider renaming to something more general, now that
- // there are multiple providers. One idea: commitBackingStore.
- virtual void commitBackingTexture() {}
-
+
// Drop any references to script objects allocated by the plugin.
// These are objects derived from WebPlugin::scriptableObject. This is
// called when the plugin is being destroyed or if it needs to be
@@ -111,9 +93,6 @@
// Note, this does NOT affect pageScaleFactor or pageZoomFactor
virtual void zoomLevelChanged(double zoomLevel) = 0;
- // Notifies whether the contents of the plugin are entirely opaque.
- virtual void setOpaque(bool) = 0;
-
// Determines whether the given rectangle in this plugin is above all other
// content. The rectangle is in the plugin's coordinate system.
virtual bool isRectTopmost(const WebRect&) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (138222 => 138223)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-12-20 05:50:30 UTC (rev 138223)
@@ -390,50 +390,6 @@
}
}
-void WebPluginContainerImpl::setBackingTextureId(unsigned textureId)
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (m_textureId == textureId)
- return;
-
- ASSERT(!m_ioSurfaceLayer);
-
- if (!m_textureLayer)
- m_textureLayer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer());
- m_textureLayer->setTextureId(textureId);
- m_textureId = textureId;
-
- setWebLayer(m_textureId ? m_textureLayer->layer() : 0);
-#endif
-}
-
-void WebPluginContainerImpl::setBackingIOSurfaceId(int width,
- int height,
- uint32_t ioSurfaceId)
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (ioSurfaceId == m_ioSurfaceId)
- return;
-
- ASSERT(!m_textureLayer);
-
- if (!m_ioSurfaceLayer)
- m_ioSurfaceLayer = adoptPtr(Platform::current()->compositorSupport()->createIOSurfaceLayer());
- m_ioSurfaceLayer->setIOSurfaceProperties(ioSurfaceId, WebSize(width, height));
-
- m_ioSurfaceId = ioSurfaceId;
- setWebLayer(m_ioSurfaceId ? m_ioSurfaceLayer->layer() : 0);
-#endif
-}
-
-void WebPluginContainerImpl::commitBackingTexture()
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (m_webLayer)
- m_webLayer->invalidate();
-#endif
-}
-
void WebPluginContainerImpl::clearScriptObjects()
{
Frame* frame = m_element->document()->frame();
@@ -494,14 +450,6 @@
view->fullFramePluginZoomLevelChanged(zoomLevel);
}
-void WebPluginContainerImpl::setOpaque(bool opaque)
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (m_webLayer)
- m_webLayer->setOpaque(opaque);
-#endif
-}
-
bool WebPluginContainerImpl::isRectTopmost(const WebRect& rect)
{
Frame* frame = m_element->document()->frame();
@@ -659,10 +607,6 @@
: WebCore::PluginViewBase(0)
, m_element(element)
, m_webPlugin(webPlugin)
-#if USE(ACCELERATED_COMPOSITING)
- , m_textureId(0)
- , m_ioSurfaceId(0)
-#endif
, m_webLayer(0)
, m_touchEventRequestType(TouchEventRequestTypeNone)
, m_wantsWheelEvents(false)
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h (138222 => 138223)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h 2012-12-20 05:50:30 UTC (rev 138223)
@@ -35,7 +35,6 @@
#include "WebPluginContainer.h"
#include "Widget.h"
-#include <public/WebIOSurfaceLayer.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
@@ -101,17 +100,11 @@
virtual void invalidateRect(const WebRect&);
virtual void scrollRect(int dx, int dy, const WebRect&);
virtual void reportGeometry();
- virtual void setBackingTextureId(unsigned);
- virtual void setBackingIOSurfaceId(int width,
- int height,
- uint32_t ioSurfaceId);
- virtual void commitBackingTexture();
virtual void clearScriptObjects();
virtual NPObject* scriptableObjectForElement();
virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed);
virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData);
virtual void zoomLevelChanged(double zoomLevel);
- virtual void setOpaque(bool);
virtual bool isRectTopmost(const WebRect&);
virtual void requestTouchEventType(TouchEventRequestType);
virtual void setWantsWheelEvents(bool);
@@ -191,16 +184,6 @@
WebPlugin* m_webPlugin;
Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
-#if USE(ACCELERATED_COMPOSITING)
- // A composited plugin will either have no composited layer, a texture layer, or an IOSurface layer.
- // It will never have both a texture and IOSurface output.
- unsigned m_textureId;
- OwnPtr<WebExternalTextureLayer> m_textureLayer;
-
- unsigned m_ioSurfaceId;
- OwnPtr<WebIOSurfaceLayer> m_ioSurfaceLayer;
-#endif
-
WebLayer* m_webLayer;
// The associated scrollbar group object, created lazily. Used for Pepper
