Diff
Modified: trunk/Source/Platform/ChangeLog (127224 => 127225)
--- trunk/Source/Platform/ChangeLog 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/Platform/ChangeLog 2012-08-31 03:30:56 UTC (rev 127225)
@@ -1,5 +1,34 @@
2012-08-30 James Robinson <[email protected]>
+ [chromium] Revert WebCompositorSupport to raw ptrs, make dtor protected
+ https://bugs.webkit.org/show_bug.cgi?id=95520
+
+ Reviewed by Darin Fisher.
+
+ WebPassOwnPtr<T> isn't quite usable from the chromium side - it needs some more work and isn't worth blocking
+ WebCompositorSupport for. Also, the d'tor for WebCompositorSupport needs to be protected, not private, so it can
+ be implemented.
+
+ * Platform.gypi:
+ * chromium/public/WebCompositorSupport.h:
+ (WebKit):
+ (WebKit::WebCompositorSupport::createLayerTreeView):
+ (WebKit::WebCompositorSupport::createLayer):
+ (WebKit::WebCompositorSupport::createContentLayer):
+ (WebKit::WebCompositorSupport::createExternalTextureLayer):
+ (WebKit::WebCompositorSupport::createIOSurfaceLayer):
+ (WebKit::WebCompositorSupport::createImageLayer):
+ (WebKit::WebCompositorSupport::createSolidColorLayer):
+ (WebKit::WebCompositorSupport::createVideoLayer):
+ (WebKit::WebCompositorSupport::createScrollbarLayer):
+ (WebKit::WebCompositorSupport::createAnimation):
+ (WebKit::WebCompositorSupport::createFloatAnimationCurve):
+ (WebKit::WebCompositorSupport::createTransformAnimationCurve):
+ (WebCompositorSupport):
+ * chromium/public/WebPassOwnPtr.h: Removed.
+
+2012-08-30 James Robinson <[email protected]>
+
Chromium win build fix - fix typo in gypi
* Platform.gypi:
Modified: trunk/Source/Platform/Platform.gypi (127224 => 127225)
--- trunk/Source/Platform/Platform.gypi 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/Platform/Platform.gypi 2012-08-31 03:30:56 UTC (rev 127225)
@@ -94,7 +94,6 @@
'chromium/public/WebMessagePortChannelClient.h',
'chromium/public/WebMimeRegistry.h',
'chromium/public/WebNonCopyable.h',
- 'chromium/public/WebPassOwnPtr.h',
'chromium/public/WebPeerConnection00Handler.h',
'chromium/public/WebPeerConnection00HandlerClient.h',
'chromium/public/WebPeerConnectionHandler.h',
Modified: trunk/Source/Platform/chromium/public/WebCompositorSupport.h (127224 => 127225)
--- trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-08-31 03:30:56 UTC (rev 127225)
@@ -28,62 +28,62 @@
#include "WebAnimation.h"
#include "WebCommon.h"
-#include "WebContentLayer.h"
-#include "WebExternalTextureLayer.h"
-#include "WebFloatAnimationCurve.h"
-#include "WebIOSurfaceLayer.h"
-#include "WebImageLayer.h"
-#include "WebLayer.h"
#include "WebLayerTreeView.h"
-#include "WebPassOwnPtr.h"
-#include "WebScrollbar.h"
-#include "WebScrollbarLayer.h"
-#include "WebScrollbarThemeGeometry.h"
#include "WebScrollbarThemePainter.h"
-#include "WebSolidColorLayer.h"
-#include "WebTransformAnimationCurve.h"
-#include "WebVideoLayer.h"
namespace WebKit {
+class WebAnimationCurve;
+class WebContentLayer;
class WebContentLayerClient;
+class WebExternalTextureLayer;
class WebExternalTextureLayerClient;
+class WebFloatAnimationCurve;
+class WebIOSurfaceLayer;
+class WebImageLayer;
+class WebLayer;
+class WebScrollbar;
+class WebScrollbarLayer;
+class WebScrollbarThemeGeometry;
+class WebSolidColorLayer;
+class WebTransformAnimationCurve;
class WebVideoFrameProvider;
+class WebVideoLayer;
class WebCompositorSupport {
public:
// May return 0 if initialization fails.
- virtual WebPassOwnPtr<WebLayerTreeView> createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return WebPassOwnPtr<WebLayerTreeView>(); }
+ virtual WebLayerTreeView* createLayerTreeView(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&) { return 0; }
// Layers -------------------------------------------------------
- virtual WebPassOwnPtr<WebLayer> createLayer() { return WebPassOwnPtr<WebLayer>(); }
+ virtual WebLayer* createLayer() { return 0; }
- virtual WebPassOwnPtr<WebContentLayer> createContentLayer(WebContentLayerClient*) { return WebPassOwnPtr<WebContentLayer>(); }
+ virtual WebContentLayer* createContentLayer(WebContentLayerClient*) { return 0; }
- virtual WebPassOwnPtr<WebExternalTextureLayer> createExternalTextureLayer(WebExternalTextureLayerClient* = 0) { return WebPassOwnPtr<WebExternalTextureLayer>(); }
+ virtual WebExternalTextureLayer* createExternalTextureLayer(WebExternalTextureLayerClient* = 0) { return 0; }
- virtual WebPassOwnPtr<WebIOSurfaceLayer> createIOSurfaceLayer() { return WebPassOwnPtr<WebIOSurfaceLayer>(); }
+ virtual WebIOSurfaceLayer* createIOSurfaceLayer() { return 0; }
- virtual WebPassOwnPtr<WebImageLayer> createImageLayer() { return WebPassOwnPtr<WebImageLayer>(); }
+ virtual WebImageLayer* createImageLayer() { return 0; }
- virtual WebPassOwnPtr<WebSolidColorLayer> createSolidColorLayer() { return WebPassOwnPtr<WebSolidColorLayer>(); }
+ virtual WebSolidColorLayer* createSolidColorLayer() { return 0; }
- virtual WebPassOwnPtr<WebVideoLayer> createVideoLayer(WebVideoFrameProvider*) { return WebPassOwnPtr<WebVideoLayer>(); }
+ virtual WebVideoLayer* createVideoLayer(WebVideoFrameProvider*) { return 0; }
- virtual WebPassOwnPtr<WebScrollbarLayer> createScrollbarLayer(WebPassOwnPtr<WebScrollbar>, WebScrollbarThemePainter, WebPassOwnPtr<WebScrollbarThemeGeometry>) { return WebPassOwnPtr<WebScrollbarLayer>(); }
+ virtual WebScrollbarLayer* createScrollbarLayer(WebScrollbar*, WebScrollbarThemePainter, WebScrollbarThemeGeometry*) { return 0; }
// Animation ----------------------------------------------------
- virtual WebPassOwnPtr<WebAnimation> createAnimation(const WebAnimationCurve&, WebAnimation::TargetProperty, int animationId = 0) { return WebPassOwnPtr<WebAnimation>(); }
+ virtual WebAnimation* createAnimation(const WebAnimationCurve&, WebAnimation::TargetProperty, int animationId = 0) { return 0; }
- virtual WebPassOwnPtr<WebFloatAnimationCurve> createFloatAnimationCurve() { return WebPassOwnPtr<WebFloatAnimationCurve>(); }
+ virtual WebFloatAnimationCurve* createFloatAnimationCurve() { return 0; }
- virtual WebPassOwnPtr<WebTransformAnimationCurve> createTransformAnimationCurve() { return WebPassOwnPtr<WebTransformAnimationCurve>(); }
+ virtual WebTransformAnimationCurve* createTransformAnimationCurve() { return 0; }
-private:
+protected:
virtual ~WebCompositorSupport() { }
};
Deleted: trunk/Source/Platform/chromium/public/WebPassOwnPtr.h (127224 => 127225)
--- trunk/Source/Platform/chromium/public/WebPassOwnPtr.h 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/Platform/chromium/public/WebPassOwnPtr.h 2012-08-31 03:30:56 UTC (rev 127225)
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebPassOwnPtr_h
-#define WebPassOwnPtr_h
-
-#include "WebCommon.h"
-
-#if WEBKIT_IMPLEMENTATION
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#else
-#include "base/memory/scoped_ptr.h"
-#endif
-
-namespace WebKit {
-
-// Use a return value of type WebPassOwnPtr<T> when the caller takes ownership of the returned value, for instance
-// in a createFoo() factory function. Example:
-//
-// To implement the class WebPassOwnPtr<Foo> createFoo() in chromium code, write:
-//
-// WebPassOwnPtr<Foo> createFoo() {
-// scoped_ptr<Foo> foo = ...;
-// return foo.Pass();
-// }
-//
-// To use on the WebKit side:
-//
-// OwnPtr<Foo> foo = ...->createFoo();
-//
-// To implement WebPassOwnPtr<Foo> createFoo() in WebKit and use it from chromium, write:
-//
-// WebPassOwnPtr<Foo> createFoo()
-// {
-// OwnPtr<Foo> foo = ...;
-// return foo.release();
-// }
-//
-// and
-//
-// scoped_ptr<Foo> = ...->createFoo();
-
-template <typename T>
-class WebPassOwnPtr : public WebNonCopyable {
-public:
- WebPassOwnPtr()
- : m_ptr(0)
- {
- }
-
- ~WebPassOwnPtr()
- {
- WEBKIT_ASSERT(!m_ptr);
- }
-
-
-#if WEBKIT_IMPLEMENTATION
- WebPassOwnPtr(PassOwnPtr<T> ptr)
- : m_ptr(ptr.leakPtr())
- {
- }
-
- operator PassOwnPtr<T>()
- {
- OwnPtr<T> ret = adoptPtr(m_ptr);
- m_ptr = 0;
- return ret.release();
- }
-#else
- WebPassOwnPtr(scoped_ptr<T> ptr)
- : m_ptr(ptr.release())
- {
- }
-
- operator scoped_ptr<T>()
- {
- scoped_ptr<T> ret(m_ptr);
- m_ptr = 0;
- return ret.Pass();
- }
-#endif
-
-private:
- T* m_ptr;
-
- // This constructor has to be declared but not defined to trigger move emulation.
- WebPassOwnPtr(WebPassOwnPtr&);
-};
-
-}
-
-#endif // WebPassOwnPtr_h
Modified: trunk/Source/WebCore/ChangeLog (127224 => 127225)
--- trunk/Source/WebCore/ChangeLog 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebCore/ChangeLog 2012-08-31 03:30:56 UTC (rev 127225)
@@ -1,3 +1,23 @@
+2012-08-30 James Robinson <[email protected]>
+
+ [chromium] Revert WebCompositorSupport to raw ptrs, make dtor protected
+ https://bugs.webkit.org/show_bug.cgi?id=95520
+
+ Reviewed by Darin Fisher.
+
+ Adopt the return value of WebCompositorSupport explicitly.
+
+ * platform/graphics/chromium/AnimationTranslationUtil.cpp:
+ (WebCore::createWebAnimation):
+ * platform/graphics/chromium/Canvas2DLayerBridge.cpp:
+ (WebCore::Canvas2DLayerBridge::Canvas2DLayerBridge):
+ * platform/graphics/chromium/DrawingBufferChromium.cpp:
+ (WebCore::DrawingBufferPrivate::DrawingBufferPrivate):
+ * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+ (WebCore::GraphicsLayerChromium::GraphicsLayerChromium):
+ (WebCore::GraphicsLayerChromium::setContentsToImage):
+ (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
+
2012-08-30 Adam Barth <[email protected]>
Replace more instances of += with StringBuilder
Modified: trunk/Source/WebCore/platform/graphics/chromium/AnimationTranslationUtil.cpp (127224 => 127225)
--- trunk/Source/WebCore/platform/graphics/chromium/AnimationTranslationUtil.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebCore/platform/graphics/chromium/AnimationTranslationUtil.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -243,7 +243,7 @@
OwnPtr<WebKit::WebAnimation> webAnimation;
if (WebCompositorSupport* compositorSupport = WebKit::Platform::current()->compositorSupport())
- webAnimation = compositorSupport->createAnimation(*curve, targetProperty, animationId);
+ webAnimation = adoptPtr(compositorSupport->createAnimation(*curve, targetProperty, animationId));
else
webAnimation = adoptPtr(WebKit::WebAnimation::create(*curve, targetProperty, animationId));
@@ -264,7 +264,7 @@
if (values.property() == AnimatedPropertyWebkitTransform) {
OwnPtr<WebTransformAnimationCurve> curve;
if (WebCompositorSupport* compositorSupport = WebKit::Platform::current()->compositorSupport())
- curve = compositorSupport->createTransformAnimationCurve();
+ curve = adoptPtr(compositorSupport->createTransformAnimationCurve());
else
curve = adoptPtr(WebTransformAnimationCurve::create());
return createWebAnimation<TransformAnimationValue, WebTransformKeyframe, WebTransformAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), WebKit::WebAnimation::TargetPropertyTransform, FloatSize(boxSize));
@@ -273,7 +273,7 @@
if (values.property() == AnimatedPropertyOpacity) {
OwnPtr<WebFloatAnimationCurve> curve;
if (WebCompositorSupport* compositorSupport = WebKit::Platform::current()->compositorSupport())
- curve = compositorSupport->createFloatAnimationCurve();
+ curve = adoptPtr(compositorSupport->createFloatAnimationCurve());
else
curve = adoptPtr(WebFloatAnimationCurve::create());
return createWebAnimation<FloatAnimationValue, WebFloatKeyframe, WebFloatAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), WebKit::WebAnimation::TargetPropertyOpacity, FloatSize());
Modified: trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp (127224 => 127225)
--- trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -77,7 +77,7 @@
}
if (WebKit::WebCompositorSupport* compositorSupport = WebKit::Platform::current()->compositorSupport())
- m_layer = compositorSupport->createExternalTextureLayer(this);
+ m_layer = adoptPtr(compositorSupport->createExternalTextureLayer(this));
else
m_layer = adoptPtr(WebKit::WebExternalTextureLayer::create(this));
Modified: trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (127224 => 127225)
--- trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -167,7 +167,7 @@
: m_drawingBuffer(drawingBuffer)
{
if (WebKit::WebCompositorSupport* compositorSupport = WebKit::Platform::current()->compositorSupport())
- m_layer = compositorSupport->createExternalTextureLayer(this);
+ m_layer = adoptPtr(compositorSupport->createExternalTextureLayer(this));
else
m_layer = adoptPtr(WebKit::WebExternalTextureLayer::create(this));
Modified: trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (127224 => 127225)
--- trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -94,7 +94,7 @@
m_opaqueRectTrackingContentLayerDelegate = adoptPtr(new OpaqueRectTrackingContentLayerDelegate(this));
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_layer = compositorSupport->createContentLayer(m_opaqueRectTrackingContentLayerDelegate.get());
+ m_layer = adoptPtr(compositorSupport->createContentLayer(m_opaqueRectTrackingContentLayerDelegate.get()));
else
m_layer = adoptPtr(WebContentLayer::create(m_opaqueRectTrackingContentLayerDelegate.get()));
@@ -477,7 +477,7 @@
if (image) {
if (m_contentsLayerPurpose != ContentsLayerForImage) {
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_imageLayer = compositorSupport->createImageLayer();
+ m_imageLayer = adoptPtr(compositorSupport->createImageLayer());
else
m_imageLayer = adoptPtr(WebImageLayer::create());
registerContentsLayer(m_imageLayer->layer());
@@ -733,7 +733,7 @@
{
if (m_preserves3D && !m_transformLayer) {
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_transformLayer = compositorSupport->createLayer();
+ m_transformLayer = adoptPtr(compositorSupport->createLayer());
else
m_transformLayer = adoptPtr(WebLayer::create());
Modified: trunk/Source/WebKit/chromium/ChangeLog (127224 => 127225)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-31 03:30:56 UTC (rev 127225)
@@ -1,5 +1,23 @@
2012-08-30 James Robinson <[email protected]>
+ [chromium] Revert WebCompositorSupport to raw ptrs, make dtor protected
+ https://bugs.webkit.org/show_bug.cgi?id=95520
+
+ Reviewed by Darin Fisher.
+
+ Adopt the return value of WebCompositorSupport explicitly.
+
+ * src/LinkHighlight.cpp:
+ (WebKit::LinkHighlight::LinkHighlight):
+ (WebKit::LinkHighlight::startHighlightAnimation):
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::readyStateChanged):
+ * src/WebPluginContainerImpl.cpp:
+ (WebKit::WebPluginContainerImpl::setBackingTextureId):
+ (WebKit::WebPluginContainerImpl::setBackingIOSurfaceId):
+
+2012-08-30 James Robinson <[email protected]>
+
[chromium] Make webkit_compositor specific unit test compilation conditional on gyp var
https://bugs.webkit.org/show_bug.cgi?id=95401
Modified: trunk/Source/WebKit/chromium/src/LinkHighlight.cpp (127224 => 127225)
--- trunk/Source/WebKit/chromium/src/LinkHighlight.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebKit/chromium/src/LinkHighlight.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -69,8 +69,8 @@
ASSERT(m_node);
ASSERT(owningWebViewImpl);
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport()) {
- m_contentLayer = compositorSupport->createContentLayer(this);
- m_clipLayer = compositorSupport->createLayer();
+ m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this));
+ m_clipLayer = adoptPtr(compositorSupport->createLayer());
} else {
m_contentLayer = adoptPtr(WebContentLayer::create(this));
m_clipLayer = adoptPtr(WebLayer::create());
@@ -210,7 +210,7 @@
OwnPtr<WebFloatAnimationCurve> curve;
if (compositorSupport)
- curve = compositorSupport->createFloatAnimationCurve();
+ curve = adoptPtr(compositorSupport->createFloatAnimationCurve());
else
curve = adoptPtr(WebFloatAnimationCurve::create());
@@ -220,7 +220,7 @@
curve->add(WebFloatKeyframe(duration, WebKit::layoutTestMode() ? startOpacity : 0));
if (compositorSupport)
- m_animation = compositorSupport->createAnimation(*curve, WebAnimation::TargetPropertyOpacity);
+ m_animation = adoptPtr(compositorSupport->createAnimation(*curve, WebAnimation::TargetPropertyOpacity));
else
m_animation = adoptPtr(WebAnimation::create(*curve, WebAnimation::TargetPropertyOpacity));
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (127224 => 127225)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -119,7 +119,7 @@
#if USE(ACCELERATED_COMPOSITING)
if (hasVideo() && supportsAcceleratedRendering() && !m_videoLayer) {
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_videoLayer = compositorSupport->createVideoLayer(this);
+ m_videoLayer = adoptPtr(compositorSupport->createVideoLayer(this));
else
m_videoLayer = adoptPtr(WebVideoLayer::create(this));
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (127224 => 127225)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-31 01:25:43 UTC (rev 127224)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-31 03:30:56 UTC (rev 127225)
@@ -373,7 +373,7 @@
if (!m_textureLayer) {
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_textureLayer = compositorSupport->createExternalTextureLayer();
+ m_textureLayer = adoptPtr(compositorSupport->createExternalTextureLayer());
else
m_textureLayer = adoptPtr(WebExternalTextureLayer::create());
GraphicsLayerChromium::registerContentsLayer(m_textureLayer->layer());
@@ -402,7 +402,7 @@
if (!m_ioSurfaceLayer) {
if (WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport())
- m_ioSurfaceLayer = compositorSupport->createIOSurfaceLayer();
+ m_ioSurfaceLayer = adoptPtr(compositorSupport->createIOSurfaceLayer());
else
m_ioSurfaceLayer = adoptPtr(WebIOSurfaceLayer::create());
GraphicsLayerChromium::registerContentsLayer(m_ioSurfaceLayer->layer());
