Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (127335 => 127336)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-31 23:46:52 UTC (rev 127336)
@@ -1,3 +1,70 @@
+2012-08-31 James Robinson <[email protected]>
+
+ [chromium] Clean up Web*Layer initialization paths
+ https://bugs.webkit.org/show_bug.cgi?id=95523
+
+ Reviewed by Darin Fisher.
+
+ Constructing a Web*LayerImpl (or other compositor type) wrapper shouldn't require knowledge of the underyling
+ implementation. Also normalizes naming conventions in these files.
+
+ * src/WebAnimationImpl.cpp:
+ (WebKit::WebAnimation::create):
+ (WebKit::WebAnimationImpl::WebAnimationImpl):
+ * src/WebAnimationImpl.h:
+ (WebAnimationImpl):
+ * src/WebContentLayerImpl.cpp:
+ (WebKit::WebContentLayerImpl::WebContentLayerImpl):
+ (WebKit::WebContentLayerImpl::~WebContentLayerImpl):
+ (WebKit::WebContentLayerImpl::layer):
+ (WebKit::WebContentLayerImpl::setDoubleSided):
+ (WebKit::WebContentLayerImpl::setContentsScale):
+ (WebKit::WebContentLayerImpl::setUseLCDText):
+ (WebKit::WebContentLayerImpl::setDrawCheckerboardForMissingTiles):
+ * src/WebContentLayerImpl.h:
+ (WebContentLayerImpl):
+ * src/WebFloatAnimationCurveImpl.cpp:
+ (WebKit::WebFloatAnimationCurve::create):
+ (WebKit::WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl):
+ * src/WebFloatAnimationCurveImpl.h:
+ (WebFloatAnimationCurveImpl):
+ * src/WebIOSurfaceLayerImpl.cpp:
+ (WebKit::WebIOSurfaceLayer::create):
+ (WebKit::WebIOSurfaceLayerImpl::WebIOSurfaceLayerImpl):
+ * src/WebIOSurfaceLayerImpl.h:
+ (WebIOSurfaceLayerImpl):
+ * src/WebImageLayerImpl.cpp:
+ (WebKit::WebImageLayer::create):
+ (WebKit::WebImageLayerImpl::WebImageLayerImpl):
+ * src/WebImageLayerImpl.h:
+ (WebImageLayerImpl):
+ * src/WebLayerImpl.cpp:
+ (WebKit::WebLayer::create):
+ (WebKit):
+ (WebKit::WebLayerImpl::WebLayerImpl):
+ * src/WebLayerImpl.h:
+ (WebLayerImpl):
+ * src/WebScrollbarLayerImpl.cpp:
+ (WebKit::WebScrollbarLayer::create):
+ (WebKit::WebScrollbarLayerImpl::WebScrollbarLayerImpl):
+ * src/WebScrollbarLayerImpl.h:
+ (WebScrollbarLayerImpl):
+ * src/WebSolidColorLayerImpl.cpp:
+ (WebKit::WebSolidColorLayer::create):
+ (WebKit::WebSolidColorLayerImpl::WebSolidColorLayerImpl):
+ * src/WebSolidColorLayerImpl.h:
+ (WebSolidColorLayerImpl):
+ * src/WebTransformAnimationCurveImpl.cpp:
+ (WebKit::WebTransformAnimationCurve::create):
+ (WebKit::WebTransformAnimationCurveImpl::WebTransformAnimationCurveImpl):
+ * src/WebTransformAnimationCurveImpl.h:
+ (WebTransformAnimationCurveImpl):
+ * src/WebVideoLayerImpl.cpp:
+ (WebKit::WebVideoLayer::create):
+ (WebKit::WebVideoLayerImpl::WebVideoLayerImpl):
+ * src/WebVideoLayerImpl.h:
+ (WebVideoLayerImpl):
+
2012-08-31 Tony Chang <[email protected]>
Remove ENABLE_CSS3_FLEXBOX compile time flag
Modified: trunk/Source/WebKit/chromium/src/WebAnimationImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebAnimationImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebAnimationImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -41,13 +41,18 @@
WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetProperty targetProperty, int animationId)
{
- static int nextGroupId = 1;
- static int nextAnimationId = 1;
- return new WebAnimationImpl(curve, targetProperty, animationId ? animationId : nextAnimationId++, nextGroupId++);
+ return new WebAnimationImpl(curve, targetProperty, animationId, 0);
}
WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
{
+ static int nextAnimationId = 1;
+ static int nextGroupId = 1;
+ if (!animationId)
+ animationId = nextAnimationId++;
+ if (!groupId)
+ groupId = nextGroupId++;
+
WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
OwnPtr<WebCore::CCAnimationCurve> curve;
switch (curveType) {
Modified: trunk/Source/WebKit/chromium/src/WebAnimationImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebAnimationImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebAnimationImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -37,7 +37,7 @@
class WebAnimationImpl : public WebAnimation {
public:
- WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId, int groupId);
+ WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId, int groupId = 0);
virtual ~WebAnimationImpl();
// WebAnimation implementation
Modified: trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -44,40 +44,40 @@
}
WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client)
- : m_webLayerImpl(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
+ : m_layer(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this))))
, m_client(client)
{
- m_webLayerImpl->layer()->setIsDrawable(true);
+ m_layer->layer()->setIsDrawable(true);
}
WebContentLayerImpl::~WebContentLayerImpl()
{
- static_cast<ContentLayerChromium*>(m_webLayerImpl->layer())->clearClient();
+ static_cast<ContentLayerChromium*>(m_layer->layer())->clearClient();
}
WebLayer* WebContentLayerImpl::layer()
{
- return m_webLayerImpl.get();
+ return m_layer.get();
}
void WebContentLayerImpl::setDoubleSided(bool doubleSided)
{
- m_webLayerImpl->layer()->setDoubleSided(doubleSided);
+ m_layer->layer()->setDoubleSided(doubleSided);
}
void WebContentLayerImpl::setContentsScale(float scale)
{
- m_webLayerImpl->layer()->setContentsScale(scale);
+ m_layer->layer()->setContentsScale(scale);
}
void WebContentLayerImpl::setUseLCDText(bool enable)
{
- m_webLayerImpl->layer()->setUseLCDText(enable);
+ m_layer->layer()->setUseLCDText(enable);
}
void WebContentLayerImpl::setDrawCheckerboardForMissingTiles(bool enable)
{
- m_webLayerImpl->layer()->setDrawCheckerboardForMissingTiles(enable);
+ m_layer->layer()->setDrawCheckerboardForMissingTiles(enable);
}
Modified: trunk/Source/WebKit/chromium/src/WebContentLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebContentLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebContentLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -29,7 +29,7 @@
#include "ContentLayerChromiumClient.h"
#include "WebLayerImpl.h"
#include <public/WebContentLayer.h>
-#include <wtf/PassRefPtr.h>
+#include <wtf/OwnPtr.h>
namespace WebKit {
class WebContentLayerClient;
@@ -52,7 +52,7 @@
// ContentLayerChromiumClient implementation.
virtual void paintContents(SkCanvas*, const WebCore::IntRect& clip, WebCore::FloatRect& opaque) OVERRIDE;
- OwnPtr<WebLayerImpl> m_webLayerImpl;
+ OwnPtr<WebLayerImpl> m_layer;
WebContentLayerClient* m_client;
bool m_drawsContent;
};
Modified: trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -37,11 +37,11 @@
WebFloatAnimationCurve* WebFloatAnimationCurve::create()
{
- return new WebFloatAnimationCurveImpl(WebCore::CCKeyframedFloatAnimationCurve::create());
+ return new WebFloatAnimationCurveImpl();
}
-WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl(PassOwnPtr<WebCore::CCKeyframedFloatAnimationCurve> curve)
- : m_curve(curve)
+WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl()
+ : m_curve(WebCore::CCKeyframedFloatAnimationCurve::create())
{
}
Modified: trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -38,7 +38,7 @@
class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve {
public:
- explicit WebFloatAnimationCurveImpl(PassOwnPtr<WebCore::CCKeyframedFloatAnimationCurve>);
+ WebFloatAnimationCurveImpl();
virtual ~WebFloatAnimationCurveImpl();
// WebAnimationCurve implementation.
Modified: trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -35,14 +35,13 @@
WebIOSurfaceLayer* WebIOSurfaceLayer::create()
{
- RefPtr<IOSurfaceLayerChromium> layer = IOSurfaceLayerChromium::create();
- layer->setIsDrawable(true);
- return new WebIOSurfaceLayerImpl(layer.release());
+ return new WebIOSurfaceLayerImpl();
}
-WebIOSurfaceLayerImpl::WebIOSurfaceLayerImpl(PassRefPtr<IOSurfaceLayerChromium> layer)
- : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebIOSurfaceLayerImpl::WebIOSurfaceLayerImpl()
+ : m_layer(adoptPtr(new WebLayerImpl(IOSurfaceLayerChromium::create())))
{
+ m_layer->layer()->setIsDrawable(true);
}
WebIOSurfaceLayerImpl::~WebIOSurfaceLayerImpl()
Modified: trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -29,15 +29,11 @@
#include <public/WebIOSurfaceLayer.h>
#include <wtf/OwnPtr.h>
-namespace WebCore {
-class IOSurfaceLayerChromium;
-}
-
namespace WebKit {
class WebIOSurfaceLayerImpl : public WebIOSurfaceLayer {
public:
- explicit WebIOSurfaceLayerImpl(PassRefPtr<WebCore::IOSurfaceLayerChromium>);
+ WebIOSurfaceLayerImpl();
virtual ~WebIOSurfaceLayerImpl();
// WebIOSurfaceLayer implementation.
Modified: trunk/Source/WebKit/chromium/src/WebImageLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebImageLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebImageLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -35,11 +35,11 @@
WebImageLayer* WebImageLayer::create()
{
- return new WebImageLayerImpl(WebCore::ImageLayerChromium::create());
+ return new WebImageLayerImpl();
}
-WebImageLayerImpl::WebImageLayerImpl(PassRefPtr<WebCore::ImageLayerChromium> layer)
- : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebImageLayerImpl::WebImageLayerImpl()
+ : m_layer(adoptPtr(new WebLayerImpl(ImageLayerChromium::create())))
{
}
Modified: trunk/Source/WebKit/chromium/src/WebImageLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebImageLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebImageLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -38,7 +38,7 @@
class WebImageLayerImpl : public WebImageLayer {
public:
- explicit WebImageLayerImpl(PassRefPtr<WebCore::ImageLayerChromium>);
+ WebImageLayerImpl();
virtual ~WebImageLayerImpl();
// WebImageLayer implementation.
Modified: trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -79,14 +79,20 @@
WebLayer* WebLayer::create()
{
- return new WebLayerImpl(LayerChromium::create());
+ return new WebLayerImpl();
}
+WebLayerImpl::WebLayerImpl()
+ : m_layer(LayerChromium::create())
+{
+}
+
WebLayerImpl::WebLayerImpl(PassRefPtr<LayerChromium> layer)
: m_layer(layer)
{
}
+
WebLayerImpl::~WebLayerImpl()
{
m_layer->clearRenderSurface();
Modified: trunk/Source/WebKit/chromium/src/WebLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -27,6 +27,7 @@
#define WebLayerImpl_h
#include <public/WebLayer.h>
+#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
@@ -37,6 +38,7 @@
class WebLayerImpl : public WebLayer {
public:
+ WebLayerImpl();
explicit WebLayerImpl(PassRefPtr<WebCore::LayerChromium>);
virtual ~WebLayerImpl();
Modified: trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -35,12 +35,12 @@
WebScrollbarLayer* WebScrollbarLayer::create(WebScrollbar* scrollbar, WebScrollbarThemePainter painter, WebScrollbarThemeGeometry* geometry)
{
- return new WebScrollbarLayerImpl(ScrollbarLayerChromium::create(adoptPtr(scrollbar), painter, adoptPtr(geometry), 0));
+ return new WebScrollbarLayerImpl(scrollbar, painter, geometry);
}
-WebScrollbarLayerImpl::WebScrollbarLayerImpl(PassRefPtr<WebCore::ScrollbarLayerChromium> layer)
- : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebScrollbarLayerImpl::WebScrollbarLayerImpl(WebScrollbar* scrollbar, WebScrollbarThemePainter painter, WebScrollbarThemeGeometry* geometry)
+ : m_layer(adoptPtr(new WebLayerImpl(ScrollbarLayerChromium::create(adoptPtr(scrollbar), painter, adoptPtr(geometry), 0))))
{
}
Modified: trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebScrollbarLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -28,18 +28,13 @@
#include <public/WebScrollbarLayer.h>
#include <wtf/OwnPtr.h>
-#include <wtf/PassRefPtr.h>
-namespace WebCore {
-class ScrollbarLayerChromium;
-}
-
namespace WebKit {
class WebLayerImpl;
class WebScrollbarLayerImpl : public WebScrollbarLayer {
public:
- explicit WebScrollbarLayerImpl(PassRefPtr<WebCore::ScrollbarLayerChromium>);
+ WebScrollbarLayerImpl(WebScrollbar*, WebScrollbarThemePainter, WebScrollbarThemeGeometry*);
virtual ~WebScrollbarLayerImpl();
// WebScrollbarLayer implementation.
Modified: trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -35,11 +35,11 @@
WebSolidColorLayer* WebSolidColorLayer::create()
{
- return new WebSolidColorLayerImpl(SolidColorLayerChromium::create());
+ return new WebSolidColorLayerImpl();
}
-WebSolidColorLayerImpl::WebSolidColorLayerImpl(PassRefPtr<SolidColorLayerChromium> layer)
- : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebSolidColorLayerImpl::WebSolidColorLayerImpl()
+ : m_layer(adoptPtr(new WebLayerImpl(SolidColorLayerChromium::create())))
{
m_layer->layer()->setIsDrawable(true);
}
Modified: trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebSolidColorLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -28,18 +28,13 @@
#include <public/WebSolidColorLayer.h>
#include <wtf/OwnPtr.h>
-#include <wtf/PassRefPtr.h>
-namespace WebCore {
-class SolidColorLayerChromium;
-}
-
namespace WebKit {
class WebLayerImpl;
class WebSolidColorLayerImpl : public WebSolidColorLayer {
public:
- explicit WebSolidColorLayerImpl(PassRefPtr<WebCore::SolidColorLayerChromium>);
+ WebSolidColorLayerImpl();
virtual ~WebSolidColorLayerImpl();
// WebSolidColorLayer implementation.
Modified: trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -36,11 +36,11 @@
WebTransformAnimationCurve* WebTransformAnimationCurve::create()
{
- return new WebTransformAnimationCurveImpl(WebCore::CCKeyframedTransformAnimationCurve::create());
+ return new WebTransformAnimationCurveImpl();
}
-WebTransformAnimationCurveImpl::WebTransformAnimationCurveImpl(PassOwnPtr<WebCore::CCKeyframedTransformAnimationCurve> curve)
- : m_curve(curve)
+WebTransformAnimationCurveImpl::WebTransformAnimationCurveImpl()
+ : m_curve(WebCore::CCKeyframedTransformAnimationCurve::create())
{
}
Modified: trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -38,7 +38,7 @@
class WebTransformAnimationCurveImpl : public WebTransformAnimationCurve {
public:
- explicit WebTransformAnimationCurveImpl(PassOwnPtr<WebCore::CCKeyframedTransformAnimationCurve>);
+ WebTransformAnimationCurveImpl();
virtual ~WebTransformAnimationCurveImpl();
// WebAnimationCurve implementation.
Modified: trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.cpp (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.cpp 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.cpp 2012-08-31 23:46:52 UTC (rev 127336)
@@ -33,11 +33,11 @@
WebVideoLayer* WebVideoLayer::create(WebVideoFrameProvider* provider)
{
- return new WebVideoLayerImpl(WebCore::VideoLayerChromium::create(provider));
+ return new WebVideoLayerImpl(provider);
}
-WebVideoLayerImpl::WebVideoLayerImpl(PassRefPtr<WebCore::VideoLayerChromium> layer)
- : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebVideoLayerImpl::WebVideoLayerImpl(WebVideoFrameProvider* provider)
+ : m_layer(adoptPtr(new WebLayerImpl(WebCore::VideoLayerChromium::create(provider))))
{
}
Modified: trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.h (127335 => 127336)
--- trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.h 2012-08-31 23:42:35 UTC (rev 127335)
+++ trunk/Source/WebKit/chromium/src/WebVideoLayerImpl.h 2012-08-31 23:46:52 UTC (rev 127336)
@@ -28,16 +28,12 @@
#include <public/WebVideoLayer.h>
-namespace WebCore {
-class VideoLayerChromium;
-}
-
namespace WebKit {
class WebLayerImpl;
class WebVideoLayerImpl : public WebVideoLayer {
public:
- explicit WebVideoLayerImpl(PassRefPtr<WebCore::VideoLayerChromium>);
+ explicit WebVideoLayerImpl(WebVideoFrameProvider*);
virtual ~WebVideoLayerImpl();
// WebVideoLayer implementation.
