Changeset 90667 in webkit


Ignore:
Timestamp:
Jul 8, 2011 3:01:17 PM (13 years ago)
Author:
eae@chromium.org
Message:

Switch pointInContainer and accumulatedOffset to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=64112

Reviewed by Eric Seidel.

Convert remaining IntPoint versions of the pointInContainer and
accumulatedOffset arguments to the new layout abstraction.

No new tests, no functionality changes.

  • rendering/HitTestResult.cpp:

(WebCore::HitTestResult::addNodeToRectBasedTestResult):

  • rendering/HitTestResult.h:
  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::isPointInOverflowControl):

  • rendering/RenderBlock.h:
  • rendering/RenderBox.cpp:

(WebCore::RenderBox::pushContentsClip):
(WebCore::RenderBox::popContentsClip):

  • rendering/RenderBox.h:
  • rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::getReplacementTextGeometry):

  • rendering/RenderEmbeddedObject.h:
  • rendering/RenderLineBoxList.cpp:

(WebCore::RenderLineBoxList::hitTest):

  • rendering/RenderLineBoxList.h:
  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::isPointInOverflowControl):

  • rendering/RenderListBox.h:
  • rendering/RenderObject.cpp:

(WebCore::RenderObject::hitTest):

  • rendering/RenderObject.h:
  • rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::hitInnerTextElement):

  • rendering/RenderTextControl.h:
  • rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::nodeAtPoint):

