Ignore:
Timestamp:
Sep 29, 2013, 7:40:50 PM (12 years ago)
Author:
Darin Adler
Message:

Use RenderElement instead of RenderObject in many places
​https://bugs.webkit.org/show_bug.cgi?id=122078

Reviewed by Andreas Kling.

Source/ThirdParty/ANGLE:

  • ANGLE.xcodeproj/project.pbxproj: Let Xcode do its thing to this file.

Source/WebCore:

  • WebCore.exp.in: Updated for name changes.
  • dom/ContainerNode.h: Moved renderer() here from Element.
  • dom/Element.h: Moved renderer() from here to ContainerNode.
  • render/RenderElement.h: Moved renderer() from Element to ContainerNode.
  • accessibility/AccessibilityImageMapLink.cpp:

(WebCore::AccessibilityImageMapLink::imageMapLinkRenderer):
(WebCore::AccessibilityImageMapLink::detachFromParent):
(WebCore::AccessibilityImageMapLink::elementPath):
(WebCore::AccessibilityImageMapLink::elementRect):

  • accessibility/AccessibilityImageMapLink.h:
  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):

  • bindings/objc/DOM.mm:

(-[DOMElement image]):
(-[DOMElement _font]):
(-[DOMElement _imageTIFFRepresentation]):

  • css/CSSCanvasValue.cpp:

(WebCore::CSSCanvasValue::canvasChanged):
(WebCore::CSSCanvasValue::canvasResized):
(WebCore::CSSCanvasValue::canvasDestroyed):
(WebCore::CSSCanvasValue::fixedSize):
(WebCore::CSSCanvasValue::image):

  • css/CSSCanvasValue.h:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::computeRenderStyleForProperty):

  • css/CSSCrossfadeValue.cpp:

(WebCore::subimageKnownToBeOpaque):
(WebCore::CSSCrossfadeValue::fixedSize):
(WebCore::CSSCrossfadeValue::knownToBeOpaque):
(WebCore::CSSCrossfadeValue::image):
(WebCore::CSSCrossfadeValue::crossfadeChanged):

  • css/CSSCrossfadeValue.h:
  • css/CSSFilterImageValue.cpp:

(WebCore::CSSFilterImageValue::fixedSize):
(WebCore::CSSFilterImageValue::knownToBeOpaque):
(WebCore::CSSFilterImageValue::image):
(WebCore::CSSFilterImageValue::filterImageChanged):

  • css/CSSFilterImageValue.h:
  • css/CSSFontSelector.cpp:
  • css/CSSGradientValue.cpp:

(WebCore::CSSGradientValue::image):
(WebCore::CSSGradientValue::addStops):
(WebCore::CSSGradientValue::knownToBeOpaque):
(WebCore::CSSLinearGradientValue::createGradient):
(WebCore::CSSRadialGradientValue::createGradient):

  • css/CSSGradientValue.h:

(WebCore::CSSGradientValue::fixedSize):

  • css/CSSImageGeneratorValue.cpp:

(WebCore::CSSImageGeneratorValue::addClient):
(WebCore::CSSImageGeneratorValue::removeClient):
(WebCore::CSSImageGeneratorValue::image):
(WebCore::CSSImageGeneratorValue::fixedSize):
(WebCore::CSSImageGeneratorValue::knownToBeOpaque):

  • css/CSSImageGeneratorValue.h:

(WebCore::CSSImageGeneratorValue::clients):

  • css/CSSImageValue.cpp:

(WebCore::CSSImageValue::knownToBeOpaque):

  • css/CSSImageValue.h:
  • css/DeprecatedStyleBuilder.cpp:
  • dom/DocumentMarkerController.cpp:

(WebCore::DocumentMarkerController::removeMarkersFromList):
(WebCore::DocumentMarkerController::repaintMarkers):

  • dom/Element.cpp:

(WebCore::localZoomForRenderer):
(WebCore::adjustForLocalZoom):
(WebCore::Element::offsetParent):
(WebCore::Element::updateExistingPseudoElement):

  • dom/ElementRareData.h:

