Changeset 189144 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Aug 28, 2015, 11:15:28 PM (10 years ago)

Author:

[email protected]

Message:

Migrate GraphicsContexts from pointers to references
​https://bugs.webkit.org/show_bug.cgi?id=148561

Reviewed by Tim Horton.

Source/WebCore:

We were using GraphicsContext*s throughout our rendering code. However,
these contexts can't be nullptr. This patch migrates users to
GraphicsContext&s.

This is a purely mechanical change.

No new tests because there is no behavior change.

• css/CSSFilterImageValue.cpp:

(WebCore::CSSFilterImageValue::image):

• editing/Editor.cpp:

(WebCore::Editor::countMatchesForText):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::paintCaret):
(WebCore::CaretBase::paintCaret):
(WebCore::DragCaretController::paintDragCaret):

• editing/FrameSelection.h:
• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::paint):
(WebCore::HTMLCanvasElement::createImageBuffer):
(WebCore::HTMLCanvasElement::drawingContext):

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

(WebCore::HTMLVideoElement::paintCurrentFrameInContext):

• html/HTMLVideoElement.h:
• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::drawImage):
(WebCore::drawImageToContext):
(WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage):
(WebCore::CanvasRenderingContext2D::drawTextInternal):

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::drawImageIntoBuffer):

• inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::paint):

• page/FrameSnapshotting.cpp:

(WebCore::snapshotFrameRect):

• page/FrameView.cpp:

(WebCore::FrameView::paintScrollCorner):
(WebCore::FrameView::paintScrollbar):
(WebCore::FrameView::paintControlTints):
(WebCore::FrameView::willPaintContents):
(WebCore::FrameView::didPaintContents):
(WebCore::FrameView::paintContents):
(WebCore::FrameView::paintContentsForSnapshot):
(WebCore::FrameView::paintOverhangAreas):
(WebCore::FrameView::adjustPageHeightDeprecated):

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

(WebCore::PrintContext::spoolPage):
(WebCore::PrintContext::spoolRect):

• page/win/FrameCGWin.cpp:

(WebCore::drawRectIntoContext):
(WebCore::imageFromRect):

• platform/ScrollView.cpp:

(WebCore::ScrollView::paintScrollCorner):
(WebCore::ScrollView::paintScrollbar):
(WebCore::ScrollView::paintScrollbars):
(WebCore::ScrollView::paintPanScrollIcon):
(WebCore::ScrollView::paint):
(WebCore::ScrollView::paintOverhangAreas):
(WebCore::ScrollView::calculateAndPaintOverhangAreas):

• platform/ScrollView.h:
• platform/Scrollbar.cpp:

(WebCore::Scrollbar::paint):

• platform/Scrollbar.h:
• platform/ScrollbarTheme.h:

(WebCore::ScrollbarTheme::paintScrollCorner):
(WebCore::ScrollbarTheme::defaultPaintScrollCorner):
(WebCore::ScrollbarTheme::paintOverhangAreas):

• platform/ScrollbarThemeComposite.cpp:

(WebCore::ScrollbarThemeComposite::paintScrollCorner):
(WebCore::ScrollbarThemeComposite::paintOverhangAreas):

• platform/ScrollbarThemeComposite.h:
• platform/Theme.cpp:

(WebCore::Theme::drawNamedImage):

• platform/Theme.h:

(WebCore::Theme::paint):

• platform/Widget.h:
• platform/cocoa/ThemeCocoa.cpp:

(WebCore::fitContextToBox):
(WebCore::ThemeCocoa::drawNamedImage):

• platform/cocoa/ThemeCocoa.h:
• platform/efl/WidgetEfl.cpp:

(WebCore::Widget::paint):

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::drawPattern):

• platform/graphics/BitmapImage.h:
• platform/graphics/CrossfadeGeneratedImage.cpp:

(WebCore::drawCrossfadeSubimage):
(WebCore::CrossfadeGeneratedImage::drawCrossfade):
(WebCore::CrossfadeGeneratedImage::draw):
(WebCore::CrossfadeGeneratedImage::drawPattern):

• platform/graphics/CrossfadeGeneratedImage.h:
• platform/graphics/FontCascade.cpp:

(WebCore::FontCascade::drawText):
(WebCore::FontCascade::drawEmphasisMarks):
(WebCore::FontCascade::drawSimpleText):
(WebCore::FontCascade::drawEmphasisMarksForSimpleText):
(WebCore::FontCascade::drawGlyphBuffer):

