Title: [194440] trunk/Source/WebKit/win
- Revision
- 194440
- Author
- [email protected]
- Date
- 2015-12-29 18:45:34 -0800 (Tue, 29 Dec 2015)
Log Message
Fix Windows build.
* WebView.cpp:
(WebView::scrollOffset):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (194439 => 194440)
--- trunk/Source/WebKit/win/ChangeLog 2015-12-30 01:03:36 UTC (rev 194439)
+++ trunk/Source/WebKit/win/ChangeLog 2015-12-30 02:45:34 UTC (rev 194440)
@@ -1,3 +1,10 @@
+2015-12-29 Simon Fraser <[email protected]>
+
+ Fix Windows build.
+
+ * WebView.cpp:
+ (WebView::scrollOffset):
+
2015-12-25 David Kilzer <[email protected]>
ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
Modified: trunk/Source/WebKit/win/WebView.cpp (194439 => 194440)
--- trunk/Source/WebKit/win/WebView.cpp 2015-12-30 01:03:36 UTC (rev 194439)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-12-30 02:45:34 UTC (rev 194440)
@@ -5471,12 +5471,13 @@
{
if (!offset)
return E_POINTER;
- IntSize offsetIntSize = m_page->mainFrame().view()->scrollOffset();
- offsetIntSize.scale(deviceScaleFactor());
+ IntPoint scrollPosition = m_page->mainFrame().view()->scrollPosition();
+ float scaleFactor = deviceScaleFactor();
+ scrollPosition.scale(scaleFactor, scaleFactor);
- offset->x = offsetIntSize.width();
- offset->y = offsetIntSize.height();
+ offset->x = scrollPosition.x();
+ offset->y = scrollPosition.y();
return S_OK;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
