Diff
Modified: trunk/Source/WebCore/ChangeLog (139044 => 139045)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 09:27:08 UTC (rev 139045)
@@ -1,3 +1,30 @@
+2013-01-08 Steve Block <[email protected]>
+
+ Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize'
+ https://bugs.webkit.org/show_bug.cgi?id=106307
+
+ This matches other method names which distinguish between sizes and
+ points. See https://bugs.webkit.org/show_bug.cgi?id=105992#c4.
+
+ Reviewed by Kentaro Hara.
+
+ Refactoring only, no functional change.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::scrollTo):
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::scrollOffset):
+ * platform/graphics/IntPoint.h:
+ (WebCore::toIntSize):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPositions):
+ (WebCore::RenderLayer::positionNewlyCreatedOverflowControls):
+ (WebCore::RenderLayer::paintOverflowControls):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
2013-01-08 Yoshifumi Inoue <[email protected]>
Dragging over an element with scrollbars should scroll the element when dragging near edges
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (139044 => 139045)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -3366,7 +3366,7 @@
return;
RenderLayer* layer = box->layer();
- layer->scrollToOffset(toSize(point), RenderLayer::ScrollOffsetClamped);
+ layer->scrollToOffset(toIntSize(point), RenderLayer::ScrollOffsetClamped);
}
#if ENABLE(MATHML)
Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (139044 => 139045)
--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -1287,7 +1287,7 @@
// Convert to coords relative to the list box if needed.
MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
IntPoint localOffset = roundedIntPoint(renderer()->absoluteToLocal(mouseEvent->absoluteLocation(), UseTransforms));
- int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toSize(localOffset));
+ int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toIntSize(localOffset));
if (listIndex >= 0) {
if (!disabled()) {
#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
@@ -1307,7 +1307,7 @@
return;
IntPoint localOffset = roundedIntPoint(renderer()->absoluteToLocal(mouseEvent->absoluteLocation(), UseTransforms));
- int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toSize(localOffset));
+ int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toIntSize(localOffset));
if (listIndex >= 0) {
if (!disabled()) {
if (m_multiple) {
Modified: trunk/Source/WebCore/platform/ScrollView.h (139044 => 139045)
--- trunk/Source/WebCore/platform/ScrollView.h 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/platform/ScrollView.h 2013-01-08 09:27:08 UTC (rev 139045)
@@ -170,7 +170,7 @@
// Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values).
virtual IntPoint scrollPosition() const OVERRIDE { return visibleContentRect().location(); }
- IntSize scrollOffset() const { return toSize(visibleContentRect().location()); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes.
+ IntSize scrollOffset() const { return toIntSize(visibleContentRect().location()); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes.
virtual IntPoint maximumScrollPosition() const OVERRIDE; // The maximum position we can be scrolled to.
virtual IntPoint minimumScrollPosition() const OVERRIDE; // The minimum position we can be scrolled to.
// Adjust the passed in scroll position to keep it between the minimum and maximum positions.
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (139044 => 139045)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2013-01-08 09:27:08 UTC (rev 139045)
@@ -210,7 +210,7 @@
return a.x() != b.x() || a.y() != b.y();
}
-inline IntSize toSize(const IntPoint& a)
+inline IntSize toIntSize(const IntPoint& a)
{
return IntSize(a.x(), a.y());
}
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (139044 => 139045)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -395,7 +395,7 @@
// as canUseConvertToLayerCoords may be true for an ancestor layer.
convertToLayerCoords(root(), offsetFromRoot);
}
- positionOverflowControls(toSize(roundedIntPoint(offsetFromRoot)));
+ positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
}
updateDescendantDependentFlags();
@@ -790,7 +790,7 @@
geometryMap.pushMappingsToAncestor(parent(), 0);
LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
- positionOverflowControls(toSize(roundedIntPoint(offsetFromRoot)));
+ positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
}
#endif
@@ -3114,7 +3114,7 @@
// Move the scrollbar widgets if necessary. We normally move and resize widgets during layout, but sometimes
// widgets can move without layout occurring (most notably when you scroll a document that
// contains fixed positioned elements).
- positionOverflowControls(toSize(adjustedPaintOffset));
+ positionOverflowControls(toIntSize(adjustedPaintOffset));
// Now that we're sure the scrollbars are in the right place, paint them.
if (m_hBar
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (139044 => 139045)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -635,7 +635,7 @@
}
m_graphicsLayer->setPosition(FloatPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation));
- m_graphicsLayer->setOffsetFromRenderer(toSize(localCompositingBounds.location()));
+ m_graphicsLayer->setOffsetFromRenderer(toIntSize(localCompositingBounds.location()));
FloatSize oldSize = m_graphicsLayer->size();
FloatSize newSize = relativeCompositingBounds.size();
@@ -654,7 +654,7 @@
clippingBox = clipBox(toRenderBox(renderer()));
clipLayer->setPosition(FloatPoint(clippingBox.location() - localCompositingBounds.location()));
clipLayer->setSize(clippingBox.size());
- clipLayer->setOffsetFromRenderer(toSize(clippingBox.location()));
+ clipLayer->setOffsetFromRenderer(toIntSize(clippingBox.location()));
}
if (m_maskLayer) {
@@ -709,7 +709,7 @@
// If we have a clipping layer (which clips descendants), then the foreground layer is a child of it,
// so that it gets correctly sorted with children. In that case, position relative to the clipping layer.
foregroundSize = FloatSize(clippingBox.size());
- foregroundOffset = toSize(clippingBox.location());
+ foregroundOffset = toIntSize(clippingBox.location());
}
m_foregroundLayer->setPosition(foregroundPosition);
@@ -743,7 +743,7 @@
m_scrollingContentsLayer->setPosition(FloatPoint(-scrollOffset.width(), -scrollOffset.height()));
IntSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
- m_scrollingLayer->setOffsetFromRenderer(-toSize(paddingBox.location()));
+ m_scrollingLayer->setOffsetFromRenderer(-toIntSize(paddingBox.location()));
bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
@@ -751,7 +751,7 @@
if (scrollSize != m_scrollingContentsLayer->size() || paddingBoxOffsetChanged)
m_scrollingContentsLayer->setNeedsDisplay();
- IntSize scrollingContentsOffset = toSize(paddingBox.location() - scrollOffset);
+ IntSize scrollingContentsOffset = toIntSize(paddingBox.location() - scrollOffset);
if (scrollingContentsOffset != m_scrollingContentsLayer->offsetFromRenderer() || scrollSize != m_scrollingContentsLayer->size())
compositor()->scrollingLayerDidChange(m_owningLayer);
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (139044 => 139045)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -313,7 +313,7 @@
} else {
// RenderBox-based elements case (scrollable boxes (div's, p's, textarea's, etc)).
- layer->scrollToOffset(toSize(scrollPosition));
+ layer->scrollToOffset(toIntSize(scrollPosition));
}
layer->renderer()->frame()->selection()->updateAppearance();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (139044 => 139045)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-01-08 09:27:08 UTC (rev 139045)
@@ -1,3 +1,16 @@
+2013-01-08 Steve Block <[email protected]>
+
+ Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize'
+ https://bugs.webkit.org/show_bug.cgi?id=106307
+
+ This matches other method names which distinguish between sizes and
+ points. See https://bugs.webkit.org/show_bug.cgi?id=105992#c4.
+
+ Reviewed by Kentaro Hara.
+
+ * Api/InRegionScroller.cpp:
+ (BlackBerry::WebKit::InRegionScrollerPrivate::setLayerScrollPosition):
+
2013-01-07 Genevieve Mak <[email protected]>
[BlackBerry] Touch Events are falling through fullscreen video
Modified: trunk/Source/WebKit/chromium/ChangeLog (139044 => 139045)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-08 09:27:08 UTC (rev 139045)
@@ -1,3 +1,19 @@
+2013-01-08 Steve Block <[email protected]>
+
+ Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize'
+ https://bugs.webkit.org/show_bug.cgi?id=106307
+
+ This matches other method names which distinguish between sizes and
+ points. See https://bugs.webkit.org/show_bug.cgi?id=105992#c4.
+
+ Reviewed by Kentaro Hara.
+
+ * src/NonCompositedContentHost.cpp:
+ (WebKit::NonCompositedContentHost::setViewport):
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::minimumScrollOffset):
+ (WebKit::WebFrameImpl::maximumScrollOffset):
+
2013-01-08 Yoshifumi Inoue <[email protected]>
Dragging over an element with scrollbars should scroll the element when dragging near edges
Modified: trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp (139044 => 139045)
--- trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -121,7 +121,7 @@
// In RTL-style pages, the origin of the initial containing block for the
// root layer may be positive; translate the layer to avoid negative
// coordinates.
- m_layerAdjust = -toSize(scrollOrigin);
+ m_layerAdjust = -toIntSize(scrollOrigin);
if (m_graphicsLayer->transform().m41() != m_layerAdjust.width() || m_graphicsLayer->transform().m42() != m_layerAdjust.height()) {
WebCore::TransformationMatrix transform = m_graphicsLayer->transform();
transform.setM41(m_layerAdjust.width());
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (139044 => 139045)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-08 08:57:56 UTC (rev 139044)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-01-08 09:27:08 UTC (rev 139045)
@@ -602,7 +602,7 @@
FrameView* view = frameView();
if (!view)
return WebSize();
- return toSize(view->minimumScrollPosition());
+ return toIntSize(view->minimumScrollPosition());
}
WebSize WebFrameImpl::maximumScrollOffset() const
@@ -610,7 +610,7 @@
FrameView* view = frameView();
if (!view)
return WebSize();
- return toSize(view->maximumScrollPosition());
+ return toIntSize(view->maximumScrollPosition());
}
void WebFrameImpl::setScrollOffset(const WebSize& offset)