• platform/graphics/FontCascade.h:
• platform/graphics/GeneratedImage.h:
• platform/graphics/GradientImage.cpp:

(WebCore::GradientImage::draw):
(WebCore::GradientImage::drawPattern):

• platform/graphics/GradientImage.h:
• platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::drawText):
(WebCore::GraphicsContext::drawGlyphs):
(WebCore::GraphicsContext::drawEmphasisMarks):
(WebCore::GraphicsContext::drawBidiText):
(WebCore::GraphicsContext::drawImage):
(WebCore::GraphicsContext::drawTiledImage):
(WebCore::GraphicsContext::drawImageBuffer):
(WebCore::GraphicsContext::clipToImageBuffer):
(WebCore::GraphicsContext::createCompatibleBuffer):
(WebCore::GraphicsContext::isCompatibleWithBuffer):

• platform/graphics/GraphicsContext.h:
• platform/graphics/GraphicsContext3D.h:
• platform/graphics/Image.cpp:

(WebCore::Image::fillWithSolidColor):
(WebCore::Image::draw):
(WebCore::Image::drawTiled):

• platform/graphics/Image.h:

(WebCore::Image::drawFrameMatchingSourceSize):

• platform/graphics/ImageBuffer.cpp:

(WebCore::ImageBuffer::createCompatibleBuffer):

• platform/graphics/ImageBuffer.h:
• platform/graphics/MediaPlayer.cpp:

(WebCore::MediaPlayer::paint):
(WebCore::MediaPlayer::paintCurrentFrameInContext):

• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::paintCurrentFrameInContext):

• platform/graphics/NamedImageGeneratedImage.cpp:

(WebCore::NamedImageGeneratedImage::draw):
(WebCore::NamedImageGeneratedImage::drawPattern):

• platform/graphics/NamedImageGeneratedImage.h:
• platform/graphics/ShadowBlur.cpp:

(WebCore::ShadowBlur::adjustBlurRadius):
(WebCore::ShadowBlur::calculateLayerBoundingRect):
(WebCore::ShadowBlur::drawShadowBuffer):
(WebCore::ShadowBlur::drawRectShadow):
(WebCore::ShadowBlur::drawInsetShadow):
(WebCore::ShadowBlur::drawRectShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithTiling):
(WebCore::ShadowBlur::drawRectShadowWithTiling):
(WebCore::ShadowBlur::drawLayerPieces):
(WebCore::ShadowBlur::blurAndColorShadowBuffer):
(WebCore::ShadowBlur::beginShadowLayer):
(WebCore::ShadowBlur::endShadowLayer):

• platform/graphics/ShadowBlur.h:
• platform/graphics/TextRun.h:
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:

(WebCore::MediaPlayerPrivateAVFoundationCF::paintCurrentFrameInContext):
(WebCore::MediaPlayerPrivateAVFoundationCF::paint):

• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::paintCurrentFrameInContext):
(WebCore::MediaPlayerPrivateAVFoundationObjC::paint):
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithImageGenerator):
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::paint):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::paintCurrentFrameInContext):

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::paint):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::paintCurrentFrameInContext):

• platform/graphics/cairo/BitmapImageCairo.cpp:

(WebCore::BitmapImage::draw):

• platform/graphics/cairo/FontCairo.cpp:

(WebCore::drawGlyphsToContext):
(WebCore::drawGlyphsShadow):
(WebCore::FontCascade::drawGlyphs):

• platform/graphics/cairo/FontCairoHarfbuzzNG.cpp:

(WebCore::FontCascade::drawComplexText):
(WebCore::FontCascade::drawEmphasisMarksForComplexText):

• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::drawPathShadow):
(WebCore::fillCurrentCairoPath):
(WebCore::shadowAndFillCurrentCairoPath):
(WebCore::shadowAndStrokeCurrentCairoPath):
(WebCore::GraphicsContext::fillPath):
(WebCore::GraphicsContext::strokePath):
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::strokeRect):
(WebCore::GraphicsContext::platformFillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):

• platform/graphics/cairo/ImageBufferCairo.cpp:

(WebCore::ImageBuffer::context):
(WebCore::ImageBuffer::clip):
(WebCore::ImageBuffer::draw):
(WebCore::ImageBuffer::drawPattern):
(WebCore::ImageBuffer::toDataURL):

• platform/graphics/cairo/ImageCairo.cpp:

(WebCore::Image::drawPattern):

