- Revision
- 158096
- Author
- [email protected]
- Date
- 2013-10-26 19:36:49 -0700 (Sat, 26 Oct 2013)
Log Message
[mac] Remove WebTiledLayer
https://bugs.webkit.org/show_bug.cgi?id=123395
Reviewed by Anders Carlsson.
Source/WebCore:
Mac doesn't use CATiledLayer at all anymore. We have to keep
LayerTypeTiledLayer around for Windows, for now, but we can
get rid of WebTiledLayer and some related Mac-specific code.
No new tests, just removing dead code.
* WebCore.xcodeproj/project.pbxproj:
Remove WebTiledLayer.*
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::PlatformCALayerMac):
Remove synchronouslyDisplayTilesInRect, which was only used for WebTiledLayer on Mac.
Remove WebTiledLayer instantiation and setup code.
* platform/graphics/mac/WebTiledLayer.h: Removed.
* platform/graphics/mac/WebTiledLayer.mm: Removed.
Source/WebKit2:
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
Remove synchronouslyDisplayTilesInRect.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158095 => 158096)
--- trunk/Source/WebCore/ChangeLog 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebCore/ChangeLog 2013-10-27 02:36:49 UTC (rev 158096)
@@ -1,3 +1,29 @@
+2013-10-26 Tim Horton <[email protected]>
+
+ [mac] Remove WebTiledLayer
+ https://bugs.webkit.org/show_bug.cgi?id=123395
+
+ Reviewed by Anders Carlsson.
+
+ Mac doesn't use CATiledLayer at all anymore. We have to keep
+ LayerTypeTiledLayer around for Windows, for now, but we can
+ get rid of WebTiledLayer and some related Mac-specific code.
+
+ No new tests, just removing dead code.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Remove WebTiledLayer.*
+
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::PlatformCALayerMac):
+ Remove synchronouslyDisplayTilesInRect, which was only used for WebTiledLayer on Mac.
+ Remove WebTiledLayer instantiation and setup code.
+
+ * platform/graphics/mac/WebTiledLayer.h: Removed.
+ * platform/graphics/mac/WebTiledLayer.mm: Removed.
+
2013-10-26 Andreas Kling <[email protected]>
CTTE: RenderImageResourceStyleImage always has a StyleImage.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (158095 => 158096)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-27 02:36:49 UTC (rev 158096)
@@ -458,8 +458,6 @@
0FB8890E167D30160010CDA5 /* ScrollingStateStickyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB8890C167D30160010CDA5 /* ScrollingStateStickyNode.cpp */; };
0FB8890F167D30160010CDA5 /* ScrollingStateStickyNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB8890D167D30160010CDA5 /* ScrollingStateStickyNode.h */; };
0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33230F2B9715004B6795 /* ColorCG.cpp */; };
- 0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33280F2B9A25004B6795 /* WebTiledLayer.mm */; };
- 0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF33290F2B9A25004B6795 /* WebTiledLayer.h */; };
0FCF332E0F2B9A25004B6795 /* WebLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF332A0F2B9A25004B6795 /* WebLayer.mm */; };
0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF332B0F2B9A25004B6795 /* WebLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */; };
@@ -6911,8 +6909,6 @@
0FB8890C167D30160010CDA5 /* ScrollingStateStickyNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingStateStickyNode.cpp; sourceTree = "<group>"; };
0FB8890D167D30160010CDA5 /* ScrollingStateStickyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingStateStickyNode.h; sourceTree = "<group>"; };
0FCF33230F2B9715004B6795 /* ColorCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorCG.cpp; sourceTree = "<group>"; };
- 0FCF33280F2B9A25004B6795 /* WebTiledLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebTiledLayer.mm; sourceTree = "<group>"; };
- 0FCF33290F2B9A25004B6795 /* WebTiledLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTiledLayer.h; sourceTree = "<group>"; };
0FCF332A0F2B9A25004B6795 /* WebLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebLayer.mm; sourceTree = "<group>"; };
0FCF332B0F2B9A25004B6795 /* WebLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebLayer.h; sourceTree = "<group>"; };
0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFrameBase.cpp; sourceTree = "<group>"; };
@@ -18876,8 +18872,6 @@
49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */,
0FCF332B0F2B9A25004B6795 /* WebLayer.h */,
0FCF332A0F2B9A25004B6795 /* WebLayer.mm */,
- 0FCF33290F2B9A25004B6795 /* WebTiledLayer.h */,
- 0FCF33280F2B9A25004B6795 /* WebTiledLayer.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -24641,7 +24635,6 @@
97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
0F580FA31496939100FB5BD8 /* WebTiledBackingLayer.h in Headers */,
- 0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */,
CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */,
CD82030C1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h in Headers */,
F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */,
@@ -27701,7 +27694,6 @@
AAF5B7B71524B6C50004CB49 /* WebSocketFrame.cpp in Sources */,
97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */,
0F580FA41496939100FB5BD8 /* WebTiledBackingLayer.mm in Sources */,
- 0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */,
1AA7161E149BF2FA0016EC19 /* WebTileLayer.mm in Sources */,
CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */,
CD61FE691794AADB004101EB /* WebKitSourceBuffer.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (158095 => 158096)
--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2013-10-27 02:36:49 UTC (rev 158096)
@@ -194,10 +194,6 @@
#endif // NDEBUG
#endif // PLATFORM(WIN)
-#if PLATFORM(MAC)
- virtual void synchronouslyDisplayTilesInRect(const FloatRect&) = 0;
-#endif
-
protected:
PlatformCALayer(LayerType layerType, PlatformCALayerClient* owner)
: m_layerType(layerType)
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (158095 => 158096)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2013-10-27 02:36:49 UTC (rev 158096)
@@ -135,8 +135,6 @@
virtual TiledBacking* tiledBacking() OVERRIDE;
- virtual void synchronouslyDisplayTilesInRect(const FloatRect&) OVERRIDE;
-
virtual PassRefPtr<PlatformCALayer> clone(PlatformCALayerClient* owner) const OVERRIDE;
private:
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (158095 => 158096)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-10-27 02:36:49 UTC (rev 158096)
@@ -38,7 +38,6 @@
#import "SoftLinking.h"
#import "TiledBacking.h"
#import "WebLayer.h"
-#import "WebTiledLayer.h"
#import "WebTiledBackingLayer.h"
#import <objc/objc-auto.h>
#import <objc/runtime.h>
@@ -193,7 +192,7 @@
layerClass = [CATransformLayer class];
break;
case LayerTypeWebTiledLayer:
- layerClass = [WebTiledLayer class];
+ ASSERT_NOT_REACHED();
break;
case LayerTypeTiledBackingLayer:
case LayerTypePageTiledBackingLayer:
@@ -216,15 +215,6 @@
// Clear all the implicit animations on the CALayer
[m_layer.get() setStyle:[NSDictionary dictionaryWithObject:nullActionsDictionary() forKey:@"actions"]];
- // If this is a TiledLayer, set some initial values
- if (m_layerType == LayerTypeWebTiledLayer) {
- WebTiledLayer* tiledLayer = static_cast<WebTiledLayer*>(m_layer.get());
- [tiledLayer setTileSize:CGSizeMake(GraphicsLayerCA::kTiledLayerTileSize, GraphicsLayerCA::kTiledLayerTileSize)];
- [tiledLayer setLevelsOfDetail:1];
- [tiledLayer setLevelsOfDetailBias:0];
- [tiledLayer setContentsGravity:@"bottomLeft"];
- }
-
if (usesTiledBackingLayer()) {
m_customSublayers = adoptPtr(new PlatformCALayerList(1));
CALayer* tileCacheTileContainerLayer = [static_cast<WebTiledBackingLayer *>(m_layer.get()) tileContainerLayer];
@@ -714,21 +704,6 @@
return [tiledBackingLayer tiledBacking];
}
-void PlatformCALayerMac::synchronouslyDisplayTilesInRect(const FloatRect& rect)
-{
- if (m_layerType != LayerTypeWebTiledLayer)
- return;
-
- WebTiledLayer *tiledLayer = static_cast<WebTiledLayer *>(m_layer.get());
-
- BEGIN_BLOCK_OBJC_EXCEPTIONS
- BOOL oldCanDrawConcurrently = [tiledLayer canDrawConcurrently];
- [tiledLayer setCanDrawConcurrently:NO];
- [tiledLayer displayInRect:rect levelOfDetail:0 options:nil];
- [tiledLayer setCanDrawConcurrently:oldCanDrawConcurrently];
- END_BLOCK_OBJC_EXCEPTIONS
-}
-
AVPlayerLayer *PlatformCALayerMac::playerLayer() const
{
ASSERT([m_layer.get() isKindOfClass:getAVPlayerLayerClass()]);
Modified: trunk/Source/WebKit2/ChangeLog (158095 => 158096)
--- trunk/Source/WebKit2/ChangeLog 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-27 02:36:49 UTC (rev 158096)
@@ -1,3 +1,14 @@
+2013-10-26 Tim Horton <[email protected]>
+
+ [mac] Remove WebTiledLayer
+ https://bugs.webkit.org/show_bug.cgi?id=123395
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+ Remove synchronouslyDisplayTilesInRect.
+
2013-10-26 Dan Bernstein <[email protected]>
[Cocoa] -[WKBackForwardList forwardItem] returns the back item
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (158095 => 158096)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-10-27 02:36:49 UTC (rev 158096)
@@ -467,10 +467,6 @@
return nullptr;
}
-void PlatformCALayerRemote::synchronouslyDisplayTilesInRect(const FloatRect& rect)
-{
-}
-
AVPlayerLayer* PlatformCALayerRemote::playerLayer() const
{
return nullptr;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (158095 => 158096)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-10-27 00:48:54 UTC (rev 158095)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-10-27 02:36:49 UTC (rev 158096)
@@ -139,8 +139,6 @@
virtual WebCore::TiledBacking* tiledBacking() OVERRIDE;
- virtual void synchronouslyDisplayTilesInRect(const WebCore::FloatRect&) OVERRIDE;
-
virtual PassRefPtr<WebCore::PlatformCALayer> clone(WebCore::PlatformCALayerClient* owner) const OVERRIDE;
private:
