Unreviewed, rolling out r126076, r126099, and r126106.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Aug 2012 17:34:49 +0000 (17:34 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Aug 2012 17:34:49 +0000 (17:34 +0000)
commit8a5365c6799c9a5ec745e968a26d4088f6587776
tree2a51dc02477caa7a77088dde35277452b1a86d56
parentc2dc37f8b53378dcdaae6029caa2baf4f647bb67
Unreviewed, rolling out r126076, r126099, and r126106.
http://trac.webkit.org/changeset/126076
http://trac.webkit.org/changeset/126099
http://trac.webkit.org/changeset/126106
https://bugs.webkit.org/show_bug.cgi?id=94614

Caused crashes during compositor shutdown in Aura builds of
Chromium (Requested by kbr_google on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-08-21

Source/Platform:

* chromium/public/WebContentLayer.h:
(WebCore):
(WebKit):
(WebContentLayer):
(WebKit::WebContentLayer::WebContentLayer):
(WebKit::WebContentLayer::operator=):
* chromium/public/WebExternalTextureLayer.h:
(WebCore):
(WebExternalTextureLayer):
(WebKit::WebExternalTextureLayer::WebExternalTextureLayer):
(WebKit::WebExternalTextureLayer::~WebExternalTextureLayer):
* chromium/public/WebIOSurfaceLayer.h:
(WebCore):
(WebIOSurfaceLayer):
(WebKit::WebIOSurfaceLayer::WebIOSurfaceLayer):
* chromium/public/WebImageLayer.h:
(WebCore):
(WebImageLayer):
(WebKit::WebImageLayer::WebImageLayer):
* chromium/public/WebLayer.h:
(WebKit):
(WebLayer):
(WebKit::WebLayer::WebLayer):
(WebKit::WebLayer::~WebLayer):
(WebKit::WebLayer::operator=):
(WebKit::WebLayer::isNull):
(WebKit::WebLayer::to):
(WebKit::WebLayer::toConst):
(WebKit::WebLayer::unwrap):
(WebKit::WebLayer::constUnwrap):
(WebKit::operator==):
(WebKit::operator!=):
* chromium/public/WebScrollableLayer.h: Copied from Source/Platform/chromium/public/WebScrollbarLayer.h.
(WebKit):
(WebScrollableLayer):
(WebKit::WebScrollableLayer::WebScrollableLayer):
(WebKit::WebScrollableLayer::~WebScrollableLayer):
(WebKit::WebScrollableLayer::operator=):
* chromium/public/WebScrollbarLayer.h:
(WebCore):
(WebKit::WebScrollbarLayer::WebScrollbarLayer):
(WebKit::WebScrollbarLayer::operator=):
(WebScrollbarLayer):
* chromium/public/WebSolidColorLayer.h:
(WebKit):
(WebSolidColorLayer):
* chromium/public/WebVideoLayer.h:
(WebCore):
(WebVideoLayer):
(WebKit::WebVideoLayer::WebVideoLayer):

Source/WebCore:

* page/scrolling/chromium/ScrollingCoordinatorChromium.cpp:
(WebCore::ScrollingCoordinatorPrivate::ScrollingCoordinatorPrivate):
(WebCore::ScrollingCoordinatorPrivate::setScrollLayer):
(WebCore::ScrollingCoordinatorPrivate::setHorizontalScrollbarLayer):
(WebCore::ScrollingCoordinatorPrivate::setVerticalScrollbarLayer):
(WebCore::ScrollingCoordinatorPrivate::hasScrollLayer):
(WebCore::ScrollingCoordinatorPrivate::scrollLayer):
(ScrollingCoordinatorPrivate):
(WebCore::createScrollbarLayer):
(WebCore::ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange):
(WebCore::ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange):
(WebCore::ScrollingCoordinator::setScrollLayer):
(WebCore::ScrollingCoordinator::setNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::setWheelEventHandlerCount):
(WebCore::ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread):
(WebCore::ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers):
(WebCore::ScrollingCoordinator::setLayerIsFixedToContainerLayer):
* platform/graphics/chromium/Canvas2DLayerBridge.cpp:
(WebCore::Canvas2DLayerBridge::Canvas2DLayerBridge):
(WebCore::Canvas2DLayerBridge::~Canvas2DLayerBridge):
(WebCore::Canvas2DLayerBridge::prepareForDraw):
(WebCore::Canvas2DLayerBridge::layer):
(WebCore::Canvas2DLayerBridge::contextAcquired):
* platform/graphics/chromium/Canvas2DLayerBridge.h:
(Canvas2DLayerBridge):
* platform/graphics/chromium/DrawingBufferChromium.cpp:
(WebCore::DrawingBufferPrivate::DrawingBufferPrivate):
(WebCore::DrawingBufferPrivate::~DrawingBufferPrivate):
(WebCore::DrawingBufferPrivate::layer):
(DrawingBufferPrivate):
* platform/graphics/chromium/GraphicsLayerChromium.cpp:
(WebCore::GraphicsLayerChromium::GraphicsLayerChromium):
(WebCore::GraphicsLayerChromium::~GraphicsLayerChromium):
(WebCore::GraphicsLayerChromium::willBeDestroyed):
(WebCore):
(WebCore::GraphicsLayerChromium::updateNames):
(WebCore::GraphicsLayerChromium::removeFromParent):
(WebCore::GraphicsLayerChromium::setSize):
(WebCore::GraphicsLayerChromium::clearBackgroundColor):
(WebCore::GraphicsLayerChromium::setContentsOpaque):
(WebCore::GraphicsLayerChromium::setFilters):
(WebCore::GraphicsLayerChromium::setBackgroundFilters):
(WebCore::GraphicsLayerChromium::setMaskLayer):
(WebCore::GraphicsLayerChromium::setBackfaceVisibility):
(WebCore::GraphicsLayerChromium::setOpacity):
(WebCore::GraphicsLayerChromium::setReplicatedByLayer):
(WebCore::GraphicsLayerChromium::setContentsNeedsDisplay):
(WebCore::GraphicsLayerChromium::setNeedsDisplay):
(WebCore::GraphicsLayerChromium::setNeedsDisplayInRect):
(WebCore::GraphicsLayerChromium::setContentsToImage):
(WebCore::GraphicsLayerChromium::setContentsToCanvas):
(WebCore::GraphicsLayerChromium::addAnimation):
(WebCore::GraphicsLayerChromium::pauseAnimation):
(WebCore::GraphicsLayerChromium::removeAnimation):
(WebCore::GraphicsLayerChromium::suspendAnimations):
(WebCore::GraphicsLayerChromium::resumeAnimations):
(WebCore::GraphicsLayerChromium::addLinkHighlight):
(WebCore::GraphicsLayerChromium::didFinishLinkHighlight):
(WebCore::GraphicsLayerChromium::setContentsToMedia):
(WebCore::GraphicsLayerChromium::primaryLayer):
(WebCore::GraphicsLayerChromium::platformLayer):
(WebCore::GraphicsLayerChromium::setDebugBackgroundColor):
(WebCore::GraphicsLayerChromium::setDebugBorder):
(WebCore::GraphicsLayerChromium::updateChildList):
(WebCore::GraphicsLayerChromium::updateLayerPosition):
(WebCore::GraphicsLayerChromium::updateLayerSize):
(WebCore::GraphicsLayerChromium::updateAnchorPoint):
(WebCore::GraphicsLayerChromium::updateTransform):
(WebCore::GraphicsLayerChromium::updateChildrenTransform):
(WebCore::GraphicsLayerChromium::updateMasksToBounds):
(WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
(WebCore::GraphicsLayerChromium::updateLayerIsDrawable):
(WebCore::GraphicsLayerChromium::updateLayerBackgroundColor):
(WebCore::GraphicsLayerChromium::updateContentsRect):
(WebCore::GraphicsLayerChromium::updateContentsScale):
(WebCore::GraphicsLayerChromium::setupContentsLayer):
* platform/graphics/chromium/GraphicsLayerChromium.h:
(WebCore::GraphicsLayerChromium::hasContentsLayer):
(GraphicsLayerChromium):
(WebCore::GraphicsLayerChromium::contentsLayer):
* platform/graphics/chromium/LayerChromium.cpp:
(WebCore::LayerChromium::rootLayer):
* platform/graphics/chromium/LayerChromium.h:

Source/WebKit/chromium:

* WebKit.gypi:
* src/NonCompositedContentHost.cpp:
(WebKit::NonCompositedContentHost::NonCompositedContentHost):
(WebKit::NonCompositedContentHost::setScrollLayer):
(WebKit::NonCompositedContentHost::setViewport):
(WebKit::NonCompositedContentHost::scrollLayer):
* src/NonCompositedContentHost.h:
* src/WebContentLayer.cpp: Renamed from Source/WebKit/chromium/src/WebVideoLayerImpl.cpp.
(WebKit):
(WebKit::WebContentLayer::create):
(WebKit::WebContentLayer::clearClient):
(WebKit::WebContentLayer::setDoubleSided):
(WebKit::WebContentLayer::setContentsScale):
(WebKit::WebContentLayer::setUseLCDText):
(WebKit::WebContentLayer::setDrawCheckerboardForMissingTiles):
(WebKit::WebContentLayer::WebContentLayer):
(WebKit::WebContentLayer::operator=):
(WebKit::WebContentLayer::operator PassRefPtr<ContentLayerChromium>):
* src/WebContentLayerImpl.cpp:
(WebKit::WebContentLayerImpl::create):
(WebKit::WebContentLayerImpl::WebContentLayerImpl):
(WebKit::WebContentLayerImpl::~WebContentLayerImpl):
(WebKit::WebContentLayerImpl::paintContents):
* src/WebContentLayerImpl.h:
(WebContentLayerImpl):
* src/WebExternalTextureLayer.cpp: Renamed from Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp.
(WebKit):
(WebTextureUpdaterImpl):
(WebKit::WebTextureUpdaterImpl::WebTextureUpdaterImpl):
(WebExternalTextureLayerImpl):
(WebKit::WebExternalTextureLayerImpl::WebExternalTextureLayerImpl):
(WebKit::WebExternalTextureLayer::create):
(WebKit::WebExternalTextureLayer::clearClient):
(WebKit::WebExternalTextureLayer::setTextureId):
(WebKit::WebExternalTextureLayer::setFlipped):
(WebKit::WebExternalTextureLayer::setUVRect):
(WebKit::WebExternalTextureLayer::setOpaque):
(WebKit::WebExternalTextureLayer::setPremultipliedAlpha):
(WebKit::WebExternalTextureLayer::willModifyTexture):
(WebKit::WebExternalTextureLayer::setRateLimitContext):
(WebKit::WebExternalTextureLayer::WebExternalTextureLayer):
* src/WebExternalTextureLayerImpl.h: Removed.
* src/WebIOSurfaceLayer.cpp: Renamed from Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp.
(WebKit):
(WebKit::WebIOSurfaceLayer::create):
(WebKit::WebIOSurfaceLayer::setIOSurfaceProperties):
(WebKit::WebIOSurfaceLayer::WebIOSurfaceLayer):
* src/WebIOSurfaceLayerImpl.h: Removed.
* src/WebImageLayer.cpp: Renamed from Source/WebKit/chromium/src/WebImageLayerImpl.h.
(WebKit):
(WebKit::WebImageLayer::create):
(WebKit::WebImageLayer::WebImageLayer):
(WebKit::WebImageLayer::setBitmap):
* src/WebLayer.cpp: Added.
(WebKit):
(WebKit::WebLayer::create):
(WebKit::WebLayer::reset):
(WebKit::WebLayer::assign):
(WebKit::WebLayer::equals):
(WebKit::WebLayer::invalidateRect):
(WebKit::WebLayer::invalidate):
(WebKit::WebLayer::addChild):
(WebKit::WebLayer::insertChild):
(WebKit::WebLayer::replaceChild):
(WebKit::WebLayer::setChildren):
(WebKit::WebLayer::removeFromParent):
(WebKit::WebLayer::removeAllChildren):
(WebKit::WebLayer::setAnchorPoint):
(WebKit::WebLayer::anchorPoint):
(WebKit::WebLayer::setAnchorPointZ):
(WebKit::WebLayer::anchorPointZ):
(WebKit::WebLayer::setBounds):
(WebKit::WebLayer::bounds):
(WebKit::WebLayer::setMasksToBounds):
(WebKit::WebLayer::masksToBounds):
(WebKit::WebLayer::setMaskLayer):
(WebKit::WebLayer::setReplicaLayer):
(WebKit::WebLayer::setOpacity):
(WebKit::WebLayer::opacity):
(WebKit::WebLayer::setOpaque):
(WebKit::WebLayer::opaque):
(WebKit::WebLayer::setPosition):
(WebKit::WebLayer::position):
(WebKit::WebLayer::setSublayerTransform):
(WebKit::WebLayer::sublayerTransform):
(WebKit::WebLayer::setTransform):
(WebKit::WebLayer::transform):
(WebKit::WebLayer::setDrawsContent):
(WebKit::WebLayer::drawsContent):
(WebKit::WebLayer::setPreserves3D):
(WebKit::WebLayer::setUseParentBackfaceVisibility):
(WebKit::WebLayer::setBackgroundColor):
(WebKit::WebLayer::setFilters):
(WebKit::WebLayer::setBackgroundFilters):
(WebKit::WebLayer::setDebugBorderColor):
(WebKit::WebLayer::setDebugBorderWidth):
(WebKit::WebLayer::setDebugName):
(WebKit::WebLayer::setAnimationDelegate):
(WebKit::WebLayer::addAnimation):
(WebKit::WebLayer::removeAnimation):
(WebKit::WebLayer::pauseAnimation):
(WebKit::WebLayer::suspendAnimations):
(WebKit::WebLayer::resumeAnimations):
(WebKit::WebLayer::hasActiveAnimation):
(WebKit::WebLayer::transferAnimationsTo):
(WebKit::WebLayer::setForceRenderSurface):
(WebKit::WebLayer::clearRenderSurface):
(WebKit::WebLayer::WebLayer):
(WebKit::WebLayer::operator=):
(WebKit::WebLayer::operator PassRefPtr<LayerChromium>):
* src/WebLayerImpl.cpp:
(WebKit::WebLayerImpl::create):
(WebKit::WebLayerImpl::WebLayerImpl):
(WebKit::WebLayerImpl::~WebLayerImpl):
* src/WebLayerImpl.h:
(WebLayerImpl):
* src/WebLayerTreeView.cpp:
(WebKit::WebLayerTreeView::setRootLayer):
* src/WebLayerTreeViewImpl.cpp:
(WebKit::WebLayerTreeViewImpl::create):
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::readyStateChanged):
(WebKit::WebMediaPlayerClientImpl::repaint):
(WebKit::WebMediaPlayerClientImpl::setOpaque):
(WebKit::WebMediaPlayerClientImpl::platformLayer):
(WebKit::WebMediaPlayerClientImpl::acceleratedRenderingInUse):
* src/WebMediaPlayerClientImpl.h:
(WebMediaPlayerClientImpl):
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::setBackingTextureId):
(WebKit::WebPluginContainerImpl::setBackingIOSurfaceId):
(WebKit::WebPluginContainerImpl::commitBackingTexture):
(WebKit::WebPluginContainerImpl::setOpaque):
(WebKit::WebPluginContainerImpl::platformLayer):
* src/WebPluginContainerImpl.h:
(WebPluginContainerImpl):
* src/WebScrollableLayer.cpp: Renamed from Source/WebKit/chromium/src/WebImageLayerImpl.cpp.
(WebKit):
(WebKit::WebScrollableLayer::setScrollPosition):
(WebKit::WebScrollableLayer::setScrollable):
(WebKit::WebScrollableLayer::setHaveWheelEventHandlers):
(WebKit::WebScrollableLayer::setShouldScrollOnMainThread):
(WebKit::WebScrollableLayer::setNonFastScrollableRegion):
(WebKit::WebScrollableLayer::setIsContainerForFixedPositionLayers):
(WebKit::WebScrollableLayer::setFixedToContainerLayer):
* src/WebScrollbarLayer.cpp: Renamed from Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp.
(WebKit):
(WebKit::WebScrollbarLayer::setScrollLayer):
(WebKit::WebScrollbarLayer::create):
(WebKit::WebScrollbarLayer::WebScrollbarLayer):
(WebKit::WebScrollbarLayer::operator=):
(WebKit::WebScrollbarLayer::operator PassRefPtr<ScrollbarLayerChromium>):
* src/WebScrollbarLayerImpl.h: Removed.
* src/WebSolidColorLayer.cpp: Copied from Source/Platform/chromium/public/WebSolidColorLayer.h.
(WebKit):
(WebKit::WebSolidColorLayer::create):
(WebKit::WebSolidColorLayer::WebSolidColorLayer):
(WebKit::WebSolidColorLayer::setBackgroundColor):
* src/WebSolidColorLayerImpl.cpp:
(WebKit::WebSolidColorLayerImpl::create):
(WebKit::WebSolidColorLayerImpl::WebSolidColorLayerImpl):
* src/WebSolidColorLayerImpl.h:
(WebSolidColorLayerImpl):
* src/WebVideoLayer.cpp: Renamed from Source/WebKit/chromium/src/WebVideoLayerImpl.h.
(WebKit):
(WebKit::WebVideoLayer::create):
(WebKit::WebVideoLayer::WebVideoLayer):
(WebKit::WebVideoLayer::active):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::setRootGraphicsLayer):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
(WebKit):
* src/WebViewImpl.h:
* tests/ImageLayerChromiumTest.cpp:
(WebCore::TEST):
* tests/WebLayerTest.cpp:
* tests/WebLayerTreeViewTest.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@126169 268f45cc-cd09-0410-ab3c-d52691b4dbfc
51 files changed:
Source/Platform/ChangeLog
Source/Platform/chromium/public/WebContentLayer.h
Source/Platform/chromium/public/WebExternalTextureLayer.h
Source/Platform/chromium/public/WebIOSurfaceLayer.h
Source/Platform/chromium/public/WebImageLayer.h
Source/Platform/chromium/public/WebLayer.h
Source/Platform/chromium/public/WebScrollableLayer.h [moved from Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.h with 56% similarity]
Source/Platform/chromium/public/WebScrollbarLayer.h
Source/Platform/chromium/public/WebSolidColorLayer.h
Source/Platform/chromium/public/WebVideoLayer.h
Source/WebCore/ChangeLog
Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp
Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp
Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.h
Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.h
Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerChromium.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gypi
Source/WebKit/chromium/src/NonCompositedContentHost.cpp
Source/WebKit/chromium/src/NonCompositedContentHost.h
Source/WebKit/chromium/src/WebContentLayer.cpp [moved from Source/WebKit/chromium/src/WebVideoLayerImpl.cpp with 55% similarity]
Source/WebKit/chromium/src/WebContentLayerImpl.cpp
Source/WebKit/chromium/src/WebContentLayerImpl.h
Source/WebKit/chromium/src/WebExternalTextureLayer.cpp [moved from Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp with 50% similarity]
Source/WebKit/chromium/src/WebExternalTextureLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebIOSurfaceLayer.cpp [moved from Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp with 70% similarity]
Source/WebKit/chromium/src/WebImageLayer.cpp [moved from Source/WebKit/chromium/src/WebImageLayerImpl.h with 73% similarity]
Source/WebKit/chromium/src/WebLayer.cpp [new file with mode: 0644]
Source/WebKit/chromium/src/WebLayerImpl.cpp
Source/WebKit/chromium/src/WebLayerImpl.h
Source/WebKit/chromium/src/WebLayerTreeView.cpp
Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
Source/WebKit/chromium/src/WebPluginContainerImpl.h
Source/WebKit/chromium/src/WebScrollableLayer.cpp [new file with mode: 0644]
Source/WebKit/chromium/src/WebScrollbarLayer.cpp [moved from Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp with 61% similarity]
Source/WebKit/chromium/src/WebScrollbarLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebSolidColorLayer.cpp [moved from Source/WebKit/chromium/src/WebImageLayerImpl.cpp with 70% similarity]
Source/WebKit/chromium/src/WebSolidColorLayerImpl.cpp
Source/WebKit/chromium/src/WebSolidColorLayerImpl.h
Source/WebKit/chromium/src/WebVideoLayer.cpp [moved from Source/WebKit/chromium/src/WebVideoLayerImpl.h with 74% similarity]
Source/WebKit/chromium/src/WebViewImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.h
Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
Source/WebKit/chromium/tests/WebLayerTest.cpp
Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp