[webkit-changes] [104364] branches/safari-534.54-branch/Source/WebKit/win

Fri, 06 Jan 2012 17:41:02 -0800

Title: [104364] branches/safari-534.54-branch/Source/WebKit/win
Revision
104364
Author
[email protected]
Date
2012-01-06 17:40:56 -0800 (Fri, 06 Jan 2012)

Log Message

Merged r91145.


Modified Paths

Diff

Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (104363 => 104364)


--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:40:13 UTC (rev 104363)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:40:56 UTC (rev 104364)
@@ -1,5 +1,17 @@
 2011-1-6  Lucas Forschler  <[email protected]>
 
+    Merge 91145
+
+    2011-07-15  Simon Fraser  <[email protected]>
+
+            Fix Windows build.
+
+            * WebView.h:
+            (WebView::backingScaleFactor):
+            (WebView::pageScaleFactor):
+
+2011-1-6  Lucas Forschler  <[email protected]>
+
     Merge 104296
 
     2012-01-06  Jessie Berlin  <[email protected]>

Modified: branches/safari-534.54-branch/Source/WebKit/win/WebView.h (104363 => 104364)


--- branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:40:13 UTC (rev 104363)
+++ branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:40:56 UTC (rev 104364)
@@ -994,6 +994,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to