Diff
Modified: trunk/Source/WebCore/ChangeLog (158618 => 158619)
--- trunk/Source/WebCore/ChangeLog 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebCore/ChangeLog 2013-11-05 01:23:33 UTC (rev 158619)
@@ -1,3 +1,16 @@
+2013-11-04 Tim Horton <[email protected]>
+
+ Remove PlatformCALayer::playerLayer
+ https://bugs.webkit.org/show_bug.cgi?id=123764
+
+ Reviewed by Sam Weinig.
+
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::clone):
+ Remove playerLayer(), fold it into clone().
+
2013-11-04 Chris Fleizach <[email protected]>
AX: Mail attachments at the start of an email are not output by VoiceOver
Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (158618 => 158619)
--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2013-11-05 01:23:33 UTC (rev 158619)
@@ -208,10 +208,6 @@
}
-#if PLATFORM(MAC)
- virtual AVPlayerLayer* playerLayer() const = 0;
-#endif
-
LayerType m_layerType;
RetainPtr<PlatformLayer> m_layer;
PlatformCALayerClient* m_owner;
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (158618 => 158619)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2013-11-05 01:23:33 UTC (rev 158619)
@@ -144,8 +144,6 @@
private:
PlatformCALayerMac(LayerType, PlatformLayer*, PlatformCALayerClient* owner);
- virtual AVPlayerLayer *playerLayer() const OVERRIDE;
-
RetainPtr<NSObject> m_delegate;
OwnPtr<PlatformCALayerList> m_customSublayers;
};
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (158618 => 158619)
--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2013-11-05 01:23:33 UTC (rev 158619)
@@ -269,8 +269,11 @@
#endif
if (type == LayerTypeAVPlayerLayer) {
- AVPlayerLayer* destinationPlayerLayer = newLayer->playerLayer();
- AVPlayerLayer* sourcePlayerLayer = playerLayer();
+ ASSERT([newLayer->platformLayer() isKindOfClass:getAVPlayerLayerClass()]);
+ ASSERT([platformLayer() isKindOfClass:getAVPlayerLayerClass()]);
+
+ AVPlayerLayer* destinationPlayerLayer = static_cast<AVPlayerLayer *>(newLayer->platformLayer());
+ AVPlayerLayer* sourcePlayerLayer = static_cast<AVPlayerLayer *>(platformLayer());
dispatch_async(dispatch_get_main_queue(), ^{
[destinationPlayerLayer setPlayer:[sourcePlayerLayer player]];
});
@@ -723,12 +726,6 @@
return [tiledBackingLayer tiledBacking];
}
-AVPlayerLayer *PlatformCALayerMac::playerLayer() const
-{
- ASSERT([m_layer.get() isKindOfClass:getAVPlayerLayerClass()]);
- return (AVPlayerLayer *)m_layer.get();
-}
-
PassRefPtr<PlatformCALayer> PlatformCALayerMac::createCompatibleLayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* client) const
{
return PlatformCALayerMac::create(layerType, client);
Modified: trunk/Source/WebKit2/ChangeLog (158618 => 158619)
--- trunk/Source/WebKit2/ChangeLog 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-05 01:23:33 UTC (rev 158619)
@@ -1,3 +1,14 @@
+2013-11-04 Tim Horton <[email protected]>
+
+ Remove PlatformCALayer::playerLayer
+ https://bugs.webkit.org/show_bug.cgi?id=123764
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+ Remove playerLayer().
+
2013-11-04 Anders Carlsson <[email protected]>
WKRemoteObjectEncoder should escape keys
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (158618 => 158619)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-11-05 01:23:33 UTC (rev 158619)
@@ -476,11 +476,6 @@
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::EdgeAntialiasingMaskChanged);
}
-AVPlayerLayer* PlatformCALayerRemote::playerLayer() const
-{
- return nullptr;
-}
-
PassRefPtr<PlatformCALayer> PlatformCALayerRemote::createCompatibleLayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* client) const
{
return PlatformCALayerRemote::create(layerType, client, m_context);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (158618 => 158619)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-11-05 01:12:48 UTC (rev 158618)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-11-05 01:23:33 UTC (rev 158619)
@@ -149,8 +149,6 @@
PlatformCALayerRemote(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner, RemoteLayerTreeContext* context);
private:
- virtual AVPlayerLayer *playerLayer() const OVERRIDE;
-
void ensureBackingStore();
void removeSublayer(PlatformCALayerRemote*);