• platform/graphics/cairo/PlatformContextCairo.cpp:

(WebCore::PlatformContextCairo::drawSurfaceToContext):

• platform/graphics/cairo/PlatformContextCairo.h:
• platform/graphics/cg/BitmapImageCG.cpp:

(WebCore::BitmapImage::draw):

• platform/graphics/cg/GraphicsContext3DCG.cpp:

(WebCore::GraphicsContext3D::paintToCanvas):

• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::platformFillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::context):
(WebCore::ImageBuffer::flushContext):
(WebCore::ImageBuffer::copyNativeImage):
(WebCore::ImageBuffer::draw):
(WebCore::ImageBuffer::drawPattern):
(WebCore::ImageBuffer::clip):
(WebCore::ImageBuffer::getUnmultipliedImageData):
(WebCore::ImageBuffer::getPremultipliedImageData):
(WebCore::ImageBuffer::putByteArray):
(WebCore::ImageBuffer::toDataURL):

• platform/graphics/cg/ImageCG.cpp:

(WebCore::Image::drawPattern):

• platform/graphics/cg/PDFDocumentImage.cpp:

(WebCore::PDFDocumentImage::cacheParametersMatch):
(WebCore::transformContextForPainting):
(WebCore::PDFDocumentImage::updateCachedImageIfNeeded):
(WebCore::PDFDocumentImage::draw):
(WebCore::applyRotationForPainting):
(WebCore::PDFDocumentImage::drawPDFPage):

• platform/graphics/cg/PDFDocumentImage.h:
• platform/graphics/cocoa/FontCascadeCocoa.mm:

(WebCore::showLetterpressedGlyphsWithAdvances):
(WebCore::showGlyphsWithAdvances):
(WebCore::FontCascade::drawGlyphs):
(WebCore::FontCascade::drawComplexText):
(WebCore::FontCascade::drawEmphasisMarksForComplexText):

• platform/graphics/efl/ImageBufferEfl.cpp:

(WebCore::ImageBuffer::toDataURL):

• platform/graphics/filters/FEBlend.cpp:

(WebCore::FEBlend::platformApplySoftware):

• platform/graphics/filters/FEColorMatrix.cpp:

(WebCore::FEColorMatrix::platformApplySoftware):

• platform/graphics/filters/FEComposite.cpp:

(WebCore::FEComposite::platformApplySoftware):

• platform/graphics/filters/FEDropShadow.cpp:

(WebCore::FEDropShadow::platformApplySoftware):

• platform/graphics/filters/FEFlood.cpp:

(WebCore::FEFlood::platformApplySoftware):

• platform/graphics/filters/FEMerge.cpp:

(WebCore::FEMerge::platformApplySoftware):

• platform/graphics/filters/FEOffset.cpp:

(WebCore::FEOffset::platformApplySoftware):

• platform/graphics/filters/FETile.cpp:

(WebCore::FETile::platformApplySoftware):

• platform/graphics/filters/FilterEffect.cpp:

(WebCore::FilterEffect::createImageBufferResult): Deleted.

• platform/graphics/filters/SourceAlpha.cpp:

(WebCore::SourceAlpha::platformApplySoftware):

• platform/graphics/filters/SourceGraphic.cpp:

(WebCore::SourceGraphic::platformApplySoftware):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::paint):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
• platform/graphics/mac/GraphicsContextMac.mm:

(WebCore::GraphicsContext::drawLineForDocumentMarker):

• platform/graphics/mac/IconMac.mm:

(WebCore::Icon::paint):

• platform/graphics/mac/MediaPlayerPrivateQTKit.h:
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm:

(WebCore::MediaPlayerPrivateQTKit::paintCurrentFrameInContext):
(WebCore::MediaPlayerPrivateQTKit::paint):

• platform/graphics/mac/PDFDocumentImageMac.mm:

(WebCore::PDFDocumentImage::drawPDFPage):

• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):

• platform/graphics/texmap/BitmapTexture.cpp:

(WebCore::BitmapTexture::updateContents):

• platform/graphics/win/FontCGWin.cpp:

(WebCore::FontCascade::drawGlyphs):

• platform/graphics/win/FontWin.cpp:

(WebCore::FontCascade::drawComplexText):
(WebCore::FontCascade::drawEmphasisMarksForComplexText):

• platform/graphics/win/IconWin.cpp:

(WebCore::Icon::paint):

• platform/graphics/win/ImageCGWin.cpp:

(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):

• platform/graphics/win/ImageCairoWin.cpp:

(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):

• platform/graphics/win/LocalWindowsContext.h:

(WebCore::LocalWindowsContext::LocalWindowsContext):
(WebCore::LocalWindowsContext::~LocalWindowsContext):

• platform/gtk/WidgetGtk.cpp:

(WebCore::Widget::paint):

• platform/ios/WidgetIOS.mm:

(WebCore::Widget::paint):

• platform/mac/DragImageMac.mm:

(WebCore::drawAtPoint):

• platform/mac/LocalCurrentGraphicsContext.h:

(WebCore::ContextContainer::ContextContainer):

• platform/mac/LocalCurrentGraphicsContext.mm:

(WebCore::LocalCurrentGraphicsContext::LocalCurrentGraphicsContext):
(WebCore::LocalCurrentGraphicsContext::~LocalCurrentGraphicsContext):
(WebCore::LocalCurrentGraphicsContext::cgContext):

• platform/mac/ScrollbarThemeMac.mm:

(WebCore::ScrollbarThemeMac::paint):

• platform/mac/ThemeMac.h:
• platform/mac/ThemeMac.mm:

(WebCore::paintToggleButton):
(WebCore::paintButton):
(WebCore::paintStepper):
(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):
(WebCore::ThemeMac::paint):

• platform/mac/WidgetMac.mm:

(WebCore::Widget::paint):

• platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:

(WebCore::MockMediaPlayerMediaSource::paint):

• platform/mock/mediasource/MockMediaPlayerMediaSource.h:
• platform/win/PopupMenuWin.cpp:

(WebCore::PopupMenuWin::paint):

• platform/win/ScrollbarThemeWin.cpp:

(WebCore::ScrollbarThemeWin::paintTrackPiece):
(WebCore::ScrollbarThemeWin::paintButton):
(WebCore::ScrollbarThemeWin::paintThumb):

• platform/win/WebCoreTextRenderer.cpp:

(WebCore::doDrawTextAtPoint):

• platform/win/WidgetWin.cpp:

(WebCore::Widget::paint):

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::paintSelection):

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

(WebCore::FilterEffectRenderer::inputContext):
(WebCore::FilterEffectRendererHelper::applyFilterEffect):

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

(WebCore::ImageQualityController::shouldPaintAtLowQuality):

• rendering/ImageQualityController.h:
• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::paintFillLayer):
(WebCore::InlineFlowBox::paintBoxDecorations):
(WebCore::InlineFlowBox::paintMask):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint):

• rendering/PaintInfo.h:

(WebCore::PaintInfo::PaintInfo):
(WebCore::PaintInfo::context):
(WebCore::PaintInfo::setContext):
(WebCore::PaintInfo::applyTransform):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paint):
(WebCore::RenderBlock::paintCaret):
(WebCore::RenderBlock::paintObject):
(WebCore::RenderBlock::paintSelection):
(WebCore::clipOutPositionedObjects):
(WebCore::RenderBlock::blockSelectionGap):
(WebCore::RenderBlock::logicalLeftSelectionGap):
(WebCore::RenderBlock::logicalRightSelectionGap):

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::paintColumnRules):
(WebCore::RenderBlockFlow::clipOutFloatingObjects):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::determineBackgroundBleedAvoidance):
(WebCore::RenderBox::paintBoxDecorations):
(WebCore::RenderBox::paintMask):
(WebCore::RenderBox::paintClippingMask):
(WebCore::RenderBox::paintMaskImages):
(WebCore::RenderBox::paintFillLayers):
(WebCore::RenderBox::pushContentsClip):
(WebCore::RenderBox::popContentsClip):

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

(WebCore::RenderBoxModelObject::shouldPaintAtLowQuality):
(WebCore::RenderBoxModelObject::clipRoundedInnerRect):
(WebCore::applyBoxShadowForBackground):
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::paintNinePieceImage):
(WebCore::RenderBoxModelObject::paintOneBorderSide):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::paintTranslucentBorderSides):
(WebCore::RenderBoxModelObject::paintBorder):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
(WebCore::RenderBoxModelObject::clipBorderSidePolygon):
(WebCore::RenderBoxModelObject::clipBorderSideForComplexInnerPath):
(WebCore::RenderBoxModelObject::paintBoxShadow):
(WebCore::RenderBoxModelObject::shouldAntialiasLines):

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

(WebCore::RenderDetailsMarker::paint):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::paintFocusRing):
(WebCore::RenderElement::paintOutline):

• rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::paintSnapshotImage):
(WebCore::drawReplacementArrow):
(WebCore::RenderEmbeddedObject::paintReplaced):

• rendering/RenderFieldset.cpp:

(WebCore::RenderFieldset::paintBoxDecorations):

• rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::paintObject):

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):

• rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::paintReplaced):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::paintReplaced):
(WebCore::RenderImage::paintAreaElementFocusRing):
(WebCore::RenderImage::paintIntoRect):

• rendering/RenderImage.h:
• rendering/RenderInline.cpp:

(WebCore::RenderInline::paintOutline):
(WebCore::RenderInline::paintOutlineForLine):

• rendering/RenderInline.h:
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::beginTransparencyLayers):
(WebCore::RenderLayer::paintOverflowControls):
(WebCore::RenderLayer::paintScrollCorner):
(WebCore::RenderLayer::drawPlatformResizerImage):
(WebCore::RenderLayer::paintResizer):
(WebCore::RenderLayer::paint):
(WebCore::RenderLayer::paintOverlayScrollbars):
(WebCore::RenderLayer::clipToRect):
(WebCore::RenderLayer::restoreClip):
(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::paintLayerContentsAndReflection):
(WebCore::RenderLayer::setupFontSubpixelQuantization):
(WebCore::RenderLayer::setupClipPath):
(WebCore::RenderLayer::hasFilterThatIsPainting):
(WebCore::RenderLayer::setupFilters):
(WebCore::RenderLayer::applyFilters):
(WebCore::RenderLayer::paintFixedLayersInNamedFlows):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintLayerByApplyingTransform):
(WebCore::RenderLayer::paintList):
(WebCore::RenderLayer::paintTransformedLayerIntoFragments):
(WebCore::RenderLayer::paintBackgroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragmentsWithPhase):
(WebCore::RenderLayer::paintOutlineForFragments):
(WebCore::RenderLayer::paintMaskForFragments):
(WebCore::RenderLayer::paintChildClippingMaskForFragments):
(WebCore::RenderLayer::paintOverflowControlsForFragments):
(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderLayer.h:
• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintIntoLayer):
(WebCore::RenderLayerBacking::paintContents):

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

(WebCore::paintScrollbar):
(WebCore::RenderLayerCompositor::paintContents):

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::paintScrollbar):
(WebCore::RenderListBox::paintItemForeground):
(WebCore::RenderListBox::paintItemBackground):

• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::paint):

• rendering/RenderMediaControls.cpp:

(WebCore::getUnzoomedRectAndAdjustCurrentContext):
(WebCore::RenderMediaControls::paintMediaControlsPart):

• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::paintColumnRules):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::addPDFURLRect):

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::paint):

• rendering/RenderReplica.cpp:

(WebCore::RenderReplica::paint):

• rendering/RenderScrollbar.cpp:

(WebCore::RenderScrollbar::paint):
(WebCore::RenderScrollbar::paintPart):

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

(WebCore::RenderScrollbarPart::paintIntoRect):

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

(WebCore::RenderScrollbarTheme::paintScrollCorner):
(WebCore::RenderScrollbarTheme::paintScrollbarBackground):
(WebCore::RenderScrollbarTheme::paintTrackBackground):
(WebCore::RenderScrollbarTheme::paintTrackPiece):
(WebCore::RenderScrollbarTheme::paintButton):
(WebCore::RenderScrollbarTheme::paintThumb):

• rendering/RenderScrollbarTheme.h:
• rendering/RenderSnapshottedPlugIn.cpp:

(WebCore::RenderSnapshottedPlugIn::paintSnapshot):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::paintBoxDecorations):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintCollapsedBorders):
(WebCore::RenderTableCell::paintBackgroundsBehindCell):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::paintRowGroupBorder):
(WebCore::RenderTableSection::paintRowGroupBorderIfRequired):

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::paint):
(WebCore::RenderTheme::paintBorderOnly):
(WebCore::RenderTheme::paintDecorations):
(WebCore::RenderTheme::paintSliderTicks):

• rendering/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::paintThemePart):

• rendering/RenderThemeGtk.cpp:

(WebCore::paintToggle):
(WebCore::renderButton):
(WebCore::RenderThemeGtk::paintMenuList):
(WebCore::RenderThemeGtk::paintTextField):
(WebCore::paintGdkPixbuf):
(WebCore::RenderThemeGtk::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeGtk::paintSearchFieldCancelButton):
(WebCore::RenderThemeGtk::paintCapsLockIndicator):
(WebCore::RenderThemeGtk::paintSliderTrack):
(WebCore::RenderThemeGtk::paintSliderThumb):
(WebCore::RenderThemeGtk::paintProgressBar):
(WebCore::paintSpinArrowButton):
(WebCore::RenderThemeGtk::paintMediaButton):
(WebCore::RenderThemeGtk::paintMediaFullscreenButton):
(WebCore::RenderThemeGtk::paintMediaMuteButton):
(WebCore::RenderThemeGtk::paintMediaPlayButton):
(WebCore::RenderThemeGtk::paintMediaSeekBackButton):
(WebCore::RenderThemeGtk::paintMediaSeekForwardButton):
(WebCore::RenderThemeGtk::paintMediaToggleClosedCaptionsButton):
(WebCore::RenderThemeGtk::paintMediaSliderTrack):
(WebCore::RenderThemeGtk::paintMediaSliderThumb):
(WebCore::RenderThemeGtk::paintMediaVolumeSliderTrack):

• rendering/RenderThemeGtk.h:
• rendering/RenderThemeIOS.h:
• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::addRoundedBorderClip):
(WebCore::RenderThemeIOS::paintCheckboxDecorations):
(WebCore::RenderThemeIOS::paintRadioDecorations):
(WebCore::RenderThemeIOS::paintTextFieldDecorations):
(WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
(WebCore::RenderThemeIOS::paintSliderTrack):
(WebCore::RenderThemeIOS::paintSliderThumbDecorations):
(WebCore::RenderThemeIOS::paintProgressBar):
(WebCore::RenderThemeIOS::paintPushButtonDecorations):
(WebCore::RenderThemeIOS::paintFileUploadIconDecorations):

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintTextField):
(WebCore::RenderThemeMac::paintTextArea):
(WebCore::RenderThemeMac::paintMenuList):
(WebCore::RenderThemeMac::paintMeter):
(WebCore::RenderThemeMac::paintProgressBar):
(WebCore::RenderThemeMac::paintMenuListButtonGradients):
(WebCore::RenderThemeMac::paintMenuListButtonDecorations):
(WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary):
(WebCore::RenderThemeMac::paintSliderTrack):
(WebCore::RenderThemeMac::paintSliderThumb):
(WebCore::RenderThemeMac::paintSearchField):
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
(WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
(WebCore::RenderThemeMac::paintImageControlsButton):
(WebCore::RenderThemeMac::paintAttachment):

• rendering/RenderThemeSafari.cpp:

(WebCore::RenderThemeSafari::paintCheckbox):
(WebCore::RenderThemeSafari::paintRadio):
(WebCore::RenderThemeSafari::paintButton):
(WebCore::RenderThemeSafari::paintTextField):
(WebCore::RenderThemeSafari::paintCapsLockIndicator):
(WebCore::RenderThemeSafari::paintTextArea):
(WebCore::RenderThemeSafari::paintMenuList):
(WebCore::RenderThemeSafari::paintMenuListButtonGradients):
(WebCore::RenderThemeSafari::paintMenuListButtonDecorations):
(WebCore::RenderThemeSafari::paintSliderTrack):
(WebCore::RenderThemeSafari::paintSliderThumb):
(WebCore::RenderThemeSafari::paintSearchField):
(WebCore::RenderThemeSafari::paintSearchFieldCancelButton):
(WebCore::RenderThemeSafari::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeSafari::paintSearchFieldResultsButton):

• rendering/RenderThemeWin.cpp:

(WebCore::drawControl):
(WebCore::RenderThemeWin::paintButton):
(WebCore::RenderThemeWin::paintInnerSpinButton):
(WebCore::RenderThemeWin::paintTextField):
(WebCore::RenderThemeWin::paintMenuList):
(WebCore::RenderThemeWin::paintMenuListButtonDecorations):
(WebCore::RenderThemeWin::paintSliderTrack):
(WebCore::RenderThemeWin::paintSliderThumb):
(WebCore::RenderThemeWin::paintSearchFieldCancelButton):
(WebCore::RenderThemeWin::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeWin::paintSearchFieldResultsButton):
(WebCore::RenderThemeWin::paintMeter):

• rendering/RenderVideo.cpp:

(WebCore::RenderVideo::paintReplaced):

• rendering/RenderView.cpp:

(WebCore::RenderView::paint):
(WebCore::RenderView::paintBoxDecorations):

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paintContents):
(WebCore::RenderWidget::paint):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::lineSelectionGap):

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::paintFlow):

