Changeset 96859 in webkit
- Timestamp:
- Oct 6, 2011 2:36:30 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 43 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r96857 r96859 1 2011-10-06 Fady Samuel <fsamuel@chromium.org> 2 3 Code clean-up: Make RenderObject::absoluteBoundingBoxRect and associated methods const and make its parameter useTransforms no longer default to false 4 https://bugs.webkit.org/show_bug.cgi?id=69009 5 6 Reviewed by Simon Fraser. 7 8 * Source/autotools/symbols.filter: 9 1 10 2011-10-06 Simon Hausmann <simon.hausmann@nokia.com> 2 11 -
trunk/Source/WebCore/ChangeLog
r96857 r96859 1 2011-10-06 Fady Samuel <fsamuel@chromium.org> 2 3 Code clean-up: Make RenderObject::absoluteBoundingBoxRect and associated methods const and make its parameter useTransforms no longer default to false 4 https://bugs.webkit.org/show_bug.cgi?id=69009 5 6 Reviewed by Simon Fraser. 7 8 Upcoming patches may make use of absoluteBoundingBoxRect on a const RenderObject, so this needed to be fixed. 9 Making useTransforms default to true instead of false and replacing instances of absoluteBoundingBoxRect() to 10 absoluteBoundingBoxRectIgnoringTransforms() partially addreses // FIXME: useTransforms should go away eventually. 11 12 * WebCore.exp.in: 13 * dom/Element.cpp: 14 (WebCore::Element::screenRect): 15 * dom/Node.cpp: 16 (WebCore::Node::getRect): 17 (WebCore::Node::renderRect): 18 * html/shadow/SliderThumbElement.cpp: 19 (WebCore::SliderThumbElement::setPositionFromPoint): 20 * html/shadow/TextControlInnerElements.cpp: 21 (WebCore::InputFieldSpeechButtonElement::startSpeechInput): 22 * inspector/DOMNodeHighlighter.cpp: 23 * plugins/IFrameShimSupport.cpp: 24 (WebCore::getPluginOcclusions): 25 * rendering/RenderBlock.cpp: 26 (WebCore::RenderBlock::absoluteRects): 27 (WebCore::RenderBlock::absoluteQuads): 28 * rendering/RenderBlock.h: 29 * rendering/RenderBox.cpp: 30 (WebCore::RenderBox::absoluteRects): 31 (WebCore::RenderBox::absoluteQuads): 32 * rendering/RenderBox.h: 33 * rendering/RenderFileUploadControl.cpp: 34 (WebCore::RenderFileUploadControl::paintObject): 35 * rendering/RenderIFrame.cpp: 36 (WebCore::RenderIFrame::flattenFrame): 37 * rendering/RenderInline.cpp: 38 (WebCore::RenderInline::absoluteRects): 39 (WebCore::RenderInline::culledInlineAbsoluteRects): 40 (WebCore::RenderInline::absoluteQuads): 41 (WebCore::RenderInline::culledInlineAbsoluteQuads): 42 * rendering/RenderInline.h: 43 * rendering/RenderMenuList.cpp: 44 (WebCore::RenderMenuList::showPopup): 45 * rendering/RenderObject.cpp: 46 (WebCore::RenderObject::absoluteBoundingBoxRect): 47 (WebCore::RenderObject::addAbsoluteRectForLayer): 48 (WebCore::RenderObject::paintingRootRect): 49 * rendering/RenderObject.h: 50 (WebCore::RenderObject::absoluteRects): 51 (WebCore::RenderObject::absoluteBoundingBoxRectIgnoringTransforms): 52 (WebCore::RenderObject::absoluteQuads): 53 * rendering/RenderText.cpp: 54 (WebCore::RenderText::absoluteRects): 55 (WebCore::RenderText::absoluteQuads): 56 * rendering/RenderText.h: 57 * rendering/RenderTextControlSingleLine.cpp: 58 (WebCore::RenderTextControlSingleLine::showPopup): 59 * rendering/RenderThemeSafari.cpp: 60 (WebCore::RenderThemeSafari::paintSearchFieldCancelButton): 61 (WebCore::RenderThemeSafari::paintSearchFieldResultsDecoration): 62 (WebCore::RenderThemeSafari::paintSearchFieldResultsButton): 63 * rendering/RenderView.cpp: 64 (WebCore::RenderView::absoluteRects): 65 (WebCore::RenderView::absoluteQuads): 66 * rendering/RenderView.h: 67 * rendering/svg/RenderSVGBlock.cpp: 68 (WebCore::RenderSVGBlock::absoluteRects): 69 * rendering/svg/RenderSVGBlock.h: 70 * rendering/svg/RenderSVGHiddenContainer.cpp: 71 (WebCore::RenderSVGHiddenContainer::absoluteQuads): 72 * rendering/svg/RenderSVGHiddenContainer.h: 73 * rendering/svg/RenderSVGInline.cpp: 74 (WebCore::RenderSVGInline::absoluteQuads): 75 * rendering/svg/RenderSVGInline.h: 76 * rendering/svg/RenderSVGModelObject.cpp: 77 (WebCore::RenderSVGModelObject::absoluteRects): 78 (WebCore::RenderSVGModelObject::absoluteQuads): 79 * rendering/svg/RenderSVGModelObject.h: 80 * rendering/svg/RenderSVGText.cpp: 81 (WebCore::RenderSVGText::absoluteQuads): 82 * rendering/svg/RenderSVGText.h: 83 * testing/Internals.cpp: 84 (WebCore::Internals::boundingBox): 85 1 86 2011-10-06 Simon Hausmann <simon.hausmann@nokia.com> 2 87 -
trunk/Source/WebCore/WebCore.exp.in
r96823 r96859 282 282 __ZN7WebCore12PrintContextD1Ev 283 283 __ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb 284 __ZN7WebCore12RenderObject23absoluteBoundingBoxRectEb285 284 __ZN7WebCore12RenderWidget28resumeWidgetHierarchyUpdatesEv 286 285 __ZN7WebCore12RenderWidget29suspendWidgetHierarchyUpdatesEv … … 1140 1139 __ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv 1141 1140 __ZNK7WebCore12IconDatabase9isEnabledEv 1141 __ZNK7WebCore12RenderObject23absoluteBoundingBoxRectEb 1142 1142 __ZNK7WebCore12RenderObject14enclosingLayerEv 1143 1143 __ZNK7WebCore12RenderObject15localToAbsoluteERKNS_10FloatPointEbb -
trunk/Source/WebCore/dom/Element.cpp
r96106 r96859 574 574 if (!renderer()) 575 575 return LayoutRect(); 576 return renderer()->view()->frameView()->contentsToScreen(renderer()->absoluteBoundingBoxRect()); 576 // FIXME: this should probably respect transforms 577 return renderer()->view()->frameView()->contentsToScreen(renderer()->absoluteBoundingBoxRectIgnoringTransforms()); 577 578 } 578 579 -
trunk/Source/WebCore/dom/Node.cpp
r96803 r96859 819 819 { 820 820 if (renderer()) 821 return renderer()->absoluteBoundingBoxRect( true);821 return renderer()->absoluteBoundingBoxRect(); 822 822 return LayoutRect(); 823 823 } … … 831 831 if (renderer->isRenderBlock() || renderer->isInlineBlockOrInlineTable() || renderer->isReplaced()) { 832 832 *isReplaced = renderer->isReplaced(); 833 return renderer->absoluteBoundingBoxRect( true);833 return renderer->absoluteBoundingBoxRect(); 834 834 } 835 835 renderer = renderer->parent(); -
trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp
r95901 r96859 217 217 // renderer for this node is usually on a layer and renderBox()->x() and 218 218 // y() are unusable. 219 LayoutPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRect().location(); 219 // FIXME: This should probably respect transforms. 220 LayoutPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRectIgnoringTransforms().location(); 220 221 LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->renderer()->localToAbsolute()); 221 222 if (isVertical) { -
trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp
r95722 r96859 536 536 AtomicString language = input->computeInheritedLanguage(); 537 537 String grammar = input->getAttribute(webkitgrammarAttr); 538 IntRect rect = renderer()->absoluteBoundingBoxRect(); 538 // FIXME: this should probably respect transforms 539 IntRect rect = renderer()->absoluteBoundingBoxRectIgnoringTransforms(); 539 540 if (speechInput()->startRecognition(m_listenerId, rect, language, grammar, document()->securityOrigin())) 540 541 setState(Recording); -
trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp
r95901 r96859 362 362 363 363 LayoutSize mainFrameOffset = frameToMainFrameOffset(containingFrame); 364 LayoutRect boundingBox = renderer->absoluteBoundingBoxRect( true);364 LayoutRect boundingBox = renderer->absoluteBoundingBoxRect(); 365 365 366 366 boundingBox.move(mainFrameOffset); -
trunk/Source/WebCore/plugins/IFrameShimSupport.cpp
r95901 r96859 153 153 154 154 if (element->hasTagName(HTMLNames::iframeTag) 155 && iframeRenderer->absoluteBoundingBoxRect ().intersects(frameRect)155 && iframeRenderer->absoluteBoundingBoxRectIgnoringTransforms().intersects(frameRect) 156 156 && (!iframeRenderer->style() || iframeRenderer->style()->visibility() == VISIBLE)) { 157 157 getObjectStack(iframeRenderer, &iframeZstack); -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r96842 r96859 5880 5880 } 5881 5881 5882 void RenderBlock::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) 5882 void RenderBlock::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) const 5883 5883 { 5884 5884 // For blocks inside inlines, we go ahead and include margins so that we run right up to the … … 5896 5896 } 5897 5897 5898 void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 5898 void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 5899 5899 { 5900 5900 // For blocks inside inlines, we go ahead and include margins so that we run right up to the -
trunk/Source/WebCore/rendering/RenderBlock.h
r96675 r96859 742 742 LayoutUnit logicalRightSelectionOffset(RenderBlock* rootBlock, LayoutUnit position); 743 743 744 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;745 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;744 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 745 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 746 746 747 747 LayoutUnit desiredColumnWidth() const; -
trunk/Source/WebCore/rendering/RenderBox.cpp
r96620 r96859 517 517 } 518 518 519 void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) 519 void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const 520 520 { 521 521 rects.append(LayoutRect(accumulatedOffset, size())); 522 522 } 523 523 524 void RenderBox::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 524 void RenderBox::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 525 525 { 526 526 quads.append(localToAbsoluteQuad(FloatRect(0, 0, width(), height()), false, wasFixed)); -
trunk/Source/WebCore/rendering/RenderBox.h
r96620 r96859 235 235 virtual LayoutUnit collapsedMarginAfter() const { return marginAfter(); } 236 236 237 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) ;238 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;237 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const; 238 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 239 239 240 240 IntRect reflectionBox() const; -
trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp
r95502 r96859 133 133 // We want to match the button's baseline 134 134 RenderButton* buttonRenderer = toRenderButton(button->renderer()); 135 LayoutUnit textY = buttonRenderer->absoluteBoundingBoxRect().y() 135 // FIXME: Make this work with transforms. 136 LayoutUnit textY = buttonRenderer->absoluteBoundingBoxRectIgnoringTransforms().y() 136 137 + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine); 137 138 -
trunk/Source/WebCore/rendering/RenderIFrame.cpp
r94912 r96859 106 106 107 107 // Do not flatten offscreen inner frames during frame flattening, as flattening might make them visible. 108 IntRect boundingRect = absoluteBoundingBoxRect ();108 IntRect boundingRect = absoluteBoundingBoxRectIgnoringTransforms(); 109 109 return boundingRect.maxX() > 0 && boundingRect.maxY() > 0; 110 110 } -
trunk/Source/WebCore/rendering/RenderInline.cpp
r95777 r96859 467 467 } 468 468 469 void RenderInline::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) 469 void RenderInline::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) const 470 470 { 471 471 if (!alwaysCreateLineBoxes()) … … 486 486 } 487 487 488 void RenderInline::culledInlineAbsoluteRects(const RenderInline* container, Vector<LayoutRect>& rects, const LayoutSize& offset) 488 void RenderInline::culledInlineAbsoluteRects(const RenderInline* container, Vector<LayoutRect>& rects, const LayoutSize& offset) const 489 489 { 490 490 if (!culledInlineFirstLineBox()) { … … 554 554 } 555 555 556 void RenderInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 556 void RenderInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 557 557 { 558 558 if (!alwaysCreateLineBoxes()) … … 570 570 } 571 571 572 void RenderInline::culledInlineAbsoluteQuads(const RenderInline* container, Vector<FloatQuad>& quads) 572 void RenderInline::culledInlineAbsoluteQuads(const RenderInline* container, Vector<FloatQuad>& quads) const 573 573 { 574 574 if (!culledInlineFirstLineBox()) { -
trunk/Source/WebCore/rendering/RenderInline.h
r93333 r96859 47 47 virtual LayoutUnit marginEnd() const; 48 48 49 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;50 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;49 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 50 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 51 51 52 52 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const; … … 103 103 InlineBox* culledInlineFirstLineBox() const; 104 104 InlineBox* culledInlineLastLineBox() const; 105 void culledInlineAbsoluteRects(const RenderInline* container, Vector<LayoutRect>&, const LayoutSize&) ;106 void culledInlineAbsoluteQuads(const RenderInline* container, Vector<FloatQuad>&) ;105 void culledInlineAbsoluteRects(const RenderInline* container, Vector<LayoutRect>&, const LayoutSize&) const; 106 void culledInlineAbsoluteQuads(const RenderInline* container, Vector<FloatQuad>&) const; 107 107 108 108 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild); -
trunk/Source/WebCore/rendering/RenderMenuList.cpp
r95502 r96859 303 303 // the actual width of the element to size the popup. 304 304 FloatPoint absTopLeft = localToAbsolute(FloatPoint(), false, true); 305 LayoutRect absBounds = absoluteBoundingBoxRect ();305 LayoutRect absBounds = absoluteBoundingBoxRectIgnoringTransforms(); 306 306 absBounds.setLocation(roundedIntPoint(absTopLeft)); 307 307 m_popup->show(absBounds, document()->view(), -
trunk/Source/WebCore/rendering/RenderObject.cpp
r96620 r96859 1166 1166 } 1167 1167 1168 IntRect RenderObject::absoluteBoundingBoxRect(bool useTransforms) 1168 IntRect RenderObject::absoluteBoundingBoxRect(bool useTransforms) const 1169 1169 { 1170 1170 if (useTransforms) { … … 1216 1216 { 1217 1217 if (hasLayer()) 1218 result.unite(absoluteBoundingBoxRect ());1218 result.unite(absoluteBoundingBoxRectIgnoringTransforms()); 1219 1219 for (RenderObject* current = firstChild(); current; current = current->nextSibling()) 1220 1220 current->addAbsoluteRectForLayer(result); … … 1223 1223 LayoutRect RenderObject::paintingRootRect(LayoutRect& topLevelRect) 1224 1224 { 1225 LayoutRect result = absoluteBoundingBoxRect ();1225 LayoutRect result = absoluteBoundingBoxRectIgnoringTransforms(); 1226 1226 topLevelRect = result; 1227 1227 for (RenderObject* current = firstChild(); current; current = current->nextSibling()) -
trunk/Source/WebCore/rendering/RenderObject.h
r96566 r96859 639 639 LayoutSize offsetFromAncestorContainer(RenderObject*) const; 640 640 641 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint&) { } 641 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint&) const { } 642 642 643 // FIXME: useTransforms should go away eventually 643 IntRect absoluteBoundingBoxRect(bool useTransforms = false); 644 IntRect absoluteBoundingBoxRect(bool useTransform = true) const; 645 IntRect absoluteBoundingBoxRectIgnoringTransforms() const { return absoluteBoundingBoxRect(false); } 644 646 645 647 // Build an array of quads in absolute coords for line boxes 646 virtual void absoluteQuads(Vector<FloatQuad>&, bool* /*wasFixed*/ = 0) { }648 virtual void absoluteQuads(Vector<FloatQuad>&, bool* /*wasFixed*/ = 0) const { } 647 649 648 650 void absoluteFocusRingQuads(Vector<FloatQuad>&); -
trunk/Source/WebCore/rendering/RenderText.cpp
r96187 r96859 302 302 } 303 303 304 void RenderText::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) 304 void RenderText::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) const 305 305 { 306 306 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) … … 389 389 } 390 390 391 void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed, ClippingOption option) 391 void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed, ClippingOption option) const 392 392 { 393 393 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { … … 406 406 } 407 407 408 void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 408 void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 409 409 { 410 410 absoluteQuads(quads, wasFixed, NoClipping); -
trunk/Source/WebCore/rendering/RenderText.h
r96187 r96859 55 55 void dirtyLineBoxes(bool fullLayout); 56 56 57 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;57 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 58 58 void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); 59 59 60 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;60 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 61 61 void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); 62 62 63 63 enum ClippingOption { NoClipping, ClipToEllipsis }; 64 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed = 0, ClippingOption = NoClipping) ;64 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed = 0, ClippingOption = NoClipping) const; 65 65 66 66 virtual VisiblePosition positionForPoint(const LayoutPoint&); -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp
r95901 r96859 175 175 } 176 176 177 m_searchPopup->popupMenu()->show(absoluteBoundingBoxRect( true), document()->view(), -1);177 m_searchPopup->popupMenu()->show(absoluteBoundingBoxRect(), document()->view(), -1); 178 178 } 179 179 -
trunk/Source/WebCore/rendering/RenderThemeSafari.cpp
r96547 r96859 1081 1081 ASSERT(renderer); 1082 1082 1083 IntRect searchRect = renderer->absoluteBoundingBoxRect ();1083 IntRect searchRect = renderer->absoluteBoundingBoxRectIgnoringTransforms(); 1084 1084 1085 1085 paintThemePart(SafariTheme::SearchFieldCancelButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o)); … … 1135 1135 ASSERT(renderer); 1136 1136 1137 IntRect searchRect = renderer->absoluteBoundingBoxRect ();1137 IntRect searchRect = renderer->absoluteBoundingBoxRectIgnoringTransforms(); 1138 1138 1139 1139 paintThemePart(SafariTheme::SearchFieldResultsDecorationPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o)); … … 1158 1158 ASSERT(renderer); 1159 1159 1160 IntRect searchRect = renderer->absoluteBoundingBoxRect ();1160 IntRect searchRect = renderer->absoluteBoundingBoxRectIgnoringTransforms(); 1161 1161 1162 1162 paintThemePart(SafariTheme::SearchFieldResultsButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o)); -
trunk/Source/WebCore/rendering/RenderView.cpp
r96445 r96859 330 330 } 331 331 332 void RenderView::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) 332 void RenderView::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) const 333 333 { 334 334 rects.append(LayoutRect(accumulatedOffset, m_layer->size())); 335 335 } 336 336 337 void RenderView::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 337 void RenderView::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 338 338 { 339 339 if (wasFixed) -
trunk/Source/WebCore/rendering/RenderView.h
r96620 r96859 87 87 bool printing() const; 88 88 89 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;90 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;89 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 90 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 91 91 92 92 #if USE(ACCELERATED_COMPOSITING) -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
r93050 r96859 79 79 } 80 80 81 void RenderSVGBlock::absoluteRects(Vector<LayoutRect>&, const LayoutPoint&) 81 void RenderSVGBlock::absoluteRects(Vector<LayoutRect>&, const LayoutPoint&) const 82 82 { 83 83 // This code path should never be taken for SVG, as we're assuming useTransforms=true everywhere, absoluteQuads should be used. -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h
r93050 r96859 39 39 virtual void updateBoxModelInfoFromStyle(); 40 40 41 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;41 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 42 42 43 43 virtual void willBeDestroyed(); -
trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.cpp
r93050 r96859 45 45 } 46 46 47 void RenderSVGHiddenContainer::absoluteQuads(Vector<FloatQuad>&, bool*) 47 void RenderSVGHiddenContainer::absoluteQuads(Vector<FloatQuad>&, bool*) const 48 48 { 49 49 // This subtree does not take up space or paint -
trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h
r93440 r96859 45 45 46 46 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject*) const { return LayoutRect(); } 47 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;47 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 48 48 49 49 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction); -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp
r96558 r96859 83 83 } 84 84 85 void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 85 void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 86 86 { 87 RenderObject* object = RenderSVGText::locateRenderSVGTextAncestor(this);87 const RenderObject* object = RenderSVGText::locateRenderSVGTextAncestor(this); 88 88 if (!object) 89 89 return; -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.h
r93440 r96859 49 49 virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const; 50 50 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const; 51 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;51 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 52 52 53 53 private: -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp
r96558 r96859 71 71 } 72 72 73 void RenderSVGModelObject::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) 73 void RenderSVGModelObject::absoluteRects(Vector<LayoutRect>& rects, const LayoutPoint& accumulatedOffset) const 74 74 { 75 75 LayoutRect rect = enclosingLayoutRect(strokeBoundingBox()); … … 78 78 } 79 79 80 void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 80 void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 81 81 { 82 82 quads.append(localToAbsoluteQuad(strokeBoundingBox(), false, wasFixed)); -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h
r95901 r96859 56 56 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer, LayoutPoint*) const; 57 57 58 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) ;59 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;58 virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset) const; 59 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 60 60 61 61 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const; -
trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp
r96558 r96859 226 226 } 227 227 228 void RenderSVGText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) 228 void RenderSVGText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const 229 229 { 230 230 quads.append(localToAbsoluteQuad(strokeBoundingBox(), false, wasFixed)); -
trunk/Source/WebCore/rendering/svg/RenderSVGText.h
r93440 r96859 61 61 virtual void layout(); 62 62 63 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) ;63 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 64 64 65 65 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; -
trunk/Source/WebCore/testing/Internals.cpp
r96593 r96859 203 203 if (!renderer) 204 204 return ClientRect::create(); 205 return ClientRect::create(renderer->absoluteBoundingBoxRect ());205 return ClientRect::create(renderer->absoluteBoundingBoxRectIgnoringTransforms()); 206 206 } 207 207 -
trunk/Source/WebKit/qt/Api/qwebframe.cpp
r94620 r96859 1752 1752 innerNode = hitTest.innerNode(); 1753 1753 innerNonSharedNode = hitTest.innerNonSharedNode(); 1754 boundingRect = innerNonSharedNode ? innerNonSharedNode->renderer()->absoluteBoundingBoxRect( true) : IntRect();1754 boundingRect = innerNonSharedNode ? innerNonSharedNode->renderer()->absoluteBoundingBoxRect() : IntRect(); 1755 1755 WebCore::Image *img = hitTest.image(); 1756 1756 if (img) { -
trunk/Source/WebKit/qt/ChangeLog
r96857 r96859 1 2011-10-06 Fady Samuel <fsamuel@chromium.org> 2 3 Code clean-up: Make RenderObject::absoluteBoundingBoxRect and associated methods const and make its parameter useTransforms no longer default to false 4 https://bugs.webkit.org/show_bug.cgi?id=69009 5 6 Reviewed by Simon Fraser. 7 8 * Api/qwebframe.cpp: 9 (QWebHitTestResultPrivate::QWebHitTestResultPrivate): 10 1 11 2011-10-06 Simon Hausmann <simon.hausmann@nokia.com> 2 12 -
trunk/Source/WebKit2/ChangeLog
r96858 r96859 1 2011-10-06 Fady Samuel <fsamuel@chromium.org> 2 3 Code clean-up: Make RenderObject::absoluteBoundingBoxRect and associated methods const and make its parameter useTransforms no longer default to false 4 https://bugs.webkit.org/show_bug.cgi?id=69009 5 6 Reviewed by Simon Fraser. 7 8 * win/WebKit2.def: 9 * win/WebKit2CFLite.def: 10 1 11 2011-10-06 Ravi Phaneendra Kasibhatla <ravi.kasibhatla@motorola.com> 2 12 -
trunk/Source/WebKit2/win/WebKit2.def
r96593 r96859 144 144 ??0String@WTF@@QAE@PBD@Z 145 145 ??0String@WTF@@QAE@PB_W@Z 146 ?absoluteBoundingBoxRect@RenderObject@WebCore@@QAE?AVIntRect@2@_N@Z 146 ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z 147 ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ 147 148 ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBD@Z 148 149 ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z -
trunk/Source/WebKit2/win/WebKit2CFLite.def
r96593 r96859 136 136 ??1NodeRenderingContext@WebCore@@QAE@XZ 137 137 ??1Range@WebCore@@QAE@XZ 138 ?absoluteBoundingBoxRect@RenderObject@WebCore@@QAE?AVIntRect@2@_N@Z 138 ?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z 139 ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ 139 140 ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBD@Z 140 141 ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z -
trunk/Source/autotools/symbols.filter
r96593 r96859 42 42 _ZN7WebCore11EventTarget8toStreamEv; 43 43 _ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv; 44 _ZN 7WebCore12RenderObject23absoluteBoundingBoxRectEb;44 _ZNK7WebCore12RenderObject23absoluteBoundingBoxRectEb; 45 45 _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE; 46 46 _ZN7WebCore15setDOMExceptionEPN3JSC9ExecStateEi;
Note: See TracChangeset
for help on using the changeset viewer.