(WebCore::ElementRareData::create):
(WebCore::ElementRareData::ElementRareData):

  • dom/Node.cpp:

(WebCore::Node::ensureRareData):

  • editing/DeleteButtonController.cpp:

(WebCore::isDeletableElement):

  • editing/Editor.cpp:

(WebCore::Editor::hasBidiSelection):
(WebCore::Editor::baseWritingDirectionForSelectionStart):

  • editing/EditorCommand.cpp:

(WebCore::verticalScrollDistance):

  • editing/htmlediting.cpp:

(WebCore::directionOfEnclosingBlock):

  • editing/ios/EditorIOS.mm:

(WebCore::Editor::fontForSelection):
(WebCore::getImage):

  • editing/mac/EditorMac.mm:

(WebCore::Editor::fontForSelection):
(WebCore::getImage):

  • editing/markup.cpp:
  • html/HTMLAreaElement.cpp:

(WebCore::HTMLAreaElement::computePath):
(WebCore::HTMLAreaElement::computeRect):
(WebCore::HTMLAreaElement::setFocus):

  • html/HTMLAreaElement.h:
  • html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::reset):

  • html/HTMLElement.cpp:

(WebCore::HTMLElement::setInnerText):

  • html/HTMLFormControlElement.cpp:

(WebCore::updateFromElementCallback):

  • html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::rendererIsNeeded):

  • html/HTMLFrameOwnerElement.h:
  • html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::x):
(WebCore::HTMLImageElement::y):
(WebCore::HTMLImageElement::willRespondToMouseClickEvents):

  • html/HTMLMapElement.cpp:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::defaultEventHandler):

  • html/HTMLMeterElement.cpp:

(WebCore::HTMLMeterElement::renderMeter):

  • html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::didRecalcStyle):

  • html/HTMLPlugInElement.cpp:

(WebCore::HTMLPlugInElement::willRespondToMouseClickEvents):
(WebCore::HTMLPlugInElement::defaultEventHandler):
(WebCore::HTMLPlugInElement::isKeyboardFocusable):

  • html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::defaultEventHandler):

  • html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::renderProgress):

  • html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::scrollToSelection):
(WebCore::HTMLSelectElement::setOptionsChangedOnRenderer):
(WebCore::HTMLSelectElement::selectOption):

  • html/HTMLTableCellElement.cpp:

(WebCore::HTMLTableCellElement::cellAbove):

  • html/HTMLTextFormControlElement.cpp:

(WebCore::hasVisibleTextArea):
(WebCore::HTMLTextFormControlElement::setSelectionRange):

  • html/InputType.h:
  • html/parser/HTMLResourcePreloader.cpp:
  • html/shadow/MediaControlElementTypes.cpp:

(WebCore::MediaControlElement::setDisplayType):

  • html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlPanelElement::startDrag):
(WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):

  • html/shadow/MeterShadowElement.cpp:

(WebCore::MeterShadowElement::rendererIsNeeded):
(WebCore::MeterInnerElement::rendererIsNeeded):

  • inspector/InspectorOverlay.cpp:
  • inspector/InspectorTimelineAgent.cpp:
  • inspector/InspectorTimelineAgent.h:
  • loader/ImageLoader.cpp:

(WebCore::ImageLoader::renderImageResource):

  • loader/cache/CachedImage.cpp:

(WebCore::CachedImage::currentFrameKnownToBeOpaque):

  • loader/cache/CachedImage.h:
  • mathml/MathMLElement.cpp:
  • page/ContextMenuController.cpp:
  • page/DragController.cpp:

(WebCore::DragController::draggableElement):

  • page/EventHandler.cpp:

(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::clear):
(WebCore::EventHandler::startPanScrolling):
(WebCore::EventHandler::autoscrollRenderer):
(WebCore::EventHandler::scrollOverflow):
(WebCore::EventHandler::logicalScrollOverflow):
(WebCore::EventHandler::subframeForTargetNode):
(WebCore::EventHandler::selectCursor):
(WebCore::layerForNode):
(WebCore::EventHandler::handleWheelEvent):
(WebCore::EventHandler::clearGestureScrollNodes):

  • page/EventHandler.h:
  • page/FocusController.cpp:
  • page/Frame.cpp:

(WebCore::Frame::ownerRenderer):
(WebCore::Frame::visiblePositionForPoint):
(WebCore::Frame::nodeImage):

  • page/FrameView.cpp:

(WebCore::FrameView::applyOverflowToViewport):
(WebCore::FrameView::applyPaginationToViewport):
(WebCore::FrameView::calculateScrollbarModesForLayout):
(WebCore::FrameView::isEnclosedInCompositingLayer):
(WebCore::FrameView::embeddedContentBox):
(WebCore::FrameView::addSlowRepaintObject):
(WebCore::FrameView::removeSlowRepaintObject):
(WebCore::FrameView::addViewportConstrainedObject):
(WebCore::FrameView::removeViewportConstrainedObject):
(WebCore::FrameView::scrollContentsFastPath):
(WebCore::FrameView::repaintSlowRepaintObjects):
(WebCore::FrameView::setViewportConstrainedObjectsNeedLayout):
(WebCore::FrameView::updateOverflowStatus):
(WebCore::FrameView::updateScrollCorner):
(WebCore::FrameView::paintContents):
(WebCore::FrameView::convertFromRenderer):
(WebCore::FrameView::convertToRenderer):

  • page/FrameView.h:
  • page/PageSerializer.cpp:

(WebCore::PageSerializer::addImageToResources):

  • page/PageSerializer.h:
  • page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::AnimationBase):
(WebCore::AnimationBase::updateStateMachine):

  • page/animation/AnimationBase.h:

(WebCore::AnimationBase::renderer):

  • page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::ensureCompositeAnimation):
(WebCore::AnimationControllerPrivate::clear):
(WebCore::AnimationControllerPrivate::updateAnimations):
(WebCore::AnimationControllerPrivate::updateAnimationTimerForRenderer):
(WebCore::AnimationControllerPrivate::isRunningAnimationOnRenderer):
(WebCore::AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer):
(WebCore::AnimationControllerPrivate::suspendAnimationsForDocument):
(WebCore::AnimationControllerPrivate::resumeAnimationsForDocument):
(WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
(WebCore::AnimationControllerPrivate::pauseTransitionAtTime):
(WebCore::AnimationControllerPrivate::getAnimatedStyleForRenderer):
(WebCore::AnimationControllerPrivate::numberOfActiveAnimations):
(WebCore::AnimationController::cancelAnimations):
(WebCore::AnimationController::updateAnimations):
(WebCore::AnimationController::getAnimatedStyleForRenderer):
(WebCore::AnimationController::notifyAnimationStarted):
(WebCore::AnimationController::pauseAnimationAtTime):
(WebCore::AnimationController::pauseTransitionAtTime):
(WebCore::AnimationController::isRunningAnimationOnRenderer):
(WebCore::AnimationController::isRunningAcceleratedAnimationOnRenderer):

  • page/animation/AnimationController.h:
  • page/animation/AnimationControllerPrivate.h:
  • page/animation/CSSPropertyAnimation.cpp:

(WebCore::crossfadeBlend):

  • page/animation/CompositeAnimation.cpp:

(WebCore::CompositeAnimation::updateTransitions):
(WebCore::CompositeAnimation::updateKeyframeAnimations):
(WebCore::CompositeAnimation::animate):

  • page/animation/CompositeAnimation.h:
  • page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::ImplicitAnimation):
(WebCore::ImplicitAnimation::animate):
(WebCore::ImplicitAnimation::pauseAnimation):
(WebCore::ImplicitAnimation::sendTransitionEvent):

  • page/animation/ImplicitAnimation.h:

(WebCore::ImplicitAnimation::create):

  • page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::KeyframeAnimation):
(WebCore::KeyframeAnimation::animate):
(WebCore::KeyframeAnimation::pauseAnimation):
(WebCore::KeyframeAnimation::endAnimation):
(WebCore::KeyframeAnimation::sendAnimationEvent):

  • page/animation/KeyframeAnimation.h:
  • page/mac/EventHandlerMac.mm:

