Title: [135593] trunk/Source/WebKit/chromium
- Revision
- 135593
- Author
- [email protected]
- Date
- 2012-11-23 04:48:34 -0800 (Fri, 23 Nov 2012)
Log Message
Unreviewed. Fix Chromium Win compilation after r135580.
https://bugs.webkit.org/show_bug.cgi?id=101772
* tests/WebFrameTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (135592 => 135593)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-23 12:38:07 UTC (rev 135592)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-23 12:48:34 UTC (rev 135593)
@@ -1,3 +1,10 @@
+2012-11-23 Yury Semikhatsky <[email protected]>
+
+ Unreviewed. Fix Chromium Win compilation after r135580.
+ https://bugs.webkit.org/show_bug.cgi?id=101772
+
+ * tests/WebFrameTest.cpp:
+
2012-11-23 Sami Kyostila <[email protected]>
[chromium] Remove WebScreenInfo.{horizontal,vertical}DPI
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (135592 => 135593)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-11-23 12:38:07 UTC (rev 135592)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-11-23 12:48:34 UTC (rev 135593)
@@ -293,7 +293,7 @@
registerMockedHttpURLLoad("scale_oscillate.html");
FixedLayoutTestWebViewClient client;
- client.m_screenInfo.deviceScaleFactor = 1.325;
+ client.m_screenInfo.deviceScaleFactor = static_cast<float>(1.325);
int viewportWidth = 800;
int viewportHeight = 1057;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