• rendering/mathml/RenderMathMLBlock.cpp:

(WebCore::RenderMathMLBlock::paint):

• rendering/mathml/RenderMathMLFraction.cpp:

(WebCore::RenderMathMLFraction::paint):

• rendering/mathml/RenderMathMLMenclose.cpp:

(WebCore::RenderMathMLMenclose::paint):

• rendering/mathml/RenderMathMLOperator.cpp:

(WebCore::RenderMathMLOperator::paintGlyph):
(WebCore::RenderMathMLOperator::fillWithVerticalExtensionGlyph):
(WebCore::RenderMathMLOperator::fillWithHorizontalExtensionGlyph):
(WebCore::RenderMathMLOperator::paint):

• rendering/mathml/RenderMathMLRadicalOperator.cpp:

(WebCore::RenderMathMLRadicalOperator::paint):

• rendering/mathml/RenderMathMLRoot.cpp:

(WebCore::RenderMathMLRoot::paint):

• rendering/shapes/Shape.cpp:

(WebCore::Shape::createRasterShape):

• rendering/style/NinePieceImage.cpp:

(WebCore::NinePieceImage::paint):

• rendering/style/NinePieceImage.h:
• rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::paint):

• rendering/svg/RenderSVGEllipse.cpp:

(WebCore::RenderSVGEllipse::fillShape):
(WebCore::RenderSVGEllipse::strokeShape):

• rendering/svg/RenderSVGEllipse.h:
• rendering/svg/RenderSVGForeignObject.cpp:

(WebCore::RenderSVGForeignObject::paint):

• rendering/svg/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::paint):
(WebCore::RenderSVGImage::paintForeground):

• rendering/svg/RenderSVGPath.cpp:

(WebCore::useStrokeStyleToFill):
(WebCore::RenderSVGPath::strokeShape):

• rendering/svg/RenderSVGPath.h:
• rendering/svg/RenderSVGRect.cpp:

(WebCore::RenderSVGRect::fillShape):
(WebCore::RenderSVGRect::strokeShape):

• rendering/svg/RenderSVGRect.h:
• rendering/svg/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::applyResource):
(WebCore::RenderSVGResourceClipper::pathOnlyClipping):
(WebCore::RenderSVGResourceClipper::applyClippingToContext):
(WebCore::RenderSVGResourceClipper::drawContentIntoMaskImage):

• rendering/svg/RenderSVGResourceClipper.h:
• rendering/svg/RenderSVGResourceFilter.cpp:

(WebCore::RenderSVGResourceFilter::applyResource):

• rendering/svg/RenderSVGResourceGradient.cpp:

(WebCore::createMaskAndSwapContextForTextGradient):
(WebCore::clipToTextMask):
(WebCore::RenderSVGResourceGradient::applyResource):

• rendering/svg/RenderSVGResourceMarker.cpp:

(WebCore::RenderSVGResourceMarker::applyViewportClip):
(WebCore::RenderSVGResourceMarker::draw):

• rendering/svg/RenderSVGResourceMasker.cpp:

(WebCore::RenderSVGResourceMasker::applyResource):
(WebCore::RenderSVGResourceMasker::drawContentIntoMaskImage):

• rendering/svg/RenderSVGResourcePattern.cpp:

(WebCore::RenderSVGResourcePattern::postApplyResource):
(WebCore::RenderSVGResourcePattern::createTileImage):

• rendering/svg/RenderSVGResourceSolidColor.cpp:

(WebCore::RenderSVGResourceSolidColor::postApplyResource):

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::paintReplaced):

• rendering/svg/RenderSVGShape.cpp:

(WebCore::RenderSVGShape::fillShape):
(WebCore::RenderSVGShape::strokeShape):
(WebCore::RenderSVGShape::fillStrokeMarkers):
(WebCore::RenderSVGShape::paint):

• rendering/svg/RenderSVGShape.h:
• rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::paint):

• rendering/svg/RenderSVGViewportContainer.cpp:

(WebCore::RenderSVGViewportContainer::applyViewportClip):

• rendering/svg/SVGInlineFlowBox.cpp:

(WebCore::SVGInlineFlowBox::paintSelectionBackground):
(WebCore::SVGInlineFlowBox::paint):

• rendering/svg/SVGInlineTextBox.cpp:

(WebCore::SVGInlineTextBox::paintSelectionBackground):
(WebCore::SVGInlineTextBox::paint):
(WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
(WebCore::SVGInlineTextBox::paintDecoration):
(WebCore::SVGInlineTextBox::paintDecorationWithStyle):
(WebCore::SVGInlineTextBox::paintTextWithShadows):
(WebCore::SVGInlineTextBox::paintText):

• rendering/svg/SVGInlineTextBox.h:
• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::~SVGRenderingContext):
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
(WebCore::SVGRenderingContext::createImageBuffer):
(WebCore::SVGRenderingContext::clipToImageBuffer):
(WebCore::SVGRenderingContext::bufferForeground):
(WebCore::SVGRenderingContext::renderSubtreeToImageBuffer): Deleted.

• rendering/svg/SVGRenderingContext.h:
• rendering/svg/SVGRootInlineBox.cpp:

(WebCore::SVGRootInlineBox::paint):

• rendering/svg/SVGTextRunRenderingContext.cpp:

(WebCore::SVGTextRunRenderingContext::drawSVGGlyphs):

• rendering/svg/SVGTextRunRenderingContext.h:
• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::drawForContainer):
(WebCore::SVGImage::drawPatternForContainer):
(WebCore::SVGImage::draw):

• svg/graphics/SVGImage.h:
• svg/graphics/SVGImageForContainer.cpp:

(WebCore::SVGImageForContainer::draw):
(WebCore::SVGImageForContainer::drawPattern):

• svg/graphics/SVGImageForContainer.h:
• svg/graphics/filters/SVGFEImage.cpp:

(WebCore::FEImage::platformApplySoftware):

Source/WebKit/mac:

• Misc/WebKitNSStringExtras.mm:

(-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):

• WebCoreSupport/WebContextMenuClient.mm:

(WebContextMenuClient::imageForCurrentSharingServicePickerItem):

• WebView/WebFrame.mm:

(-[WebFrame _drawRect:contentsOnly:]):

Source/WebKit2:

• PluginProcess/PluginControllerProxy.cpp:

(WebKit::PluginControllerProxy::paint):

• Shared/cairo/ShareableBitmapCairo.cpp:

(WebKit::ShareableBitmap::paint):

• WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:

(WebKit::imageForRect):

• WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:

(WebKit::InjectedBundleRangeHandle::renderedImage):

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::paint):
(WebKit::NetscapePlugin::snapshot):

• WebProcess/Plugins/Netscape/NetscapePlugin.h:
• WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:

(WebKit::NetscapePlugin::platformPaint):

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:

(WebKit::NetscapePlugin::platformPaint):

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:

(WebKit::NetscapePlugin::platformPaint):

• WebProcess/Plugins/PDF/PDFPlugin.h:
• WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::PDFPlugin::updateControlTints):
(WebKit::PDFPlugin::paintControlForLayerInContext):

• WebProcess/Plugins/Plugin.cpp:

(WebKit::Plugin::updateControlTints):

• WebProcess/Plugins/Plugin.h:
• WebProcess/Plugins/PluginProxy.cpp:

(WebKit::PluginProxy::paint):

• WebProcess/Plugins/PluginProxy.h:
• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::paint):

• WebProcess/Plugins/PluginView.h:
• WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:

(WebKit::convertCairoSurfaceToShareableBitmap):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::drawRect):
(WebKit::WebPage::snapshotAtSize):
(WebKit::WebPage::snapshotNode):

• WebProcess/WebPage/ios/FindControllerIOS.mm:

(WebKit::FindIndicatorOverlayClientIOS::drawRect):

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -91 +91 @@
     
     // Fill first.
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext& context = paintInfo.context();
     ColorSpace colorSpace = style().colorSpace();
-    context->fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
+    context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
     
     // Now stroke the edges but only if we have enough room to paint both edges with a little
     // bit of the fill color showing through.
     if (borderRect.width() >= 3) {
-        context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor(), colorSpace);
-        context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor(), colorSpace);
+        context.fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor(), colorSpace);
+        context.fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor(), colorSpace);
     }
 }
@@ -111 +111 @@
     
     // Fill first.
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext& context = paintInfo.context();
     ColorSpace colorSpace = style().colorSpace();
-    context->fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
+    context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
 
     // Now stroke the edges but only if we have enough room to paint both edges with a little
     // bit of the fill color showing through.
     if (borderRect.height() >= 3) {
-        context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
-        context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace);
+        context.fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
+        context.fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace);
     }
 }