(WebCore::EventHandler::passWidgetMouseDownEventToWidget):
(WebCore::EventHandler::passSubframeEventToSubframe):

  • page/mac/FrameSnapshottingMac.mm:

(WebCore::snapshotDragImage):

  • platform/graphics/mac/MediaPlayerPrivateQTKit.mm:

(WebCore::MediaPlayerPrivateQTKit::paint):

  • rendering/CounterNode.cpp:

(WebCore::CounterNode::CounterNode):
(WebCore::CounterNode::create):

  • rendering/CounterNode.h:

(WebCore::CounterNode::owner):

  • rendering/FilterEffectRenderer.cpp:

(WebCore::FilterEffectRenderer::buildReferenceFilter):
(WebCore::FilterEffectRenderer::build):

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

(WebCore::HitTestResult::spellingToolTip):
(WebCore::HitTestResult::title):
(WebCore::HitTestResult::innerTextIfTruncated):
(WebCore::HitTestResult::image):

  • rendering/LayoutRepainter.cpp:

(WebCore::LayoutRepainter::LayoutRepainter):

  • rendering/LayoutRepainter.h:
  • rendering/LayoutState.h:

(WebCore::LayoutState::LayoutState):

  • rendering/LineWidth.h:
  • rendering/LogicalSelectionOffsetCaches.h:

(WebCore::isContainingBlockCandidateForAbsolutelyPositionedObject):
(WebCore::isNonRenderBlockInline):
(WebCore::containingBlockForFixedPosition):
(WebCore::containingBlockForAbsolutePosition):
(WebCore::containingBlockForObjectInFlow):
(WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):

  • rendering/PaintInfo.h:

(WebCore::PaintInfo::PaintInfo):
(WebCore::PaintInfo::updateSubtreePaintRootForChildren):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::paintFillLayers):
(WebCore::RenderBox::paintFillLayer):

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

(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):

  • rendering/RenderBoxModelObject.h:
  • rendering/RenderCounter.cpp:

(WebCore::nextInPreOrder):
(WebCore::planCounter):
(WebCore::makeCounterNode):
(WebCore::RenderCounter::originalText):

  • rendering/RenderElement.cpp:

(WebCore::RenderElement::~RenderElement):
(WebCore::RenderElement::insertChildInternal):
(WebCore::RenderElement::removeChildInternal):
(WebCore::RenderElement::willBeDestroyed):
(WebCore::RenderElement::rendererForRootBackground):

  • rendering/RenderImageResource.cpp:

(WebCore::RenderImageResource::initialize):

  • rendering/RenderImageResource.h:
  • rendering/RenderImageResourceStyleImage.cpp:

(WebCore::RenderImageResourceStyleImage::initialize):

  • rendering/RenderImageResourceStyleImage.h:

(WebCore::RenderImageResourceStyleImage::create):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame):
(WebCore::RenderLayerCompositor::requiresCompositingLayer):
(WebCore::RenderLayerCompositor::canBeComposited):
(WebCore::RenderLayerCompositor::requiresOwnBackingStore):
(WebCore::RenderLayerCompositor::reasonsForCompositing):
(WebCore::RenderLayerCompositor::requiresCompositingForTransform):
(WebCore::RenderLayerCompositor::requiresCompositingForVideo):
(WebCore::RenderLayerCompositor::requiresCompositingForCanvas):
(WebCore::RenderLayerCompositor::requiresCompositingForPlugin):
(WebCore::RenderLayerCompositor::requiresCompositingForFrame):
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
(WebCore::RenderLayerCompositor::requiresCompositingForIndirectReason):
(WebCore::RenderLayerCompositor::requiresCompositingForFilters):
(WebCore::RenderLayerCompositor::requiresCompositingForBlending):
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
(WebCore::RenderLayerCompositor::isRunningAcceleratedTransformAnimation):

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

(WebCore::RenderObject::containingBlock):
(WebCore::mustRepaintFillLayers):
(WebCore::RenderObject::borderImageIsLoadedAndCanBeRendered):
(WebCore::RenderObject::willBeDestroyed):

  • rendering/RenderScrollbarPart.cpp:

