Commit 8cdf7124 authored by darin@apple.com's avatar darin@apple.com

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156622 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1a4cbada
...@@ -166,11 +166,11 @@ ...@@ -166,11 +166,11 @@
49951C0614B7AAD80060E96E /* BuiltInFunctionEmulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltInFunctionEmulator.h; sourceTree = "<group>"; }; 49951C0614B7AAD80060E96E /* BuiltInFunctionEmulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltInFunctionEmulator.h; sourceTree = "<group>"; };
5CB13FD2179DB3FD001F851D /* DetectCallDepth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetectCallDepth.cpp; sourceTree = "<group>"; }; 5CB13FD2179DB3FD001F851D /* DetectCallDepth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetectCallDepth.cpp; sourceTree = "<group>"; };
5CB13FD3179DB3FD001F851D /* DetectCallDepth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetectCallDepth.h; sourceTree = "<group>"; }; 5CB13FD3179DB3FD001F851D /* DetectCallDepth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetectCallDepth.h; sourceTree = "<group>"; };
5CB13FDF179F4658001F851D /* ExpressionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExpressionParser.cpp; path = ExpressionParser.cpp; sourceTree = "<group>"; }; 5CB13FDF179F4658001F851D /* ExpressionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExpressionParser.cpp; sourceTree = "<group>"; };
5CB13FE0179F4658001F851D /* glslang_lex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glslang_lex.cpp; path = glslang_lex.cpp; sourceTree = "<group>"; }; 5CB13FE0179F4658001F851D /* glslang_lex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glslang_lex.cpp; sourceTree = "<group>"; };
5CB13FE1179F4658001F851D /* glslang_tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glslang_tab.cpp; path = glslang_tab.cpp; sourceTree = "<group>"; }; 5CB13FE1179F4658001F851D /* glslang_tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glslang_tab.cpp; sourceTree = "<group>"; };
5CB13FE2179F4658001F851D /* glslang_tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glslang_tab.h; path = glslang_tab.h; sourceTree = "<group>"; }; 5CB13FE2179F4658001F851D /* glslang_tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = glslang_tab.h; sourceTree = "<group>"; };
5CB13FE3179F4658001F851D /* Tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tokenizer.cpp; path = Tokenizer.cpp; sourceTree = "<group>"; }; 5CB13FE3179F4658001F851D /* Tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Tokenizer.cpp; sourceTree = "<group>"; };
5D7C59C51208C68B001C873E /* ANGLE.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ANGLE.xcconfig; sourceTree = "<group>"; }; 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ANGLE.xcconfig; sourceTree = "<group>"; };
5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; }; 5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; }; 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
......
2013-09-29 Darin Adler <darin@apple.com>
Use RenderElement instead of RenderObject in many places
https://bugs.webkit.org/show_bug.cgi?id=122078
Reviewed by Andreas Kling.
* ANGLE.xcodeproj/project.pbxproj: Let Xcode do its thing to this file.
2013-09-24 Mark Rowe <mrowe@apple.com> 2013-09-24 Mark Rowe <mrowe@apple.com>
<rdar://problem/14971518> WebKit should build against the Xcode default toolchain when targeting OS X 10.8 <rdar://problem/14971518> WebKit should build against the Xcode default toolchain when targeting OS X 10.8
......
This diff is collapsed.
...@@ -638,8 +638,8 @@ __ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE ...@@ -638,8 +638,8 @@ __ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE
__ZN7WebCore18proxyServersForURLERKNS_3URLEPKNS_17NetworkingContextE __ZN7WebCore18proxyServersForURLERKNS_3URLEPKNS_17NetworkingContextE
__ZN7WebCore19AnimationController16resumeAnimationsEv __ZN7WebCore19AnimationController16resumeAnimationsEv
__ZN7WebCore19AnimationController17suspendAnimationsEv __ZN7WebCore19AnimationController17suspendAnimationsEv
__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF12AtomicStringEd __ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_13RenderElementERKN3WTF12AtomicStringEd
__ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd __ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_13RenderElementERKN3WTF6StringEd
__ZN7WebCore19AnimationController36setAllowsNewAnimationsWhileSuspendedEb __ZN7WebCore19AnimationController36setAllowsNewAnimationsWhileSuspendedEb
__ZN7WebCore19HTMLTextAreaElement8setValueERKN3WTF6StringE __ZN7WebCore19HTMLTextAreaElement8setValueERKN3WTF6StringE
__ZN7WebCore19LayerFlushScheduler10invalidateEv __ZN7WebCore19LayerFlushScheduler10invalidateEv
...@@ -1693,11 +1693,11 @@ __ZNK7WebCore9FrameView11needsLayoutEv ...@@ -1693,11 +1693,11 @@ __ZNK7WebCore9FrameView11needsLayoutEv
__ZNK7WebCore9FrameView13isTransparentEv __ZNK7WebCore9FrameView13isTransparentEv
__ZNK7WebCore9FrameView13paintBehaviorEv __ZNK7WebCore9FrameView13paintBehaviorEv
__ZNK7WebCore9FrameView14didFirstLayoutEv __ZNK7WebCore9FrameView14didFirstLayoutEv
__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_7IntRectE __ZNK7WebCore9FrameView17convertToRendererEPKNS_13RenderElementERKNS_7IntRectE
__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_8IntPointE __ZNK7WebCore9FrameView17convertToRendererEPKNS_13RenderElementERKNS_8IntPointE
__ZNK7WebCore9FrameView19baseBackgroundColorEv __ZNK7WebCore9FrameView19baseBackgroundColorEv
__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_7IntRectE __ZNK7WebCore9FrameView19convertFromRendererEPKNS_13RenderElementERKNS_7IntRectE
__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_8IntPointE __ZNK7WebCore9FrameView19convertFromRendererEPKNS_13RenderElementERKNS_8IntPointE
__ZNK7WebCore9FrameView20isSoftwareRenderableEv __ZNK7WebCore9FrameView20isSoftwareRenderableEv
__ZNK7WebCore9FrameView21maximumScrollPositionEv __ZNK7WebCore9FrameView21maximumScrollPositionEv
__ZNK7WebCore9FrameView21minimumScrollPositionEv __ZNK7WebCore9FrameView21minimumScrollPositionEv
......
...@@ -134,14 +134,14 @@ String AccessibilityImageMapLink::title() const ...@@ -134,14 +134,14 @@ String AccessibilityImageMapLink::title() const
return String(); return String();
} }
RenderObject* AccessibilityImageMapLink::imageMapLinkRenderer() const RenderElement* AccessibilityImageMapLink::imageMapLinkRenderer() const
{ {
if (!m_mapElement.get() || !m_areaElement.get()) if (!m_mapElement || !m_areaElement)
return 0; return nullptr;
RenderObject* renderer = 0; RenderElement* renderer = nullptr;
if (m_parent && m_parent->isAccessibilityRenderObject()) if (m_parent && m_parent->isAccessibilityRenderObject())
renderer = static_cast<AccessibilityRenderObject*>(m_parent)->renderer(); renderer = toRenderElement(static_cast<AccessibilityRenderObject*>(m_parent)->renderer());
else else
renderer = m_mapElement->renderer(); renderer = m_mapElement->renderer();
...@@ -151,13 +151,13 @@ RenderObject* AccessibilityImageMapLink::imageMapLinkRenderer() const ...@@ -151,13 +151,13 @@ RenderObject* AccessibilityImageMapLink::imageMapLinkRenderer() const
void AccessibilityImageMapLink::detachFromParent() void AccessibilityImageMapLink::detachFromParent()
{ {
AccessibilityMockObject::detachFromParent(); AccessibilityMockObject::detachFromParent();
m_areaElement = 0; m_areaElement = nullptr;
m_mapElement = 0; m_mapElement = nullptr;
} }
Path AccessibilityImageMapLink::elementPath() const Path AccessibilityImageMapLink::elementPath() const
{ {
RenderObject* renderer = imageMapLinkRenderer(); auto renderer = imageMapLinkRenderer();
if (!renderer) if (!renderer)
return Path(); return Path();
...@@ -166,7 +166,7 @@ Path AccessibilityImageMapLink::elementPath() const ...@@ -166,7 +166,7 @@ Path AccessibilityImageMapLink::elementPath() const
LayoutRect AccessibilityImageMapLink::elementRect() const LayoutRect AccessibilityImageMapLink::elementRect() const
{ {
RenderObject* renderer = imageMapLinkRenderer(); auto renderer = imageMapLinkRenderer();
if (!renderer) if (!renderer)
return LayoutRect(); return LayoutRect();
......
...@@ -75,7 +75,7 @@ private: ...@@ -75,7 +75,7 @@ private:
virtual void detachFromParent() OVERRIDE; virtual void detachFromParent() OVERRIDE;
virtual Path elementPath() const; virtual Path elementPath() const;
RenderObject* imageMapLinkRenderer() const; RenderElement* imageMapLinkRenderer() const;
virtual void accessibilityText(Vector<AccessibilityText>&); virtual void accessibilityText(Vector<AccessibilityText>&);
virtual bool isImageMapLink() const { return true; } virtual bool isImageMapLink() const { return true; }
virtual bool supportsPath() const { return true; } virtual bool supportsPath() const { return true; }
......
...@@ -1262,7 +1262,7 @@ bool AccessibilityRenderObject::computeAccessibilityIsIgnored() const ...@@ -1262,7 +1262,7 @@ bool AccessibilityRenderObject::computeAccessibilityIsIgnored() const
// check whether rendered image was stretched from one-dimensional file image // check whether rendered image was stretched from one-dimensional file image
if (image->cachedImage()) { if (image->cachedImage()) {
LayoutSize imageSize = image->cachedImage()->imageSizeForRenderer(m_renderer, image->view().zoomFactor()); LayoutSize imageSize = image->cachedImage()->imageSizeForRenderer(toRenderElement(m_renderer), image->view().zoomFactor());
return imageSize.height() <= 1 || imageSize.width() <= 1; return imageSize.height() <= 1 || imageSize.width() <= 1;
} }
} }
......
...@@ -366,10 +366,10 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget) ...@@ -366,10 +366,10 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget)
WebCore::RenderObject* renderer = core(self)->renderer(); WebCore::RenderObject* renderer = core(self)->renderer();
if (!renderer || !renderer->isImage()) if (!renderer || !renderer->isImage())
return nil; return nil;
WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage(); WebCore::CachedImage* cachedImage = toRenderImage(renderer)->cachedImage();
if (!cachedImage || cachedImage->errorOccurred()) if (!cachedImage || cachedImage->errorOccurred())
return nil; return nil;
return cachedImage->imageForRenderer(renderer)->getNSImage(); return cachedImage->imageForRenderer(toRenderImage(renderer))->getNSImage();
} }
@end @end
...@@ -379,7 +379,7 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget) ...@@ -379,7 +379,7 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget)
- (NSFont *)_font - (NSFont *)_font
{ {
// FIXME: Could we move this function to WebCore::Element and autogenerate? // FIXME: Could we move this function to WebCore::Element and autogenerate?
WebCore::RenderObject* renderer = core(self)->renderer(); auto renderer = core(self)->renderer();
if (!renderer) if (!renderer)
return nil; return nil;
return renderer->style()->font().primaryFont()->getNSFont(); return renderer->style()->font().primaryFont()->getNSFont();
...@@ -388,7 +388,7 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget) ...@@ -388,7 +388,7 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget)
- (NSData *)_imageTIFFRepresentation - (NSData *)_imageTIFFRepresentation
{ {
// FIXME: Could we move this function to WebCore::Element and autogenerate? // FIXME: Could we move this function to WebCore::Element and autogenerate?
WebCore::RenderObject* renderer = core(self)->renderer(); auto renderer = core(self)->renderer();
if (!renderer || !renderer->isImage()) if (!renderer || !renderer->isImage())
return nil; return nil;
WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage(); WebCore::CachedImage* cachedImage = static_cast<WebCore::RenderImage*>(renderer)->cachedImage();
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "CSSCanvasValue.h" #include "CSSCanvasValue.h"
#include "ImageBuffer.h" #include "ImageBuffer.h"
#include "RenderObject.h" #include "RenderElement.h"
#include <wtf/text/StringBuilder.h> #include <wtf/text/StringBuilder.h>
namespace WebCore { namespace WebCore {
...@@ -50,25 +50,23 @@ String CSSCanvasValue::customCSSText() const ...@@ -50,25 +50,23 @@ String CSSCanvasValue::customCSSText() const
void CSSCanvasValue::canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect) void CSSCanvasValue::canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect)
{ {
IntRect imageChangeRect = enclosingIntRect(changedRect); IntRect imageChangeRect = enclosingIntRect(changedRect);
HashCountedSet<RenderObject*>::const_iterator end = clients().end(); for (auto it = clients().begin(), end = clients().end(); it != end; ++it)
for (HashCountedSet<RenderObject*>::const_iterator curr = clients().begin(); curr != end; ++curr) it->key->imageChanged(static_cast<WrappedImagePtr>(this), &imageChangeRect);
const_cast<RenderObject*>(curr->key)->imageChanged(static_cast<WrappedImagePtr>(this), &imageChangeRect);
} }
void CSSCanvasValue::canvasResized(HTMLCanvasElement*) void CSSCanvasValue::canvasResized(HTMLCanvasElement*)
{ {
HashCountedSet<RenderObject*>::const_iterator end = clients().end(); for (auto it = clients().begin(), end = clients().end(); it != end; ++it)
for (HashCountedSet<RenderObject*>::const_iterator curr = clients().begin(); curr != end; ++curr) it->key->imageChanged(static_cast<WrappedImagePtr>(this));
const_cast<RenderObject*>(curr->key)->imageChanged(static_cast<WrappedImagePtr>(this));
} }
void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement* element) void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement* element)
{ {
ASSERT_UNUSED(element, element == m_element); ASSERT_UNUSED(element, element == m_element);
m_element = 0; m_element = nullptr;
} }
IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer) IntSize CSSCanvasValue::fixedSize(const RenderElement* renderer)
{ {
if (HTMLCanvasElement* elt = element(renderer->document())) if (HTMLCanvasElement* elt = element(renderer->document()))
return IntSize(elt->width(), elt->height()); return IntSize(elt->width(), elt->height());
...@@ -86,13 +84,13 @@ HTMLCanvasElement* CSSCanvasValue::element(Document& document) ...@@ -86,13 +84,13 @@ HTMLCanvasElement* CSSCanvasValue::element(Document& document)
return m_element; return m_element;
} }
PassRefPtr<Image> CSSCanvasValue::image(RenderObject* renderer, const IntSize& /*size*/) PassRefPtr<Image> CSSCanvasValue::image(RenderElement* renderer, const IntSize& /*size*/)
{ {
ASSERT(clients().contains(renderer)); ASSERT(clients().contains(renderer));
HTMLCanvasElement* elt = element(renderer->document()); HTMLCanvasElement* element = this->element(renderer->document());
if (!elt || !elt->buffer()) if (!element || !element->buffer())
return 0; return 0;
return elt->copiedImage(); return element->copiedImage();
} }
bool CSSCanvasValue::equals(const CSSCanvasValue& other) const bool CSSCanvasValue::equals(const CSSCanvasValue& other) const
......
...@@ -40,9 +40,9 @@ public: ...@@ -40,9 +40,9 @@ public:
String customCSSText() const; String customCSSText() const;
PassRefPtr<Image> image(RenderObject*, const IntSize&); PassRefPtr<Image> image(RenderElement*, const IntSize&);
bool isFixedSize() const { return true; } bool isFixedSize() const { return true; }
IntSize fixedSize(const RenderObject*); IntSize fixedSize(const RenderElement*);
bool isPending() const { return false; } bool isPending() const { return false; }
void loadSubimages(CachedResourceLoader*) { } void loadSubimages(CachedResourceLoader*) { }
......
...@@ -1696,7 +1696,7 @@ static inline PassRefPtr<RenderStyle> computeRenderStyleForProperty(Node* styled ...@@ -1696,7 +1696,7 @@ static inline PassRefPtr<RenderStyle> computeRenderStyleForProperty(Node* styled
if (renderer && renderer->isComposited() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) { if (renderer && renderer->isComposited() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) {
AnimationUpdateBlock animationUpdateBlock(&renderer->animation()); AnimationUpdateBlock animationUpdateBlock(&renderer->animation());
RefPtr<RenderStyle> style = renderer->animation().getAnimatedStyleForRenderer(renderer); RefPtr<RenderStyle> style = renderer->animation().getAnimatedStyleForRenderer(toRenderElement(renderer));
if (pseudoElementSpecifier && !styledNode->isPseudoElement()) { if (pseudoElementSpecifier && !styledNode->isPseudoElement()) {
// FIXME: This cached pseudo style will only exist if the animation has been run at least once. // FIXME: This cached pseudo style will only exist if the animation has been run at least once.
return style->getCachedPseudoStyle(pseudoElementSpecifier); return style->getCachedPseudoStyle(pseudoElementSpecifier);
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "CachedResourceLoader.h" #include "CachedResourceLoader.h"
#include "CrossfadeGeneratedImage.h" #include "CrossfadeGeneratedImage.h"
#include "ImageBuffer.h" #include "ImageBuffer.h"
#include "RenderObject.h" #include "RenderElement.h"
#include "StyleCachedImage.h" #include "StyleCachedImage.h"
#include "StyleGeneratedImage.h" #include "StyleGeneratedImage.h"
#include <wtf/text/StringBuilder.h> #include <wtf/text/StringBuilder.h>
...@@ -44,7 +44,7 @@ static inline double blendFunc(double from, double to, double progress) ...@@ -44,7 +44,7 @@ static inline double blendFunc(double from, double to, double progress)
return blend(from, to, progress); return blend(from, to, progress);
} }
static bool subimageKnownToBeOpaque(CSSValue* value, const RenderObject* renderer) static bool subimageKnownToBeOpaque(CSSValue* value, const RenderElement* renderer)
{ {
if (value->isImageValue()) if (value->isImageValue())
return toCSSImageValue(value)->knownToBeOpaque(renderer); return toCSSImageValue(value)->knownToBeOpaque(renderer);
...@@ -78,7 +78,7 @@ String CSSCrossfadeValue::customCSSText() const ...@@ -78,7 +78,7 @@ String CSSCrossfadeValue::customCSSText() const
return result.toString(); return result.toString();
} }
IntSize CSSCrossfadeValue::fixedSize(const RenderObject* renderer) IntSize CSSCrossfadeValue::fixedSize(const RenderElement* renderer)
{ {
float percentage = m_percentageValue->getFloatValue(); float percentage = m_percentageValue->getFloatValue();
float inversePercentage = 1 - percentage; float inversePercentage = 1 - percentage;
...@@ -108,7 +108,7 @@ bool CSSCrossfadeValue::isPending() const ...@@ -108,7 +108,7 @@ bool CSSCrossfadeValue::isPending() const
|| CSSImageGeneratorValue::subimageIsPending(m_toValue.get()); || CSSImageGeneratorValue::subimageIsPending(m_toValue.get());
} }
bool CSSCrossfadeValue::knownToBeOpaque(const RenderObject* renderer) const bool CSSCrossfadeValue::knownToBeOpaque(const RenderElement* renderer) const
{ {
return subimageKnownToBeOpaque(m_fromValue.get(), renderer) && subimageKnownToBeOpaque(m_toValue.get(), renderer); return subimageKnownToBeOpaque(m_fromValue.get(), renderer) && subimageKnownToBeOpaque(m_toValue.get(), renderer);
} }
...@@ -138,7 +138,7 @@ void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader ...@@ -138,7 +138,7 @@ void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader
m_crossfadeSubimageObserver.setReady(true); m_crossfadeSubimageObserver.setReady(true);
} }
PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize& size) PassRefPtr<Image> CSSCrossfadeValue::image(RenderElement* renderer, const IntSize& size)
{ {
if (size.isEmpty()) if (size.isEmpty())
return 0; return 0;
...@@ -163,11 +163,8 @@ PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize ...@@ -163,11 +163,8 @@ PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize
void CSSCrossfadeValue::crossfadeChanged(const IntRect&) void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
{ {
HashCountedSet<RenderObject*>::const_iterator end = clients().end(); for (auto it = clients().begin(), end = clients().end(); it != end; ++it)
for (HashCountedSet<RenderObject*>::const_iterator curr = clients().begin(); curr != end; ++curr) { it->key->imageChanged(static_cast<WrappedImagePtr>(this));
RenderObject* client = const_cast<RenderObject*>(curr->key);
client->imageChanged(static_cast<WrappedImagePtr>(this));
}
} }
void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(CachedImage*, const IntRect* rect) void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(CachedImage*, const IntRect* rect)
......
...@@ -37,7 +37,7 @@ namespace WebCore { ...@@ -37,7 +37,7 @@ namespace WebCore {
class CachedImage; class CachedImage;
class CrossfadeSubimageObserverProxy; class CrossfadeSubimageObserverProxy;
class RenderObject; class RenderElement;
class Document; class Document;
class CSSCrossfadeValue : public CSSImageGeneratorValue { class CSSCrossfadeValue : public CSSImageGeneratorValue {
...@@ -52,12 +52,12 @@ public: ...@@ -52,12 +52,12 @@ public:
String customCSSText() const; String customCSSText() const;
PassRefPtr<Image> image(RenderObject*, const IntSize&); PassRefPtr<Image> image(RenderElement*, const IntSize&);
bool isFixedSize() const { return true; } bool isFixedSize() const { return true; }
IntSize fixedSize(const RenderObject*); IntSize fixedSize(const RenderElement*);
bool isPending() const; bool isPending() const;
bool knownToBeOpaque(const RenderObject*) const; bool knownToBeOpaque(const RenderElement*) const;
void loadSubimages(CachedResourceLoader*); void loadSubimages(CachedResourceLoader*);
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "CrossfadeGeneratedImage.h" #include "CrossfadeGeneratedImage.h"
#include "FilterEffectRenderer.h" #include "FilterEffectRenderer.h"
#include "ImageBuffer.h" #include "ImageBuffer.h"
#include "RenderObject.h" #include "RenderElement.h"
#include "StyleCachedImage.h" #include "StyleCachedImage.h"
#include "StyleGeneratedImage.h" #include "StyleGeneratedImage.h"
#include "StyleResolver.h" #include "StyleResolver.h"
...@@ -59,7 +59,7 @@ String CSSFilterImageValue::customCSSText() const ...@@ -59,7 +59,7 @@ String CSSFilterImageValue::customCSSText() const
return result.toString(); return result.toString();
} }
IntSize CSSFilterImageValue::fixedSize(const RenderObject* renderer) IntSize CSSFilterImageValue::fixedSize(const RenderElement* renderer)
{ {
CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader(); CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader();
CachedImage* cachedImage = cachedImageForCSSValue(m_imageValue.get(), cachedResourceLoader); CachedImage* cachedImage = cachedImageForCSSValue(m_imageValue.get(), cachedResourceLoader);
...@@ -75,7 +75,7 @@ bool CSSFilterImageValue::isPending() const ...@@ -75,7 +75,7 @@ bool CSSFilterImageValue::isPending() const
return CSSImageGeneratorValue::subimageIsPending(m_imageValue.get()); return CSSImageGeneratorValue::subimageIsPending(m_imageValue.get());
} }
bool CSSFilterImageValue::knownToBeOpaque(const RenderObject*) const bool CSSFilterImageValue::knownToBeOpaque(const RenderElement*) const
{ {
return false; return false;
} }
...@@ -96,7 +96,7 @@ void CSSFilterImageValue::loadSubimages(CachedResourceLoader* cachedResourceLoad ...@@ -96,7 +96,7 @@ void CSSFilterImageValue::loadSubimages(CachedResourceLoader* cachedResourceLoad
m_filterSubimageObserver.setReady(true); m_filterSubimageObserver.setReady(true);
} }
PassRefPtr<Image> CSSFilterImageValue::image(RenderObject* renderer, const IntSize& size) PassRefPtr<Image> CSSFilterImageValue::image(RenderElement* renderer, const IntSize& size)
{ {
if (size.isEmpty()) if (size.isEmpty())
return 0; return 0;
...@@ -133,11 +133,8 @@ PassRefPtr<Image> CSSFilterImageValue::image(RenderObject* renderer, const IntSi ...@@ -133,11 +133,8 @@ PassRefPtr<Image> CSSFilterImageValue::image(RenderObject* renderer, const IntSi
void CSSFilterImageValue::filterImageChanged(const IntRect&) void CSSFilterImageValue::filterImageChanged(const IntRect&)
{ {
HashCountedSet<RenderObject*>::const_iterator end = clients().end(); for (auto it = clients().begin(), end = clients().end(); it != end; ++it)
for (HashCountedSet<RenderObject*>::const_iterator curr = clients().begin(); curr != end; ++curr) { it->key->imageChanged(static_cast<WrappedImagePtr>(this));
RenderObject* client = const_cast<RenderObject*>(curr->key);
client->imageChanged(static_cast<WrappedImagePtr>(this));
}
} }
void CSSFilterImageValue::createFilterOperations(StyleResolver* resolver) void CSSFilterImageValue::createFilterOperations(StyleResolver* resolver)
......
...@@ -41,7 +41,7 @@ namespace WebCore { ...@@ -41,7 +41,7 @@ namespace WebCore {
class CachedImage; class CachedImage;
class FilterSubimageObserverProxy; class FilterSubimageObserverProxy;
class RenderObject; class RenderElement;
class Document; class Document;
class StyleResolver; class StyleResolver;
...@@ -57,12 +57,12 @@ public: ...@@ -57,12 +57,12 @@ public:
String customCSSText() const; String customCSSText() const;
PassRefPtr<Image> image(RenderObject*, const IntSize&); PassRefPtr<Image> image(RenderElement*, const IntSize&);
bool isFixedSize() const { return true; } bool isFixedSize() const { return true; }
IntSize fixedSize(const RenderObject*); IntSize fixedSize(const RenderElement*);
bool isPending() const; bool isPending() const;
bool knownToBeOpaque(const RenderObject*) const; bool knownToBeOpaque(const RenderElement*) const;
void loadSubimages(CachedResourceLoader*); void loadSubimages(CachedResourceLoader*);
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "FontCache.h" #include "FontCache.h"
#include "Frame.h" #include "Frame.h"
#include "FrameLoader.h" #include "FrameLoader.h"
#include "RenderObject.h"
#include "Settings.h" #include "Settings.h"
#include "SimpleFontData.h" #include "SimpleFontData.h"
#include "StylePropertySet.h" #include "StylePropertySet.h"
......