Title: [184284] branches/safari-601.1.32-branch/Source/WebCore
- Revision
- 184284
- Author
- [email protected]
- Date
- 2015-05-13 02:23:22 -0700 (Wed, 13 May 2015)
Log Message
Merged r183980. rdar://problem/20769741
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184283 => 184284)
--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 09:13:41 UTC (rev 184283)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 09:23:22 UTC (rev 184284)
@@ -1,5 +1,17 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r183980.
+
+ 2015-05-07 Chris Dumez <[email protected]>
+
+ Unreviewed, fix build after r183970.
+
+ WEBCORE_EXPORT should not be used on inlined functions.
+
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
+2015-05-13 Babak Shafiei <[email protected]>
+
Merge r184231.
2015-05-12 Simon Fraser <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (184283 => 184284)
--- branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-05-13 09:13:41 UTC (rev 184283)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-05-13 09:23:22 UTC (rev 184284)
@@ -195,7 +195,7 @@
virtual bool isCommittingChanges() const override { return m_isCommittingChanges; }
WEBCORE_EXPORT virtual void setAllowsBackingStoreDetachment(bool) override;
- WEBCORE_EXPORT virtual bool allowsBackingStoreDetachment() const override { return m_allowsBackingStoreDetachment; }
+ virtual bool allowsBackingStoreDetachment() const override { return m_allowsBackingStoreDetachment; }
WEBCORE_EXPORT virtual double backingStoreMemoryEstimate() const override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