(WebCore::RenderScrollbarPart::rendererOwningScrollbar):

  • rendering/RenderScrollbarPart.h:
  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintBackgroundsBehindCell):

  • rendering/RenderTableCell.h:
  • rendering/RenderView.cpp:

(WebCore::RenderView::RenderView):

  • rendering/style/FillLayer.cpp:

(WebCore::FillLayer::hasOpaqueImage):

  • rendering/style/FillLayer.h:
  • rendering/style/KeyframeList.h:

(WebCore::KeyframeList::KeyframeList):

  • rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::imageSize):
(WebCore::StyleCachedImage::computeIntrinsicDimensions):
(WebCore::StyleCachedImage::setContainerSizeForRenderer):
(WebCore::StyleCachedImage::addClient):
(WebCore::StyleCachedImage::removeClient):
(WebCore::StyleCachedImage::image):
(WebCore::StyleCachedImage::knownToBeOpaque):

  • rendering/style/StyleCachedImage.h:
  • rendering/style/StyleCachedImageSet.cpp:

(WebCore::StyleCachedImageSet::imageSize):
(WebCore::StyleCachedImageSet::computeIntrinsicDimensions):
(WebCore::StyleCachedImageSet::setContainerSizeForRenderer):
(WebCore::StyleCachedImageSet::addClient):
(WebCore::StyleCachedImageSet::removeClient):
(WebCore::StyleCachedImageSet::image):
(WebCore::StyleCachedImageSet::knownToBeOpaque):

  • rendering/style/StyleCachedImageSet.h:
  • rendering/style/StyleGeneratedImage.cpp:

(WebCore::StyleGeneratedImage::imageSize):
(WebCore::StyleGeneratedImage::computeIntrinsicDimensions):
(WebCore::StyleGeneratedImage::addClient):
(WebCore::StyleGeneratedImage::removeClient):
(WebCore::StyleGeneratedImage::image):
(WebCore::StyleGeneratedImage::knownToBeOpaque):

  • rendering/style/StyleGeneratedImage.h:
  • rendering/style/StyleImage.h:

(WebCore::StyleImage::imagesEquivalent):

  • rendering/style/StylePendingImage.h:

(WebCore::StylePendingImage::cssImageValue):
(WebCore::StylePendingImage::cssImageGeneratorValue):
(WebCore::StylePendingImage::cssCursorImageValue):
(WebCore::StylePendingImage::cssImageSetValue):
(WebCore::StylePendingImage::computeIntrinsicDimensions):

  • testing/Internals.cpp:

(WebCore::Internals::boundingBox):
(WebCore::Internals::isSelectPopupVisible):
(WebCore::Internals::isPluginUnavailabilityIndicatorObscured):
Use RenderElement instead of RenderObject where it was easy to do so.
For local variables holding the return value of renderer() functions,
use auto instead, so the most-specific possible type will be used,
without having to figure out what that is in each case. Also use some
more OVERRIDE and FINAL and use nullptr instead of 0. And replace some
cryptic short local variable names with words.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/page/FrameView.cpp

    r156607 r156622  
    599599}
    600600
    601 void FrameView::applyOverflowToViewport(RenderObject* o, ScrollbarMode& hMode, ScrollbarMode& vMode)
     601void FrameView::applyOverflowToViewport(RenderElement* o, ScrollbarMode& hMode, ScrollbarMode& vMode)
    602602{
    603603    // Handle the overflow:hidden/scroll case for the body/html elements.  WinIE treats
    … …  
    667667{
    668668    Document* document = frame().document();
    669     Node* documentElement = document->documentElement();
    670     RenderObject* documentRenderer = documentElement ? documentElement->renderer() : 0;
    671     RenderObject* documentOrBodyRenderer = documentRenderer;
    672     Node* body = document->body();
     669    auto documentElement = document->documentElement();
     670    RenderElement* documentRenderer = documentElement ? documentElement->renderer() : nullptr;
     671    RenderElement* documentOrBodyRenderer = documentRenderer;
     672    auto body = document->body();
    673673    if (body && body->renderer()) {
    674674        if (body->hasTagName(bodyTag))
    … …  
    717717    if (!m_layoutRoot) {
    718718        Document* document = frame().document();
    719         Node* documentElement = document->documentElement();
    720         RenderObject* rootRenderer = documentElement ? documentElement->renderer() : 0;
    721         Node* body = document->body();
     719        auto documentElement = document->documentElement();
     720        RenderElement* rootRenderer = documentElement ? documentElement->renderer() : nullptr;
     721        auto body = document->body();
    722722        if (body && body->renderer()) {
    723723            if (body->hasTagName(framesetTag) && !frameFlatteningEnabled()) {
    … …  
    727727                // It's sufficient to just check the X overflow,
    728728                // since it's illegal to have visible in only one direction.
    729                 RenderObject* o = rootRenderer->style()->overflowX() == OVISIBLE && document->documentElement()->hasTagName(htmlTag) ? body->renderer() : rootRenderer;
     729                RenderElement* o = rootRenderer->style()->overflowX() == OVISIBLE && document->documentElement()->hasTagName(htmlTag) ? body->renderer() : rootRenderer;
    730730                applyOverflowToViewport(o, hMode, vMode);
    731731            }
    … …  
    987987{
    988988#if USE(ACCELERATED_COMPOSITING)
    989     RenderObject* frameOwnerRenderer = frame().ownerRenderer();
     989    auto frameOwnerRenderer = frame().ownerRenderer();
    990990    if (frameOwnerRenderer && frameOwnerRenderer->containerForRepaint())
    991991        return true;
    … …  
    996996    return false;
    997997}
    998    
     998
    999999bool FrameView::flushCompositingStateIncludingSubframes()
    10001000{
    … …  
    13721372    RenderView* renderView = this->renderView();
    13731373    if (!renderView)
    1374         return 0;
     1374        return nullptr;
    13751375
    13761376    RenderObject* firstChild = renderView->firstChild();
    13771377    if (!firstChild || !firstChild->isBox())
    1378         return 0;
     1378        return nullptr;
    13791379
    13801380    // Curently only embedded SVG documents participate in the size-negotiation logic.
    1381     if (firstChild->isSVGRoot())
     1381    if (toRenderBox(firstChild)->isSVGRoot())
    13821382        return toRenderBox(firstChild);
    13831383#endif
    13841384
    1385     return 0;
     1385    return nullptr;
    13861386}
    13871387
    … …  
    14921492}
    14931493
    1494 void FrameView::addSlowRepaintObject(RenderObject* o)
     1494void FrameView::addSlowRepaintObject(RenderElement* o)
    14951495{
    14961496    bool hadSlowRepaintObjects = hasSlowRepaintObjects();
    14971497
    14981498    if (!m_slowRepaintObjects)
    1499         m_slowRepaintObjects = adoptPtr(new RenderObjectSet);
     1499        m_slowRepaintObjects = adoptPtr(new HashSet<RenderElement*>);
    15001500
    15011501    m_slowRepaintObjects->add(o);
    … …  
    15111511}
    15121512
    1513 void FrameView::removeSlowRepaintObject(RenderObject* o)
     1513void FrameView::removeSlowRepaintObject(RenderElement* o)
    15141514{
    15151515    if (!m_slowRepaintObjects)
    … …  
    15281528}
    15291529
    1530 void FrameView::addViewportConstrainedObject(RenderObject* object)
     1530void FrameView::addViewportConstrainedObject(RenderElement* object)
    15311531{
    15321532    if (!m_viewportConstrainedObjects)
    … …  
    15451545}
    15461546
    1547 void FrameView::removeViewportConstrainedObject(RenderObject* object)
     1547void FrameView::removeViewportConstrainedObject(RenderElement* object)
    15481548{
    15491549    if (m_viewportConstrainedObjects && m_viewportConstrainedObjects->remove(object)) {
    … …  
    16421642    // Get the rects of the fixed objects visible in the rectToScroll
    16431643    Region regionToUpdate;
    1644     ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObjects->end();
    1645     for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrainedObjects->begin(); it != end; ++it) {
    1646         RenderObject* renderer = *it;
     1644    for (auto it = m_viewportConstrainedObjects->begin(), end = m_viewportConstrainedObjects->end(); it != end; ++it) {
     1645        RenderElement* renderer = *it;
    16471646        if (!renderer->style()->hasViewportConstrainedPosition())
    16481647            continue;
    … …  
    16511650            continue;
    16521651#endif
    1653    
     1652
    16541653        // Fixed items should always have layers.
    16551654        ASSERT(renderer->hasLayer());
    … …  
    17431742    // Renderers with fixed backgrounds may be in compositing layers, so we need to explicitly
    17441743    // repaint them after scrolling.
    1745     RenderObjectSet::const_iterator end = m_slowRepaintObjects->end();
    1746     for (RenderObjectSet::const_iterator it = m_slowRepaintObjects->begin(); it != end; ++it) {
    1747         RenderObject* renderer = *it;
    1748         renderer->repaint();
    1749     }
     1744    for (auto it = m_slowRepaintObjects->begin(), end = m_slowRepaintObjects->end(); it != end; ++it)
     1745        (*it)->repaint();
    17501746}
    17511747
    … …  
    19461942        return;
    19471943
    1948     ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObjects->end();
    1949     for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrainedObjects->begin(); it != end; ++it) {
    1950         RenderObject* renderer = *it;
    1951         renderer->setNeedsLayout(true);
    1952     }
     1944    for (auto it = m_viewportConstrainedObjects->begin(), end = m_viewportConstrainedObjects->end(); it != end; ++it)
     1945        (*it)->setNeedsLayout(true);
    19531946}
    19541947
    … …  
    29782971       
    29792972        scheduleEvent(OverflowEvent::create(horizontalOverflowChanged, horizontalOverflow,
    2980             verticalOverflowChanged, verticalOverflow),
    2981             m_viewportRenderer->node());
     2973            verticalOverflowChanged, verticalOverflow), m_viewportRenderer->element());
    29822974    }
    29832975   
    … …  
    32143206void FrameView::updateScrollCorner()
    32153207{
    3216     RenderObject* renderer = 0;
     3208    RenderElement* renderer = 0;
    32173209    RefPtr<RenderStyle> cornerStyle;
    32183210    IntRect cornerRect = scrollCornerRect();
    … …  
    35193511
    35203512#ifndef NDEBUG
    3521     RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&rootLayer->renderer());
     3513    RenderElement::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&rootLayer->renderer());
    35223514#endif
    35233515
    … …  
    38023794}
    38033795
    3804 IntRect FrameView::convertFromRenderer(const RenderObject* renderer, const IntRect& rendererRect) const
     3796IntRect FrameView::convertFromRenderer(const RenderElement* renderer, const IntRect& rendererRect) const
    38053797{
    38063798    IntRect rect = pixelSnappedIntRect(enclosingLayoutRect(renderer->localToAbsoluteQuad(FloatRect(rendererRect)).boundingBox()));
    … …  
    38133805}
    38143806
    3815 IntRect FrameView::convertToRenderer(const RenderObject* renderer, const IntRect& viewRect) const
     3807IntRect FrameView::convertToRenderer(const RenderElement* renderer, const IntRect& viewRect) const
    38163808{
    38173809    IntRect rect = viewRect;
    … …  
    38273819}
    38283820
    3829 IntPoint FrameView::convertFromRenderer(const RenderObject* renderer, const IntPoint& rendererPoint) const
     3821IntPoint FrameView::convertFromRenderer(const RenderElement* renderer, const IntPoint& rendererPoint) const
    38303822{
    38313823    IntPoint point = roundedIntPoint(renderer->localToAbsolute(rendererPoint, UseTransforms));
    … …  
    38373829}
    38383830
    3839 IntPoint FrameView::convertToRenderer(const RenderObject* renderer, const IntPoint& viewPoint) const
     3831IntPoint FrameView::convertToRenderer(const RenderElement* renderer, const IntPoint& viewPoint) const
    38403832{
    38413833    IntPoint point = viewPoint;
Note: See TracChangeset for help on using the changeset viewer.