Title: [100484] branches/safari-534.53-branch/Source/WebCore
- Revision
- 100484
- Author
- lforsch...@apple.com
- Date
- 2011-11-16 11:58:46 -0800 (Wed, 16 Nov 2011)
Log Message
Merged r93043.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (100483 => 100484)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-16 19:53:12 UTC (rev 100483)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-16 19:58:46 UTC (rev 100484)
@@ -1,5 +1,24 @@
2011-11-15 Lucas Forschler <lforsch...@apple.com>
+ Merge 93043
+
+ 2011-08-15 Adam Roben <aro...@apple.com>
+
+ Rename an instance of pageScaleFactorChanged I missed in r93040
+
+ I tried to make a test for this but failed. It would probably have been easier if we dumped
+ layers' content scales in layerTreeAsText output.
+
+ Followup to <http://webkit.org/b/55787> WebKit uses multiple conflicting names to refer to
+ the device scale factor
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::deviceOrPageScaleFactorChanged):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ Renamed from pageScaleFactorChanged to match the base class.
+
+2011-11-15 Lucas Forschler <lforsch...@apple.com>
+
Merge 93040
2011-08-10 Adam Roben <aro...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (100483 => 100484)
--- branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2011-11-16 19:53:12 UTC (rev 100483)
+++ branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2011-11-16 19:58:46 UTC (rev 100484)
@@ -2394,7 +2394,7 @@
noteChangesForScaleSensitiveProperties();
}
-void GraphicsLayerCA::pageScaleFactorChanged()
+void GraphicsLayerCA::deviceOrPageScaleFactorChanged()
{
noteChangesForScaleSensitiveProperties();
}
Modified: branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (100483 => 100484)
--- branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2011-11-16 19:53:12 UTC (rev 100483)
+++ branches/safari-534.53-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2011-11-16 19:58:46 UTC (rev 100484)
@@ -116,7 +116,7 @@
virtual void layerDidDisplay(PlatformLayer*);
virtual void setMaintainsPixelAlignment(bool);
- virtual void pageScaleFactorChanged();
+ virtual void deviceOrPageScaleFactorChanged();
void recursiveCommitChanges(float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
