Diff
Modified: branches/subpixellayout/Source/WebCore/WebCore.exp.in (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/WebCore.exp.in 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/WebCore.exp.in 2012-03-22 09:43:46 UTC (rev 111665)
@@ -823,12 +823,12 @@
__ZN7WebCore5Color11transparentE
__ZN7WebCore5Color5whiteE
__ZN7WebCore5Frame10createViewERKNS_7IntSizeERKNS_5ColorEbS3_bNS_13ScrollbarModeEbS7_b
-__ZN7WebCore5Frame13rangeForPointERKNS_21FractionalLayoutPointE
+__ZN7WebCore5Frame13rangeForPointERKNS_8IntPointE
__ZN7WebCore5Frame14frameForWidgetEPKNS_6WidgetE
__ZN7WebCore5Frame17setPageZoomFactorEf
__ZN7WebCore5Frame17setTextZoomFactorEf
__ZN7WebCore5Frame24searchForLabelsAboveCellEPNS_17RegularExpressionEPNS_20HTMLTableCellElementEPm
-__ZN7WebCore5Frame23visiblePositionForPointERKNS_21FractionalLayoutPointE
+__ZN7WebCore5Frame23visiblePositionForPointERKNS_8IntPointE
__ZN7WebCore5Frame25setPageAndTextZoomFactorsEff
__ZN7WebCore5Frame27resizePageRectsKeepingRatioERKNS_9FloatSizeES3_
__ZN7WebCore5Frame6createEPNS_4PageEPNS_21HTMLFrameOwnerElementEPNS_17FrameLoaderClientE
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -495,17 +495,17 @@
return roundedIntPoint(LayoutPoint(rect.x() + rect.width() / 2, rect.y() + rect.height() / 2));
}
-LayoutRect AccessibilityObject::boundingBoxForQuads(RenderObject* obj, const Vector<FloatQuad>& quads)
+IntRect AccessibilityObject::boundingBoxForQuads(RenderObject* obj, const Vector<FloatQuad>& quads)
{
ASSERT(obj);
if (!obj)
- return LayoutRect();
+ return IntRect();
size_t count = quads.size();
if (!count)
- return LayoutRect();
+ return IntRect();
- LayoutRect result;
+ IntRect result;
for (size_t i = 0; i < count; ++i) {
IntRect r = quads[i].enclosingBoundingBox();
if (!r.isEmpty()) {
@@ -1466,14 +1466,14 @@
return equalIgnoringCase(liveRegion, "polite") || equalIgnoringCase(liveRegion, "assertive");
}
-AccessibilityObject* AccessibilityObject::elementAccessibilityHitTest(const LayoutPoint& point) const
+AccessibilityObject* AccessibilityObject::elementAccessibilityHitTest(const IntPoint& point) const
{
// Send the hit test back into the sub-frame if necessary.
if (isAttachment()) {
Widget* widget = widgetForAttachmentView();
// Normalize the point for the widget's bounds.
if (widget && widget->isFrameView())
- return axObjectCache()->getOrCreate(widget)->accessibilityHitTest(toLayoutPoint(point - widget->frameRect().location()));
+ return axObjectCache()->getOrCreate(widget)->accessibilityHitTest(toPoint(point - widget->frameRect().location()));
}
// Check if there are any mock elements that need to be handled.
@@ -1620,7 +1620,7 @@
void AccessibilityObject::scrollToMakeVisible() const
{
IntRect objectRect = pixelSnappedIntRect(boundingBoxRect());
- objectRect.move(-objectRect.x(), -objectRect.y());
+ objectRect.setLocation(IntPoint());
scrollToMakeVisibleWithSubFocus(objectRect);
}
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.h (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.h 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityObject.h 2012-03-22 09:43:46 UTC (rev 111665)
@@ -461,9 +461,9 @@
virtual void determineARIADropEffects(Vector<String>&) { }
// Called on the root AX object to return the deepest available element.
- virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const { return 0; }
+ virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const { return 0; }
// Called on the AX object after the render tree determines which is the right AccessibilityRenderObject.
- virtual AccessibilityObject* elementAccessibilityHitTest(const LayoutPoint&) const;
+ virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const;
virtual AccessibilityObject* focusedUIElement() const;
@@ -507,7 +507,7 @@
virtual LayoutRect elementRect() const = 0;
virtual LayoutSize size() const { return elementRect().size(); }
virtual IntPoint clickPoint();
- static LayoutRect boundingBoxForQuads(RenderObject*, const Vector<FloatQuad>&);
+ static IntRect boundingBoxForQuads(RenderObject*, const Vector<FloatQuad>&);
virtual PlainTextRange selectedTextRange() const { return PlainTextRange(); }
unsigned selectionStart() const { return selectedTextRange().start; }
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -2651,7 +2651,7 @@
}
}
-VisiblePosition AccessibilityRenderObject::visiblePositionForPoint(const LayoutPoint& point) const
+VisiblePosition AccessibilityRenderObject::visiblePositionForPoint(const IntPoint& point) const
{
if (!m_renderer)
return VisiblePosition();
@@ -2676,7 +2676,7 @@
while (1) {
LayoutPoint ourpoint;
#if PLATFORM(MAC)
- ourpoint = frameView->screenToContents(roundedIntPoint(point));
+ ourpoint = frameView->screenToContents(point);
#else
ourpoint = point;
#endif
@@ -2840,7 +2840,7 @@
return 0;
}
-AccessibilityObject* AccessibilityRenderObject::accessibilityHitTest(const LayoutPoint& point) const
+AccessibilityObject* AccessibilityRenderObject::accessibilityHitTest(const IntPoint& point) const
{
if (!m_renderer || !m_renderer->hasLayer())
return 0;
@@ -2855,7 +2855,7 @@
Node* node = hitTestResult.innerNode()->shadowAncestorNode();
if (node->hasTagName(areaTag))
- return accessibilityImageMapHitTest(static_cast<HTMLAreaElement*>(node), roundedIntPoint(point));
+ return accessibilityImageMapHitTest(static_cast<HTMLAreaElement*>(node), point);
if (node->hasTagName(optionTag))
node = static_cast<HTMLOptionElement*>(node)->ownerSelectElement();
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.h (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.h 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.h 2012-03-22 09:43:46 UTC (rev 111665)
@@ -154,7 +154,7 @@
void updateAccessibilityRole();
// Should be called on the root accessibility object to kick off a hit test.
- virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const;
+ virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const;
virtual Element* actionElement() const;
Element* mouseButtonListener() const;
@@ -239,7 +239,7 @@
virtual bool isARIAGrabbed();
virtual void determineARIADropEffects(Vector<String>&);
- virtual VisiblePosition visiblePositionForPoint(const LayoutPoint&) const;
+ virtual VisiblePosition visiblePositionForPoint(const IntPoint&) const;
virtual VisiblePosition visiblePositionForIndex(unsigned indexValue, bool lastIndexOK) const;
virtual int index(const VisiblePosition&) const;
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -163,7 +163,7 @@
return axObjectCache()->getOrCreate(doc->renderer());
}
-AccessibilityObject* AccessibilityScrollView::accessibilityHitTest(const LayoutPoint& point) const
+AccessibilityObject* AccessibilityScrollView::accessibilityHitTest(const IntPoint& point) const
{
AccessibilityObject* webArea = webAreaObject();
if (!webArea)
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.h (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.h 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityScrollView.h 2012-03-22 09:43:46 UTC (rev 111665)
@@ -57,7 +57,7 @@
virtual AccessibilityObject* scrollBar(AccessibilityOrientation);
virtual void addChildren();
virtual void clearChildren();
- virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const;
+ virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const;
virtual void updateChildrenIfNecessary();
virtual void setNeedsToUpdateChildren() { m_childrenDirty = true; }
void updateScrollbars();
Modified: branches/subpixellayout/Source/WebCore/editing/Editor.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/editing/Editor.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/editing/Editor.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -2245,7 +2245,7 @@
FrameView* frameView = frame->view();
if (!frameView)
return 0;
- LayoutPoint framePoint = frameView->windowToContents(windowPoint);
+ IntPoint framePoint = frameView->windowToContents(windowPoint);
VisibleSelection selection(frame->visiblePositionForPoint(framePoint));
return avoidIntersectionWithNode(selection.toNormalizedRange().get(), m_deleteButtonController->containerElement());
}
Modified: branches/subpixellayout/Source/WebCore/editing/VisiblePosition.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/editing/VisiblePosition.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/editing/VisiblePosition.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -605,7 +605,7 @@
renderer = node->renderer();
if (!renderer)
- return IntRect();
+ return LayoutRect();
InlineBox* inlineBox;
int caretOffset;
Modified: branches/subpixellayout/Source/WebCore/page/Frame.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/page/Frame.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/page/Frame.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -730,7 +730,7 @@
return document() ? document()->displayStringModifiedByEncoding(str) : str;
}
-VisiblePosition Frame::visiblePositionForPoint(const LayoutPoint& framePoint)
+VisiblePosition Frame::visiblePositionForPoint(const IntPoint& framePoint)
{
HitTestResult result = eventHandler()->hitTestResultAtPoint(framePoint, true);
Node* node = result.innerNonSharedNode();
@@ -750,7 +750,7 @@
if (!view())
return 0;
- LayoutPoint pt = view()->windowToContents(point);
+ IntPoint pt = view()->windowToContents(point);
HitTestResult result = HitTestResult(pt);
if (contentRenderer())
@@ -758,7 +758,7 @@
return result.innerNode() ? result.innerNode()->document() : 0;
}
-PassRefPtr<Range> Frame::rangeForPoint(const LayoutPoint& framePoint)
+PassRefPtr<Range> Frame::rangeForPoint(const IntPoint& framePoint)
{
VisiblePosition position = visiblePositionForPoint(framePoint);
if (position.isNull())
Modified: branches/subpixellayout/Source/WebCore/page/Frame.h (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/page/Frame.h 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/page/Frame.h 2012-03-22 09:43:46 UTC (rev 111665)
@@ -179,9 +179,9 @@
DragImageRef nodeImage(Node*);
DragImageRef dragImageForSelection();
- VisiblePosition visiblePositionForPoint(const LayoutPoint& framePoint);
+ VisiblePosition visiblePositionForPoint(const IntPoint& framePoint);
Document* documentAtPoint(const IntPoint& windowPoint);
- PassRefPtr<Range> rangeForPoint(const LayoutPoint& framePoint);
+ PassRefPtr<Range> rangeForPoint(const IntPoint& framePoint);
String searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*, size_t* resultDistanceFromStartOfCell);
String searchForLabelsBeforeElement(const Vector<String>& labels, Element*, size_t* resultDistance, bool* resultIsInCellAbove);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp (111664 => 111665)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-22 09:35:14 UTC (rev 111664)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-22 09:43:46 UTC (rev 111665)
@@ -645,11 +645,11 @@
// If we don't stick out of the root line's font box, then don't bother computing our glyph overflow. This optimization
// will keep us from computing glyph bounds in nearly all cases.
bool includeRootLine = lineBox->includesRootLineBoxFontOrLeading();
- LayoutUnit baselineShift = lineBox->verticalPositionForBox(run->m_box, verticalPositionCache);
- LayoutUnit rootDescent = includeRootLine ? lineBox->renderer()->style(lineInfo.isFirstLine())->font().fontMetrics().descent() : 0;
- LayoutUnit rootAscent = includeRootLine ? lineBox->renderer()->style(lineInfo.isFirstLine())->font().fontMetrics().ascent() : 0;
- LayoutUnit boxAscent = renderer->style(lineInfo.isFirstLine())->font().fontMetrics().ascent() - baselineShift;
- LayoutUnit boxDescent = renderer->style(lineInfo.isFirstLine())->font().fontMetrics().descent() + baselineShift;
+ int baselineShift = lineBox->verticalPositionForBox(run->m_box, verticalPositionCache);
+ int rootDescent = includeRootLine ? lineBox->renderer()->style(lineInfo.isFirstLine())->font().fontMetrics().descent() : 0;
+ int rootAscent = includeRootLine ? lineBox->renderer()->style(lineInfo.isFirstLine())->font().fontMetrics().ascent() : 0;
+ int boxAscent = renderer->style(lineInfo.isFirstLine())->font().fontMetrics().ascent() - baselineShift;
+ int boxDescent = renderer->style(lineInfo.isFirstLine())->font().fontMetrics().descent() + baselineShift;
if (boxAscent > rootDescent || boxDescent > rootAscent)
glyphOverflow.computeBounds = true;
}
