Diff
Modified: trunk/LayoutTests/ChangeLog (171013 => 171014)
--- trunk/LayoutTests/ChangeLog 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/LayoutTests/ChangeLog 2014-07-11 22:36:14 UTC (rev 171014)
@@ -1,3 +1,17 @@
+2014-07-11 Zalan Bujtas <[email protected]>
+
+ REGRESSION (r168868): eBay 'see all' links fail due to different JS bindings conversion behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=134841
+ <rdar://problem/17577563>
+
+ Reviewed by Simon Fraser.
+
+ Revert back to type int for Element.scroll* APIs in order to preserve exception handling
+ behavior.
+
+ * cssom/non-subpixel-scroll-top-left-values-expected.txt: Added.
+ * cssom/non-subpixel-scroll-top-left-values.html: Added.
+
2014-07-11 Javier Fernandez <[email protected]>
[CSS Grid Layout] Implement justify-self css property
Added: trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values-expected.txt (0 => 171014)
--- trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values-expected.txt (rev 0)
+++ trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values-expected.txt 2014-07-11 22:36:14 UTC (rev 171014)
@@ -0,0 +1,226 @@
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:0.00scrollLeft:0.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:1.00scrollLeft:1.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:2.00scrollLeft:2.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:3.00scrollLeft:3.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:4.00scrollLeft:4.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:5.00scrollLeft:5.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:6.00scrollLeft:6.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:7.00scrollLeft:7.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:8.00scrollLeft:8.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:9.00scrollLeft:9.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:10.00scrollLeft:10.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:11.00scrollLeft:11.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:12.00scrollLeft:12.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:13.00scrollLeft:13.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:14.00scrollLeft:14.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:15.00scrollLeft:15.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:16.00scrollLeft:16.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:17.00scrollLeft:17.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:18.00scrollLeft:18.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:19.00scrollLeft:19.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:20.00scrollLeft:20.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:21.00scrollLeft:21.00
+scrollTop:22.00scrollLeft:22.00
+scrollTop:22.00scrollLeft:22.00
+scrollTop:22.00scrollLeft:22.00
+scrollTop:22.00scrollLeft:22.00
+scrollTop:22.00scrollLeft:22.00
+
Added: trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values.html (0 => 171014)
--- trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values.html (rev 0)
+++ trunk/LayoutTests/cssom/non-subpixel-scroll-top-left-values.html 2014-07-11 22:36:14 UTC (rev 171014)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that Element.scroll* return integral values.</title>
+<style>
+div {
+ position: fixed;
+ width: 30px;
+ height: 30px;
+ border: 1px solid red;
+ overflow: scroll;
+}
+</style>
+</head>
+<body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var container = document.body;
+ for (i = 0; i < 15; ++i) {
+ for (j = 0; j < 15; ++j) {
+ var e = document.createElement("div");
+ e.style.top = (30 * i) + "px";
+ e.style.left = (30 * j) + "px";
+ e.innerHTML = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ";
+ container.appendChild(e);
+ }
+ }
+
+ var result = "";
+ var adjustment = 0;
+ var divs = document.getElementsByTagName("div");
+ for (i = 0; i < divs.length; ++i) {
+ var element = divs[i];
+ element.scrollTop = adjustment;
+ element.scrollLeft = adjustment;
+ result += "scrollTop:" + element.scrollTop.toFixed(2) + "scrollLeft:" + element.scrollLeft.toFixed(2) + "<br>";
+ adjustment += 0.1;
+ }
+ document.body.innerHTML = result;
+</script>
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt (171013 => 171014)
--- trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/LayoutTests/fast/dom/non-numeric-values-numeric-parameters-expected.txt 2014-07-11 22:36:14 UTC (rev 171014)
@@ -23,8 +23,8 @@
PASS nonNumericPolicy('document.elementFromPoint(0, x)') is 'any type allowed'
PASS nonNumericPolicy('document.body.scrollByLines(x)') is 'any type allowed'
PASS nonNumericPolicy('document.body.scrollByPages(x)') is 'any type allowed'
-PASS nonNumericPolicy('document.body.scrollLeft = x') is 'mixed'
-PASS nonNumericPolicy('document.body.scrollTop = x') is 'mixed'
+PASS nonNumericPolicy('document.body.scrollLeft = x') is 'any type allowed'
+PASS nonNumericPolicy('document.body.scrollTop = x') is 'any type allowed'
PASS nonNumericPolicy('document.images.item(x)') is 'any type allowed'
PASS nonNumericPolicy('document.createElement("input").setSelectionRange(x, 0)') is 'any type allowed'
PASS nonNumericPolicy('document.createElement("input").setSelectionRange(0, x)') is 'any type allowed'
Modified: trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js (171013 => 171014)
--- trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/LayoutTests/fast/dom/script-tests/non-numeric-values-numeric-parameters.js 2014-07-11 22:36:14 UTC (rev 171014)
@@ -226,8 +226,8 @@
shouldBe("nonNumericPolicy('document.body.scrollByLines(x)')", "'any type allowed'");
shouldBe("nonNumericPolicy('document.body.scrollByPages(x)')", "'any type allowed'");
-shouldBe("nonNumericPolicy('document.body.scrollLeft = x')", "'mixed'");
-shouldBe("nonNumericPolicy('document.body.scrollTop = x')", "'mixed'");
+shouldBe("nonNumericPolicy('document.body.scrollLeft = x')", "'any type allowed'");
+shouldBe("nonNumericPolicy('document.body.scrollTop = x')", "'any type allowed'");
// History
@@ -392,8 +392,8 @@
../../../../WebCore/html/HTMLAppletElement.idl: attribute [ConvertFromString] long vspace;
../../../../WebCore/html/HTMLAreaElement.idl: attribute long tabIndex;
../../../../WebCore/html/HTMLBaseFontElement.idl: attribute long size;
-../../../../WebCore/html/HTMLBodyElement.idl: attribute float scrollLeft;
-../../../../WebCore/html/HTMLBodyElement.idl: attribute float scrollTop;
+../../../../WebCore/html/HTMLBodyElement.idl: attribute long scrollLeft;
+../../../../WebCore/html/HTMLBodyElement.idl: attribute long scrollTop;
../../../../WebCore/html/HTMLButtonElement.idl: attribute long tabIndex;
../../../../WebCore/html/HTMLCanvasElement.idl: attribute long width;
../../../../WebCore/html/HTMLCanvasElement.idl: attribute long height;
Modified: trunk/Source/WebCore/ChangeLog (171013 => 171014)
--- trunk/Source/WebCore/ChangeLog 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/ChangeLog 2014-07-11 22:36:14 UTC (rev 171014)
@@ -1,3 +1,35 @@
+2014-07-11 Zalan Bujtas <[email protected]>
+
+ REGRESSION (r168868): eBay 'see all' links fail due to different JS bindings conversion behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=134841
+ <rdar://problem/17577563>
+
+ Reviewed by Simon Fraser.
+
+ Revert back to type int for Element.scroll* APIs in order to preserve exception handling
+ behavior.
+
+ Test: cssom/non-subpixel-scroll-top-left-values.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::scrollLeft):
+ (WebCore::Element::scrollTop):
+ (WebCore::Element::setScrollLeft):
+ (WebCore::Element::setScrollTop):
+ (WebCore::Element::scrollWidth):
+ (WebCore::Element::scrollHeight):
+ * dom/Element.h:
+ * dom/Element.idl:
+ * html/HTMLBodyElement.cpp:
+ (WebCore::adjustForZoom):
+ (WebCore::HTMLBodyElement::scrollLeft):
+ (WebCore::HTMLBodyElement::setScrollLeft):
+ (WebCore::HTMLBodyElement::scrollTop):
+ (WebCore::HTMLBodyElement::setScrollTop):
+ (WebCore::HTMLBodyElement::scrollHeight):
+ (WebCore::HTMLBodyElement::scrollWidth):
+ * html/HTMLBodyElement.h:
+
2014-07-11 Joseph Pecoraro <[email protected]>
Web Inspector: Debugger Pause button does not work
Modified: trunk/Source/WebCore/dom/Element.cpp (171013 => 171014)
--- trunk/Source/WebCore/dom/Element.cpp 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-07-11 22:36:14 UTC (rev 171014)
@@ -823,7 +823,7 @@
return 0;
}
-double Element::scrollLeft()
+int Element::scrollLeft()
{
document().updateLayoutIgnorePendingStylesheets();
@@ -832,7 +832,7 @@
return 0;
}
-double Element::scrollTop()
+int Element::scrollTop()
{
document().updateLayoutIgnorePendingStylesheets();
@@ -841,29 +841,29 @@
return 0;
}
-void Element::setScrollLeft(double newLeft)
+void Element::setScrollLeft(int newLeft)
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* renderer = renderBox()) {
- renderer->setScrollLeft(round(newLeft * renderer->style().effectiveZoom()));
+ renderer->setScrollLeft(static_cast<int>(newLeft * renderer->style().effectiveZoom()));
if (auto* scrollableArea = renderer->layer())
scrollableArea->setScrolledProgrammatically(true);
}
}
-void Element::setScrollTop(double newTop)
+void Element::setScrollTop(int newTop)
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* renderer = renderBox()) {
- renderer->setScrollTop(round(newTop * renderer->style().effectiveZoom()));
+ renderer->setScrollTop(static_cast<int>(newTop * renderer->style().effectiveZoom()));
if (auto* scrollableArea = renderer->layer())
scrollableArea->setScrolledProgrammatically(true);
}
}
-double Element::scrollWidth()
+int Element::scrollWidth()
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* rend = renderBox())
@@ -871,7 +871,7 @@
return 0;
}
-double Element::scrollHeight()
+int Element::scrollHeight()
{
document().updateLayoutIgnorePendingStylesheets();
if (RenderBox* rend = renderBox())
Modified: trunk/Source/WebCore/dom/Element.h (171013 => 171014)
--- trunk/Source/WebCore/dom/Element.h 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/dom/Element.h 2014-07-11 22:36:14 UTC (rev 171014)
@@ -220,12 +220,12 @@
double clientTop();
double clientWidth();
double clientHeight();
- virtual double scrollLeft();
- virtual double scrollTop();
- virtual void setScrollLeft(double);
- virtual void setScrollTop(double);
- virtual double scrollWidth();
- virtual double scrollHeight();
+ virtual int scrollLeft();
+ virtual int scrollTop();
+ virtual void setScrollLeft(int);
+ virtual void setScrollTop(int);
+ virtual int scrollWidth();
+ virtual int scrollHeight();
IntRect boundsInRootViewSpace();
Modified: trunk/Source/WebCore/dom/Element.idl (171013 => 171014)
--- trunk/Source/WebCore/dom/Element.idl 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/dom/Element.idl 2014-07-11 22:36:14 UTC (rev 171014)
@@ -78,10 +78,6 @@
readonly attribute long clientTop;
readonly attribute long clientWidth;
readonly attribute long clientHeight;
- attribute long scrollLeft;
- attribute long scrollTop;
- readonly attribute long scrollWidth;
- readonly attribute long scrollHeight;
#else
readonly attribute double offsetLeft;
readonly attribute double offsetTop;
@@ -91,12 +87,13 @@
readonly attribute double clientTop;
readonly attribute double clientWidth;
readonly attribute double clientHeight;
- attribute double scrollLeft;
- attribute double scrollTop;
- readonly attribute double scrollWidth;
- readonly attribute double scrollHeight;
#endif
+ attribute long scrollLeft;
+ attribute long scrollTop;
+ readonly attribute long scrollWidth;
+ readonly attribute long scrollHeight;
+
[ImplementedAs=bindingsOffsetParent] readonly attribute Element offsetParent;
void focus();
Modified: trunk/Source/WebCore/html/HTMLBodyElement.cpp (171013 => 171014)
--- trunk/Source/WebCore/html/HTMLBodyElement.cpp 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/html/HTMLBodyElement.cpp 2014-07-11 22:36:14 UTC (rev 171014)
@@ -198,7 +198,7 @@
return hasEditableStyle() || HTMLElement::supportsFocus();
}
-static double adjustForZoom(int value, const Frame& frame)
+static int adjustForZoom(int value, const Frame& frame)
{
double zoomFactor = frame.pageZoomFactor() * frame.frameScaleFactor();
if (zoomFactor == 1)
@@ -206,10 +206,10 @@
// Needed because of truncation (rather than rounding) when scaling up.
if (zoomFactor > 1)
value++;
- return value / zoomFactor;
+ return static_cast<int>(value / zoomFactor);
}
-double HTMLBodyElement::scrollLeft()
+int HTMLBodyElement::scrollLeft()
{
document().updateLayoutIgnorePendingStylesheets();
Frame* frame = document().frame();
@@ -218,10 +218,10 @@
FrameView* view = frame->view();
if (!view)
return 0;
- return floor(adjustForZoom(view->contentsScrollPosition().x(), *frame));
+ return adjustForZoom(view->contentsScrollPosition().x(), *frame);
}
-void HTMLBodyElement::setScrollLeft(double scrollLeft)
+void HTMLBodyElement::setScrollLeft(int scrollLeft)
{
document().updateLayoutIgnorePendingStylesheets();
Frame* frame = document().frame();
@@ -233,7 +233,7 @@
view->setScrollPosition(IntPoint(static_cast<int>(scrollLeft * frame->pageZoomFactor() * frame->frameScaleFactor()), view->scrollY()));
}
-double HTMLBodyElement::scrollTop()
+int HTMLBodyElement::scrollTop()
{
document().updateLayoutIgnorePendingStylesheets();
Frame* frame = document().frame();
@@ -242,10 +242,10 @@
FrameView* view = frame->view();
if (!view)
return 0;
- return floor(adjustForZoom(view->contentsScrollPosition().y(), *frame));
+ return adjustForZoom(view->contentsScrollPosition().y(), *frame);
}
-void HTMLBodyElement::setScrollTop(double scrollTop)
+void HTMLBodyElement::setScrollTop(int scrollTop)
{
document().updateLayoutIgnorePendingStylesheets();
Frame* frame = document().frame();
@@ -257,7 +257,7 @@
view->setScrollPosition(IntPoint(view->scrollX(), static_cast<int>(scrollTop * frame->pageZoomFactor() * frame->frameScaleFactor())));
}
-double HTMLBodyElement::scrollHeight()
+int HTMLBodyElement::scrollHeight()
{
// Update the document's layout.
document().updateLayoutIgnorePendingStylesheets();
@@ -267,10 +267,10 @@
FrameView* view = frame->view();
if (!view)
return 0;
- return floor(adjustForZoom(view->contentsHeight(), *frame));
+ return adjustForZoom(view->contentsHeight(), *frame);
}
-double HTMLBodyElement::scrollWidth()
+int HTMLBodyElement::scrollWidth()
{
// Update the document's layout.
document().updateLayoutIgnorePendingStylesheets();
@@ -280,7 +280,7 @@
FrameView* view = frame->view();
if (!view)
return 0;
- return floor(adjustForZoom(view->contentsWidth(), *frame));
+ return adjustForZoom(view->contentsWidth(), *frame);
}
void HTMLBodyElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
Modified: trunk/Source/WebCore/html/HTMLBodyElement.h (171013 => 171014)
--- trunk/Source/WebCore/html/HTMLBodyElement.h 2014-07-11 21:54:19 UTC (rev 171013)
+++ trunk/Source/WebCore/html/HTMLBodyElement.h 2014-07-11 22:36:14 UTC (rev 171014)
@@ -69,14 +69,14 @@
virtual bool supportsFocus() const override;
- virtual double scrollLeft() override;
- virtual void setScrollLeft(double) override;
+ virtual int scrollLeft() override;
+ virtual void setScrollLeft(int) override;
- virtual double scrollTop() override;
- virtual void setScrollTop(double) override;
+ virtual int scrollTop() override;
+ virtual void setScrollTop(int) override;
- virtual double scrollHeight() override;
- virtual double scrollWidth() override;
+ virtual int scrollHeight() override;
+ virtual int scrollWidth() override;
virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
};
