Title: [100341] branches/safari-534.53-branch/Source/WebKit/win
- Revision
- 100341
- Author
- lforsch...@apple.com
- Date
- 2011-11-15 15:08:28 -0800 (Tue, 15 Nov 2011)
Log Message
Merged r91145.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebKit/win/ChangeLog (100340 => 100341)
--- branches/safari-534.53-branch/Source/WebKit/win/ChangeLog 2011-11-15 23:07:48 UTC (rev 100340)
+++ branches/safari-534.53-branch/Source/WebKit/win/ChangeLog 2011-11-15 23:08:28 UTC (rev 100341)
@@ -1,3 +1,15 @@
+2011-11-15 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 91145
+
+ 2011-07-15 Simon Fraser <simon.fra...@apple.com>
+
+ Fix Windows build.
+
+ * WebView.h:
+ (WebView::backingScaleFactor):
+ (WebView::pageScaleFactor):
+
2011-08-11 Lucas Forschler <lforsch...@apple.com>
Merged 91097
Modified: branches/safari-534.53-branch/Source/WebKit/win/WebView.h (100340 => 100341)
--- branches/safari-534.53-branch/Source/WebKit/win/WebView.h 2011-11-15 23:07:48 UTC (rev 100340)
+++ branches/safari-534.53-branch/Source/WebKit/win/WebView.h 2011-11-15 23:08:28 UTC (rev 100341)
@@ -992,6 +992,8 @@
virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip);
+ virtual float backingScaleFactor() const { return 1; }
+ virtual float pageScaleFactor() const { return 1; }
virtual bool showDebugBorders() const;
virtual bool showRepaintCounter() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