Location:
trunk/Source/WebCore
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r90662 r90667  
     12011-07-08  Emil A Eklund  <eae@chromium.org>
     2
     3        Switch pointInContainer and accumulatedOffset to to new layout types
     4        https://bugs.webkit.org/show_bug.cgi?id=64112
     5
     6        Reviewed by Eric Seidel.
     7
     8        Convert remaining IntPoint versions of the pointInContainer and
     9        accumulatedOffset arguments to the new layout abstraction.
     10
     11        No new tests, no functionality changes.
     12
     13        * rendering/HitTestResult.cpp:
     14        (WebCore::HitTestResult::addNodeToRectBasedTestResult):
     15        * rendering/HitTestResult.h:
     16        * rendering/RenderBlock.cpp:
     17        (WebCore::RenderBlock::isPointInOverflowControl):
     18        * rendering/RenderBlock.h:
     19        * rendering/RenderBox.cpp:
     20        (WebCore::RenderBox::pushContentsClip):
     21        (WebCore::RenderBox::popContentsClip):
     22        * rendering/RenderBox.h:
     23        * rendering/RenderEmbeddedObject.cpp:
     24        (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
     25        * rendering/RenderEmbeddedObject.h:
     26        * rendering/RenderLineBoxList.cpp:
     27        (WebCore::RenderLineBoxList::hitTest):
     28        * rendering/RenderLineBoxList.h:
     29        * rendering/RenderListBox.cpp:
     30        (WebCore::RenderListBox::isPointInOverflowControl):
     31        * rendering/RenderListBox.h:
     32        * rendering/RenderObject.cpp:
     33        (WebCore::RenderObject::hitTest):
     34        * rendering/RenderObject.h:
     35        * rendering/RenderTextControl.cpp:
     36        (WebCore::RenderTextControl::hitInnerTextElement):
     37        * rendering/RenderTextControl.h:
     38        * rendering/RenderTextControlSingleLine.cpp:
     39        (WebCore::RenderTextControlSingleLine::nodeAtPoint):
     40
    1412011-07-07  Ryosuke Niwa  <rniwa@webkit.org>
    242

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r90600 r90667  
    39373937}
    39383938
    3939 bool RenderBlock::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset)
     3939bool RenderBlock::isPointInOverflowControl(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
    39403940{
    39413941    if (!scrollsOverflow())

  • trunk/Source/WebCore/rendering/RenderBlock.h

    r90600 r90667  
    597597    bool hitTestFloats(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
    598598
    599     virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset);
     599    virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
    600600
    601601    void computeInlinePreferredLogicalWidths();

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r90600 r90667  
    11031103#endif
    11041104
    1105 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const IntPoint& accumulatedOffset)
     1105bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset)
    11061106{
    11071107    if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
    … …  
    11291129}
    11301130
    1131 void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, const IntPoint& accumulatedOffset)
     1131void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, const LayoutPoint& accumulatedOffset)
    11321132{
    11331133    ASSERT(hasControlClip() || (hasOverflowClip() && !layer()->isSelfPaintingLayer()));

  • trunk/Source/WebCore/rendering/RenderBox.h

    r90600 r90667  
    228228    virtual LayoutUnit collapsedMarginAfter() const { return marginAfter(); }
    229229
    230     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     230    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset);
    231231    virtual void absoluteQuads(Vector<FloatQuad>&);
    232232   
    … …  
    347347    virtual bool hasControlClip() const { return false; }
    348348    virtual IntRect controlClipRect(const IntPoint&) const { return IntRect(); }
    349     bool pushContentsClip(PaintInfo&, const IntPoint& accumulatedOffset);
    350     void popContentsClip(PaintInfo&, PaintPhase originalPhase, const IntPoint& accumulatedOffset);
     349    bool pushContentsClip(PaintInfo&, const LayoutPoint& accumulatedOffset);
     350    void popContentsClip(PaintInfo&, PaintPhase originalPhase, const LayoutPoint& accumulatedOffset);
    351351
    352352    virtual void paintObject(PaintInfo&, const LayoutPoint&) { ASSERT_NOT_REACHED(); }

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r90048 r90667  
    181181}
    182182
    183 bool RenderEmbeddedObject::getReplacementTextGeometry(const IntPoint& accumulatedOffset, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth)
     183bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth)
    184184{
    185185    contentRect = contentBoxRect();

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

    r90048 r90667  
    6969    void setMissingPluginIndicatorIsPressed(bool);
    7070    bool isInMissingPluginIndicator(MouseEvent*);
    71     bool getReplacementTextGeometry(const IntPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth);
     71    bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth);
    7272
    7373    String m_replacementText;

  • trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

    r90600 r90667  
    275275
    276276
    277 bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction hitTestAction) const
     277bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction) const
    278278{
    279279    if (hitTestAction != HitTestForeground)
    … …  
    286286        return false;
    287287
    288     IntRect rect = firstLineBox()->isHorizontal() ?
     288    LayoutRect rect = firstLineBox()->isHorizontal() ?
    289289        IntRect(pointInContainer.x(), pointInContainer.y() - result.topPadding(), 1, result.topPadding() + result.bottomPadding() + 1) :
    290290        IntRect(pointInContainer.x() - result.leftPadding(), pointInContainer.y(), result.rightPadding() + result.leftPadding() + 1, 1);

  • trunk/Source/WebCore/rendering/RenderLineBoxList.h

    r90048 r90667  
    6565
    6666    void paint(RenderBoxModelObject*, PaintInfo&, const LayoutPoint&) const;
    67     bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction) const;
     67    bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) const;
    6868   
    6969private:

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r90600 r90667  
    440440}
    441441
    442 bool RenderListBox::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset)
     442bool RenderListBox::isPointInOverflowControl(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
    443443{
    444444    if (!m_vBar)
    445445        return false;
    446446
    447     IntRect vertRect(accumulatedOffset.x() + width() - borderRight() - m_vBar->width(),
    448                      accumulatedOffset.y() + borderTop(),
    449                      m_vBar->width(),
    450                      height() - borderTop() - borderBottom());
     447    LayoutRect vertRect(accumulatedOffset.x() + width() - borderRight() - m_vBar->width(),
     448                        accumulatedOffset.y() + borderTop(),
     449                        m_vBar->width(),
     450                        height() - borderTop() - borderBottom());
    451451
    452452    if (vertRect.contains(pointInContainer)) {

  • trunk/Source/WebCore/rendering/RenderListBox.h

    r90600 r90667  
    6969    virtual IntRect controlClipRect(const IntPoint&) const;
    7070
    71     virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset);
     71    virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
    7272
    7373    virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r90600 r90667  
    21462146}
    21472147
    2148 bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestFilter hitTestFilter)
     2148bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter hitTestFilter)
    21492149{
    21502150    bool inside = false;

  • trunk/Source/WebCore/rendering/RenderObject.h

    r90600 r90667  
    549549#endif
    550550
    551     bool hitTest(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestFilter = HitTestAll);
     551    bool hitTest(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter = HitTestAll);
    552552    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
    553553    virtual void updateHitTestResult(HitTestResult&, const IntPoint&);

  • trunk/Source/WebCore/rendering/RenderTextControl.cpp

    r90662 r90667  
    336336}
    337337
    338 void RenderTextControl::hitInnerTextElement(HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset)
     338void RenderTextControl::hitInnerTextElement(HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset)
    339339{
    340340    IntPoint adjustedLocation = accumulatedOffset + location();

  • trunk/Source/WebCore/rendering/RenderTextControl.h

    r90662 r90667  
    6161    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
    6262
    63     void hitInnerTextElement(HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset);
     63    void hitInnerTextElement(HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset);
    6464    void forwardEvent(Event*);
    6565

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

    r90591 r90667  
    333333}
    334334
    335 bool RenderTextControlSingleLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction hitTestAction)
     335bool RenderTextControlSingleLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
    336336{
    337337    if (!RenderTextControl::nodeAtPoint(request, result, pointInContainer, accumulatedOffset, hitTestAction))
    … …  
    344344    HTMLElement* container = containerElement();
    345345    if (result.innerNode()->isDescendantOf(innerTextElement()) || result.innerNode() == node() || (container && container == result.innerNode())) {
    346         IntPoint pointInParent = pointInContainer;
     346        LayoutPoint pointInParent = pointInContainer;
    347347        if (container && innerBlockElement()) {
    348348            if (innerBlockElement()->renderBox())
    349                 pointInParent -= toSize(innerBlockElement()->renderBox()->location());
     349                pointInParent -= toLayoutSize(innerBlockElement()->renderBox()->location());
    350350            if (container->renderBox())
    351                 pointInParent -= toSize(container->renderBox()->location());
     351                pointInParent -= toLayoutSize(container->renderBox()->location());
    352352        }
    353353        hitInnerTextElement(result, pointInParent, accumulatedOffset);
Note: See TracChangeset for help on using the changeset viewer.