Title: [160677] trunk/Source/WebCore
- Revision
- 160677
- Author
- [email protected]
- Date
- 2013-12-16 16:55:47 -0800 (Mon, 16 Dec 2013)
Log Message
Attempt to fix the Windows build after r160672.
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::PlatformCALayerWin):
* platform/graphics/ca/win/PlatformCALayerWin.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160676 => 160677)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 00:44:37 UTC (rev 160676)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 00:55:47 UTC (rev 160677)
@@ -1,5 +1,13 @@
2013-12-16 Simon Fraser <[email protected]>
+ Attempt to fix the Windows build after r160672.
+
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayerWin::PlatformCALayerWin):
+ * platform/graphics/ca/win/PlatformCALayerWin.h:
+
+2013-12-16 Simon Fraser <[email protected]>
+
Apply overhang shadow and linen to UI-side layers
https://bugs.webkit.org/show_bug.cgi?id=125807
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (160676 => 160677)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-12-17 00:44:37 UTC (rev 160676)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2013-12-17 00:55:47 UTC (rev 160677)
@@ -109,6 +109,7 @@
PlatformCALayerWin::PlatformCALayerWin(LayerType layerType, PlatformLayer* layer, PlatformCALayerClient* owner)
: PlatformCALayer(layer ? LayerTypeCustom : layerType, owner)
+ , m_customAppearance(GraphicsLayer::NoCustomAppearance)
{
if (layer) {
m_layer = layer;
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (160676 => 160677)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2013-12-17 00:44:37 UTC (rev 160676)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2013-12-17 00:55:47 UTC (rev 160677)
@@ -128,6 +128,9 @@
virtual void setEdgeAntialiasingMask(unsigned) OVERRIDE { ASSERT_NOT_REACHED(); }
+ virtual GraphicsLayer::CustomAppearance customAppearance() const OVERRIDE { return m_customAppearance; }
+ virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance customAppearance) OVERRIDE { m_customAppearance = customAppearance; }
+
virtual TiledBacking* tiledBacking() OVERRIDE { return nullptr; }
virtual PlatformCALayer* rootLayer() const OVERRIDE;
@@ -146,6 +149,7 @@
PlatformCALayerWin(LayerType, PlatformLayer*, PlatformCALayerClient* owner);
HashMap<String, RefPtr<PlatformCAAnimation>> m_animations;
+ GraphicsLayer::CustomAppearance m_customAppearance;
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
