Title: [130550] trunk/Source/WebKit/chromium
- Revision
- 130550
- Author
- jchaffr...@webkit.org
- Date
- 2012-10-05 14:13:38 -0700 (Fri, 05 Oct 2012)
Log Message
Unreviewed build fix after r130545.
* tests/WebFrameTest.cpp:
Avoid a warning about truncating the double constant on Windows. While touching the variable, changed
it to be proper camelCase.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (130549 => 130550)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-05 21:12:18 UTC (rev 130549)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-05 21:13:38 UTC (rev 130550)
@@ -1,3 +1,11 @@
+2012-10-05 Julien Chaffraix <jchaffr...@webkit.org>
+
+ Unreviewed build fix after r130545.
+
+ * tests/WebFrameTest.cpp:
+ Avoid a warning about truncating the double constant on Windows. While touching the variable, changed
+ it to be proper camelCase.
+
2012-10-05 Oli Lan <oli...@chromium.org>
Allow EventHandler to handle longpress gestures, including longpress selection on Android.
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (130549 => 130550)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-10-05 21:12:18 UTC (rev 130549)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-10-05 21:13:38 UTC (rev 130550)
@@ -504,7 +504,7 @@
DivAutoZoomTestWebViewClient client;
int viewportWidth = 640;
int viewportHeight = 480;
- float LeftBoxRatio = 0.3;
+ float leftBoxRatio = 0.3f;
int caretPadding = 10;
int minReadableCaretHeight = 18;
client.m_windowRect = WebRect(0, 0, viewportWidth, viewportHeight);
@@ -529,7 +529,7 @@
webViewImpl->selectionBounds(caret, rect);
webView->scrollFocusedNodeIntoRect(rect);
// The edit box should be left aligned with a margin for possible label.
- int hScroll = editBoxWithText.x * webView->pageScaleFactor() - LeftBoxRatio * viewportWidth;
+ int hScroll = editBoxWithText.x * webView->pageScaleFactor() - leftBoxRatio * viewportWidth;
EXPECT_EQ(hScroll, webView->mainFrame()->scrollOffset().width);
int vScroll = editBoxWithText.y * webView->pageScaleFactor() - (viewportHeight - editBoxWithText.height * webView->pageScaleFactor()) / 2;
EXPECT_EQ(vScroll, webView->mainFrame()->scrollOffset().height);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
