Commit 9d0a628e authored by darin's avatar darin

Reviewed by Eric.

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7444
          move QPainter to platform directory and name it GraphicsContext

        * platform/GraphicsContext.h: Added.
        * platform/TextDirection.h: Added.
        * platform/cg/GraphicsContextCG.cpp: Added.
        * platform/mac/GraphicsContextMac.mm: Added.

        * kwq/KWQPainter.h: Removed.
        * kwq/KWQPainter.mm: Removed.
        * ForwardingHeaders/qpainter.h: Removed.

        * WebCore.xcodeproj/project.pbxproj: Updated for moved files.
        * WebCore.vcproj/WebCore/WebCore.vcproj: Updated for moved files.
        * platform/win/TemporaryLinkStubs.cpp: Updated.

        * bridge/mac/MacFrame.mm: (WebCore::MacFrame::setDisplaysWithFocusAttributes):
        * bridge/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge drawRect:]):
        * editing/SelectionController.h:
        * editing/SelectionController.cpp: (WebCore::SelectionController::paintCaret):
        * kcanvas/KCanvasResources.cpp: (WebCore::KCanvasMarker::draw):
        * khtml/ecma/kjs_html.cpp:
        (KJS::KJS::Context2DFunction::callAsFunction):
        (KJS::Context2D::putValueProperty):
        (KJS::drawPattern):
        * page/Frame.h:
        * page/Frame.cpp:
        (WebCore::Frame::paintCaret):
        (WebCore::Frame::paintDragCaret):
        (WebCore::Frame::paint):
        (WebCore::Frame::adjustPageHeight):
        * page/FrameView.h:
        * platform/Font.h:
        * platform/Font.cpp:
        (WebCore::Font::selectionRectForText):
        (WebCore::Font::drawHighlightForText):
        (WebCore::Font::drawText):
        * platform/Widget.h:
        * platform/mac/WidgetMac.mm: (WebCore::Widget::paint):
        * rendering/InlineTextBox.h:
        * rendering/InlineTextBox.cpp:
        (WebCore::InlineTextBox::paint):
        (WebCore::InlineTextBox::paintSelection):
        (WebCore::InlineTextBox::paintMarkedTextBackground):
        (WebCore::InlineTextBox::paintDecoration):
        (WebCore::InlineTextBox::paintSpellingMarker):
        (WebCore::InlineTextBox::paintTextMatchMarker):
        (WebCore::InlineTextBox::paintAllMarkersOfType):
        (WebCore::InlineTextBox::paintMarkedTextUnderline):
        (WebCore::InlineTextBox::offsetForPosition):
        * rendering/RenderTableCell.cpp:
        (WebCore::outlineBox):
        (WebCore::RenderTableCell::paintCollapsedBorder):
        (WebCore::RenderTableCell::paintBoxDecorations):
        * rendering/RenderTableCell.h:
        * rendering/render_box.cpp:
        (WebCore::RenderBox::paintBackgrounds):
        (WebCore::RenderBox::paintBackground):
        (WebCore::RenderBox::paintBackgroundExtended):
        (WebCore::RenderBox::outlineBox):
        * rendering/render_box.h:
        * rendering/render_button.cpp:
        (WebCore::RenderButton::RenderButton):
        (WebCore::RenderButton::paintObject):
        * rendering/render_button.h:
        (WebCore::RenderButton::removeLeftoverAnonymousBoxes):
        * rendering/render_canvas.cpp:
        * rendering/render_canvasimage.cpp:
        (WebCore::RenderCanvasImage::paint):
        * rendering/render_flow.cpp:
        (WebCore::RenderFlow::addFocusRingRects):
        (WebCore::RenderFlow::paintFocusRing):
        (WebCore::RenderFlow::paintOutlines):
        (WebCore::RenderFlow::paintOutlineForLine):
        * rendering/render_flow.h:
        * rendering/render_form.cpp:
        (WebCore::RenderLineEdit::setStyle):
        (WebCore::RenderFieldset::paintBorderMinusLegend):
        (WebCore::RenderSelect::setWidgetWritingDirection):
        (WebCore::RenderTextArea::setStyle):
        * rendering/render_form.h:
        (WebCore::RenderFieldset::renderName):
        * rendering/render_frames.cpp:
        (WebCore::RenderFrameSet::userResize):
        * rendering/render_image.cpp:
        (WebCore::RenderImage::paint):
        * rendering/render_layer.cpp:
        (WebCore::RenderLayer::beginTransparencyLayers):
        (WebCore::RenderLayer::paintScrollbars):
        (WebCore::RenderLayer::paint):
        (WebCore::setClip):
        (WebCore::restoreClip):
        (WebCore::RenderLayer::paintLayer):
        (WebCore::Marquee::direction):
        * rendering/render_layer.h:
        * rendering/render_line.cpp:
        (WebCore::InlineFlowBox::paintBackgrounds):
        (WebCore::InlineFlowBox::paintBackground):
        (WebCore::InlineFlowBox::paintBackgroundAndBorder):
        (WebCore::InlineFlowBox::paintDecorations):
        (WebCore::EllipsisBox::paint):
        * rendering/render_line.h:
        * rendering/render_list.cpp:
        (WebCore::RenderListMarker::paint):
        * rendering/render_object.cpp:
        (WebCore::RenderObject::drawBorder):
        (WebCore::RenderObject::paintBorderImage):
        (WebCore::RenderObject::paintBorder):
        (WebCore::RenderObject::addFocusRingRects):
        (WebCore::RenderObject::paintOutline):
        (WebCore::RenderObject::selectionColor):
        * rendering/render_object.h:
        (WebCore::RenderObject::element):
        (WebCore::RenderObject::document):
        (WebCore::RenderObject::setNode):
        (WebCore::RenderObject::node):
        (WebCore::RenderObject::PaintInfo::PaintInfo):
        (WebCore::RenderObject::paintBoxDecorations):
        (WebCore::RenderObject::paintBackgroundExtended):
        (WebCore::RenderObject::printBoxDecorations):
        * rendering/render_replaced.cpp: (WebCore::RenderReplaced::selectionColor):
        * rendering/render_replaced.h:
        Updated to use GraphicsContext instead of QPainter.

        * css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::applyProperty):
        * kwq/KWQComboBox.h:
        * kwq/KWQComboBox.mm: (QComboBox::setWritingDirection):
        * kwq/KWQLineEdit.h:
        * kwq/KWQLineEdit.mm: (QLineEdit::setWritingDirection):
        * kwq/KWQListBox.h:
        * kwq/KWQListBox.mm: (QListBox::setWritingDirection):
        * kwq/KWQTextEdit.h:
        * kwq/KWQTextEdit.mm: (QTextEdit::setWritingDirection):
        * rendering/bidi.cpp:
        (khtml::bidiNext):
        (khtml::bidiFirst):
        Updated to use TextDirection instead of QPainter::TextDirection and EDirection.

        * kcanvas/device/KRenderingDevice.h: Added renderingDevice here to
        replace QPainter::renderingDevice for now.

        * khtml/ecma/kjs_html.h: Fixed comments to mention GraphicsContext.

        * khtml/html/html_imageimpl.h:
        * page/FrameView.cpp:
        * rendering/RenderBlock.cpp:
        Added include needed since I reduced includes elsewhere.

        * kwq/KWQFontMetrics.h:
        * kwq/KWQFontMetrics.mm: (QFontMetrics::checkSelectionPoint):
        Changed QChar* to be const QChar*.

        * platform/FontDescription.h: Added include that was missing.
        * rendering/render_theme.cpp: Ditto.

        * platform/Image.h: Removed unnecessary forward declaration of QPainter.

        * rendering/RenderText.h: Clean up types, use const.

        * rendering/render_style.h: Removed EDirection and replaced it with TextDirection.

        * kcanvas/KCanvasCreator.cpp:
        (WebCore::KCanvasCreator::createRoundedRectangle):
        (WebCore::KCanvasCreator::createRectangle):
        (WebCore::KCanvasCreator::createEllipse):
        (WebCore::KCanvasCreator::createLine):
        * kcanvas/KCanvasPath.cpp: (WebCore::operator<<):
        * kcanvas/KCanvasTreeDebug.cpp: (WebCore::operator<<):
        * kcanvas/RenderForeignObject.cpp: (WebCore::RenderForeignObject::paint):
        * kcanvas/RenderPath.cpp: (WebCore::RenderPath::paint):
        * kcanvas/RenderSVGImage.cpp:
        (WebCore::RenderSVGImage::paint):
        (WebCore::RenderSVGImage::translateForAttributes):
        * kcanvas/RenderSVGText.cpp:
        (WebCore::RenderSVGText::paint):
        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
        (WebCore::KCanvasFilterQuartz::prepareFilter):
        (WebCore::KCanvasFilterQuartz::applyFilter):
        * kcanvas/device/quartz/KCanvasMaskerQuartz.mm:
        (WebCore::KCanvasMaskerQuartz::applyMask):
        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
        (WebCore::KCanvasContainerQuartz::paint):
        (WebCore::KCanvasClipperQuartz::applyClip):
        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
        (WebCore::KRenderingDeviceQuartz::pushContext):
        (WebCore::KRenderingDeviceQuartz::popContext):
        (WebCore::renderingDevice):
        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
        (WebCore::KRenderingPaintServerGradientQuartz::setup):
        (WebCore::KRenderingPaintServerGradientQuartz::renderPath):
        (WebCore::KRenderingPaintServerGradientQuartz::teardown):
        * ksvg2/misc/KCanvasRenderingStyle.cpp: (WebCore::sharedSolidPaintServer):
        * ksvg2/svg/SVGAElementImpl.cpp: (SVGAElementImpl::createRenderer):
        * ksvg2/svg/SVGClipPathElementImpl.cpp: (SVGClipPathElementImpl::canvasResource):
        * ksvg2/svg/SVGFEBlendElementImpl.cpp: (SVGFEBlendElementImpl::filterEffect):
        * ksvg2/svg/SVGFEColorMatrixElementImpl.cpp: (SVGFEColorMatrixElementImpl::filterEffect):
        * ksvg2/svg/SVGFEComponentTransferElementImpl.cpp: (SVGFEComponentTransferElementImpl::filterEffect):
        * ksvg2/svg/SVGFECompositeElementImpl.cpp: (SVGFECompositeElementImpl::filterEffect):
        * ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp: (WebCore::SVGFEDiffuseLightingElementImpl::filterEffect):
        * ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp: (SVGFEDisplacementMapElementImpl::filterEffect):
        * ksvg2/svg/SVGFEFloodElementImpl.cpp: (SVGFEFloodElementImpl::filterEffect):
        * ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp: (SVGFEGaussianBlurElementImpl::filterEffect):
        * ksvg2/svg/SVGFEImageElementImpl.cpp: (SVGFEImageElementImpl::filterEffect):
        * ksvg2/svg/SVGFEMergeElementImpl.cpp: (SVGFEMergeElementImpl::filterEffect):
        * ksvg2/svg/SVGFEOffsetElementImpl.cpp: (SVGFEOffsetElementImpl::filterEffect):
        * ksvg2/svg/SVGFESpecularLightingElementImpl.cpp: (SVGFESpecularLightingElementImpl::filterEffect):
        * ksvg2/svg/SVGFETileElementImpl.cpp: (SVGFETileElementImpl::filterEffect):
        * ksvg2/svg/SVGFETurbulenceElementImpl.cpp: (SVGFETurbulenceElementImpl::filterEffect):
        * ksvg2/svg/SVGFilterElementImpl.cpp: (SVGFilterElementImpl::canvasResource):
        * ksvg2/svg/SVGGElementImpl.cpp: (SVGGElementImpl::createRenderer):
        * ksvg2/svg/SVGGradientElementImpl.cpp: (SVGGradientElementImpl::canvasResource):
        * ksvg2/svg/SVGMarkerElementImpl.cpp:
        (WebCore::SVGMarkerElementImpl::canvasResource):
        (WebCore::SVGMarkerElementImpl::createRenderer):
        * ksvg2/svg/SVGMaskElementImpl.cpp:
        (WebCore::SVGMaskElementImpl::drawMaskerContent):
        (WebCore::SVGMaskElementImpl::createRenderer):
        (WebCore::SVGMaskElementImpl::canvasResource):
        * ksvg2/svg/SVGPathElementImpl.cpp: (WebCore::SVGPathElementImpl::toPathData):
        * ksvg2/svg/SVGPatternElementImpl.cpp:
        (WebCore::SVGPatternElementImpl::drawPatternContentIntoTile):
        (WebCore::SVGPatternElementImpl::createRenderer):
        (WebCore::SVGPatternElementImpl::canvasResource):
        * ksvg2/svg/SVGPolygonElementImpl.cpp: (SVGPolygonElementImpl::toPathData):
        * ksvg2/svg/SVGPolylineElementImpl.cpp: (SVGPolylineElementImpl::toPathData):
        * ksvg2/svg/SVGSVGElementImpl.cpp: (WebCore::SVGSVGElementImpl::createRenderer):
        * ksvg2/svg/SVGStyledElementImpl.cpp: (WebCore::SVGStyledElementImpl::createRenderer):
        * ksvg2/svg/SVGSwitchElementImpl.cpp: (SVGSwitchElementImpl::createRenderer):
        * ksvg2/svg/SVGUseElementImpl.cpp: (SVGUseElementImpl::createRenderer):
        Updated to use renderingDevice instead of QPainter::renderingDevice.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 13a498db
2006-02-28 Darin Adler <darin@apple.com>
Reviewed by Eric.
- http://bugzilla.opendarwin.org/show_bug.cgi?id=7444
move QPainter to platform directory and name it GraphicsContext
* platform/GraphicsContext.h: Added.
* platform/TextDirection.h: Added.
* platform/cg/GraphicsContextCG.cpp: Added.
* platform/mac/GraphicsContextMac.mm: Added.
* kwq/KWQPainter.h: Removed.
* kwq/KWQPainter.mm: Removed.
* ForwardingHeaders/qpainter.h: Removed.
* WebCore.xcodeproj/project.pbxproj: Updated for moved files.
* WebCore.vcproj/WebCore/WebCore.vcproj: Updated for moved files.
* platform/win/TemporaryLinkStubs.cpp: Updated.
* bridge/mac/MacFrame.mm: (WebCore::MacFrame::setDisplaysWithFocusAttributes):
* bridge/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge drawRect:]):
* editing/SelectionController.h:
* editing/SelectionController.cpp: (WebCore::SelectionController::paintCaret):
* kcanvas/KCanvasResources.cpp: (WebCore::KCanvasMarker::draw):
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::Context2DFunction::callAsFunction):
(KJS::Context2D::putValueProperty):
(KJS::drawPattern):
* page/Frame.h:
* page/Frame.cpp:
(WebCore::Frame::paintCaret):
(WebCore::Frame::paintDragCaret):
(WebCore::Frame::paint):
(WebCore::Frame::adjustPageHeight):
* page/FrameView.h:
* platform/Font.h:
* platform/Font.cpp:
(WebCore::Font::selectionRectForText):
(WebCore::Font::drawHighlightForText):
(WebCore::Font::drawText):
* platform/Widget.h:
* platform/mac/WidgetMac.mm: (WebCore::Widget::paint):
* rendering/InlineTextBox.h:
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::paintMarkedTextBackground):
(WebCore::InlineTextBox::paintDecoration):
(WebCore::InlineTextBox::paintSpellingMarker):
(WebCore::InlineTextBox::paintTextMatchMarker):
(WebCore::InlineTextBox::paintAllMarkersOfType):
(WebCore::InlineTextBox::paintMarkedTextUnderline):
(WebCore::InlineTextBox::offsetForPosition):
* rendering/RenderTableCell.cpp:
(WebCore::outlineBox):
(WebCore::RenderTableCell::paintCollapsedBorder):
(WebCore::RenderTableCell::paintBoxDecorations):
* rendering/RenderTableCell.h:
* rendering/render_box.cpp:
(WebCore::RenderBox::paintBackgrounds):
(WebCore::RenderBox::paintBackground):
(WebCore::RenderBox::paintBackgroundExtended):
(WebCore::RenderBox::outlineBox):
* rendering/render_box.h:
* rendering/render_button.cpp:
(WebCore::RenderButton::RenderButton):
(WebCore::RenderButton::paintObject):
* rendering/render_button.h:
(WebCore::RenderButton::removeLeftoverAnonymousBoxes):
* rendering/render_canvas.cpp:
* rendering/render_canvasimage.cpp:
(WebCore::RenderCanvasImage::paint):
* rendering/render_flow.cpp:
(WebCore::RenderFlow::addFocusRingRects):
(WebCore::RenderFlow::paintFocusRing):
(WebCore::RenderFlow::paintOutlines):
(WebCore::RenderFlow::paintOutlineForLine):
* rendering/render_flow.h:
* rendering/render_form.cpp:
(WebCore::RenderLineEdit::setStyle):
(WebCore::RenderFieldset::paintBorderMinusLegend):
(WebCore::RenderSelect::setWidgetWritingDirection):
(WebCore::RenderTextArea::setStyle):
* rendering/render_form.h:
(WebCore::RenderFieldset::renderName):
* rendering/render_frames.cpp:
(WebCore::RenderFrameSet::userResize):
* rendering/render_image.cpp:
(WebCore::RenderImage::paint):
* rendering/render_layer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
(WebCore::RenderLayer::paintScrollbars):
(WebCore::RenderLayer::paint):
(WebCore::setClip):
(WebCore::restoreClip):
(WebCore::RenderLayer::paintLayer):
(WebCore::Marquee::direction):
* rendering/render_layer.h:
* rendering/render_line.cpp:
(WebCore::InlineFlowBox::paintBackgrounds):
(WebCore::InlineFlowBox::paintBackground):
(WebCore::InlineFlowBox::paintBackgroundAndBorder):
(WebCore::InlineFlowBox::paintDecorations):
(WebCore::EllipsisBox::paint):
* rendering/render_line.h:
* rendering/render_list.cpp:
(WebCore::RenderListMarker::paint):
* rendering/render_object.cpp:
(WebCore::RenderObject::drawBorder):
(WebCore::RenderObject::paintBorderImage):
(WebCore::RenderObject::paintBorder):
(WebCore::RenderObject::addFocusRingRects):
(WebCore::RenderObject::paintOutline):
(WebCore::RenderObject::selectionColor):
* rendering/render_object.h:
(WebCore::RenderObject::element):
(WebCore::RenderObject::document):
(WebCore::RenderObject::setNode):
(WebCore::RenderObject::node):
(WebCore::RenderObject::PaintInfo::PaintInfo):
(WebCore::RenderObject::paintBoxDecorations):
(WebCore::RenderObject::paintBackgroundExtended):
(WebCore::RenderObject::printBoxDecorations):
* rendering/render_replaced.cpp: (WebCore::RenderReplaced::selectionColor):
* rendering/render_replaced.h:
Updated to use GraphicsContext instead of QPainter.
* css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::applyProperty):
* kwq/KWQComboBox.h:
* kwq/KWQComboBox.mm: (QComboBox::setWritingDirection):
* kwq/KWQLineEdit.h:
* kwq/KWQLineEdit.mm: (QLineEdit::setWritingDirection):
* kwq/KWQListBox.h:
* kwq/KWQListBox.mm: (QListBox::setWritingDirection):
* kwq/KWQTextEdit.h:
* kwq/KWQTextEdit.mm: (QTextEdit::setWritingDirection):
* rendering/bidi.cpp:
(khtml::bidiNext):
(khtml::bidiFirst):
Updated to use TextDirection instead of QPainter::TextDirection and EDirection.
* kcanvas/device/KRenderingDevice.h: Added renderingDevice here to
replace QPainter::renderingDevice for now.
* khtml/ecma/kjs_html.h: Fixed comments to mention GraphicsContext.
* khtml/html/html_imageimpl.h:
* page/FrameView.cpp:
* rendering/RenderBlock.cpp:
Added include needed since I reduced includes elsewhere.
* kwq/KWQFontMetrics.h:
* kwq/KWQFontMetrics.mm: (QFontMetrics::checkSelectionPoint):
Changed QChar* to be const QChar*.
* platform/FontDescription.h: Added include that was missing.
* rendering/render_theme.cpp: Ditto.
* platform/Image.h: Removed unnecessary forward declaration of QPainter.
* rendering/RenderText.h: Clean up types, use const.
* rendering/render_style.h: Removed EDirection and replaced it with TextDirection.
* kcanvas/KCanvasCreator.cpp:
(WebCore::KCanvasCreator::createRoundedRectangle):
(WebCore::KCanvasCreator::createRectangle):
(WebCore::KCanvasCreator::createEllipse):
(WebCore::KCanvasCreator::createLine):
* kcanvas/KCanvasPath.cpp: (WebCore::operator<<):
* kcanvas/KCanvasTreeDebug.cpp: (WebCore::operator<<):
* kcanvas/RenderForeignObject.cpp: (WebCore::RenderForeignObject::paint):
* kcanvas/RenderPath.cpp: (WebCore::RenderPath::paint):
* kcanvas/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::paint):
(WebCore::RenderSVGImage::translateForAttributes):
* kcanvas/RenderSVGText.cpp:
(WebCore::RenderSVGText::paint):
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
(WebCore::KCanvasFilterQuartz::prepareFilter):
(WebCore::KCanvasFilterQuartz::applyFilter):
* kcanvas/device/quartz/KCanvasMaskerQuartz.mm:
(WebCore::KCanvasMaskerQuartz::applyMask):
* kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
(WebCore::KCanvasContainerQuartz::paint):
(WebCore::KCanvasClipperQuartz::applyClip):
* kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
(WebCore::KRenderingDeviceQuartz::pushContext):
(WebCore::KRenderingDeviceQuartz::popContext):
(WebCore::renderingDevice):
* kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
(WebCore::KRenderingPaintServerGradientQuartz::setup):
(WebCore::KRenderingPaintServerGradientQuartz::renderPath):
(WebCore::KRenderingPaintServerGradientQuartz::teardown):
* ksvg2/misc/KCanvasRenderingStyle.cpp: (WebCore::sharedSolidPaintServer):
* ksvg2/svg/SVGAElementImpl.cpp: (SVGAElementImpl::createRenderer):
* ksvg2/svg/SVGClipPathElementImpl.cpp: (SVGClipPathElementImpl::canvasResource):
* ksvg2/svg/SVGFEBlendElementImpl.cpp: (SVGFEBlendElementImpl::filterEffect):
* ksvg2/svg/SVGFEColorMatrixElementImpl.cpp: (SVGFEColorMatrixElementImpl::filterEffect):
* ksvg2/svg/SVGFEComponentTransferElementImpl.cpp: (SVGFEComponentTransferElementImpl::filterEffect):
* ksvg2/svg/SVGFECompositeElementImpl.cpp: (SVGFECompositeElementImpl::filterEffect):
* ksvg2/svg/SVGFEDiffuseLightingElementImpl.cpp: (WebCore::SVGFEDiffuseLightingElementImpl::filterEffect):
* ksvg2/svg/SVGFEDisplacementMapElementImpl.cpp: (SVGFEDisplacementMapElementImpl::filterEffect):
* ksvg2/svg/SVGFEFloodElementImpl.cpp: (SVGFEFloodElementImpl::filterEffect):
* ksvg2/svg/SVGFEGaussianBlurElementImpl.cpp: (SVGFEGaussianBlurElementImpl::filterEffect):
* ksvg2/svg/SVGFEImageElementImpl.cpp: (SVGFEImageElementImpl::filterEffect):
* ksvg2/svg/SVGFEMergeElementImpl.cpp: (SVGFEMergeElementImpl::filterEffect):
* ksvg2/svg/SVGFEOffsetElementImpl.cpp: (SVGFEOffsetElementImpl::filterEffect):
* ksvg2/svg/SVGFESpecularLightingElementImpl.cpp: (SVGFESpecularLightingElementImpl::filterEffect):
* ksvg2/svg/SVGFETileElementImpl.cpp: (SVGFETileElementImpl::filterEffect):
* ksvg2/svg/SVGFETurbulenceElementImpl.cpp: (SVGFETurbulenceElementImpl::filterEffect):
* ksvg2/svg/SVGFilterElementImpl.cpp: (SVGFilterElementImpl::canvasResource):
* ksvg2/svg/SVGGElementImpl.cpp: (SVGGElementImpl::createRenderer):
* ksvg2/svg/SVGGradientElementImpl.cpp: (SVGGradientElementImpl::canvasResource):
* ksvg2/svg/SVGMarkerElementImpl.cpp:
(WebCore::SVGMarkerElementImpl::canvasResource):
(WebCore::SVGMarkerElementImpl::createRenderer):
* ksvg2/svg/SVGMaskElementImpl.cpp:
(WebCore::SVGMaskElementImpl::drawMaskerContent):
(WebCore::SVGMaskElementImpl::createRenderer):
(WebCore::SVGMaskElementImpl::canvasResource):
* ksvg2/svg/SVGPathElementImpl.cpp: (WebCore::SVGPathElementImpl::toPathData):
* ksvg2/svg/SVGPatternElementImpl.cpp:
(WebCore::SVGPatternElementImpl::drawPatternContentIntoTile):
(WebCore::SVGPatternElementImpl::createRenderer):
(WebCore::SVGPatternElementImpl::canvasResource):
* ksvg2/svg/SVGPolygonElementImpl.cpp: (SVGPolygonElementImpl::toPathData):
* ksvg2/svg/SVGPolylineElementImpl.cpp: (SVGPolylineElementImpl::toPathData):
* ksvg2/svg/SVGSVGElementImpl.cpp: (WebCore::SVGSVGElementImpl::createRenderer):
* ksvg2/svg/SVGStyledElementImpl.cpp: (WebCore::SVGStyledElementImpl::createRenderer):
* ksvg2/svg/SVGSwitchElementImpl.cpp: (SVGSwitchElementImpl::createRenderer):
* ksvg2/svg/SVGUseElementImpl.cpp: (SVGUseElementImpl::createRenderer):
Updated to use renderingDevice instead of QPainter::renderingDevice.
2006-02-28 Darin Adler <darin@apple.com>
- fixed part of the reason the build is broken
......
......@@ -322,10 +322,6 @@
RelativePath="..\..\kwq\KWQPageState.h"
>
</File>
<File
RelativePath="..\..\kwq\KWQPainter.h"
>
</File>
<File
RelativePath="..\..\kwq\KWQPalette.h"
>
......@@ -1584,6 +1580,10 @@
RelativePath="..\..\platform\FontFamily.h"
>
</File>
<File
RelativePath="..\..\platform\GraphicsContext.h"
>
</File>
<File
RelativePath="..\..\platform\Image.cpp"
>
......
......@@ -167,6 +167,10 @@
93309EA4099EB78C0056E581 /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309EA1099EB78C0056E581 /* Timer.cpp */; };
9353673F09AED79200D35CD6 /* ScrollBarMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9353673E09AED79200D35CD6 /* ScrollBarMode.h */; };
9353676B09AED88B00D35CD6 /* ScrollViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */; };
935367E509AF77DD00D35CD6 /* GraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 935367E409AF77DD00D35CD6 /* GraphicsContext.h */; };
935367E909AF77EF00D35CD6 /* GraphicsContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935367E809AF77EF00D35CD6 /* GraphicsContextMac.mm */; };
935367ED09AF77FC00D35CD6 /* GraphicsContextCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935367EC09AF77FC00D35CD6 /* GraphicsContextCG.cpp */; };
9353686B09AF78F600D35CD6 /* TextDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9353686A09AF78F600D35CD6 /* TextDirection.h */; };
935C475D09AC4CA000A6AAB4 /* History.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C475C09AC4CA000A6AAB4 /* History.h */; };
935C475F09AC4CAE00A6AAB4 /* HistoryMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C475E09AC4CAE00A6AAB4 /* HistoryMac.mm */; };
935C476109AC4CD100A6AAB4 /* Length.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476009AC4CD100A6AAB4 /* Length.h */; };
......@@ -256,7 +260,6 @@
93F1997508245E59001E9ABC /* KWQNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869E02DE3B8601EA4122 /* KWQNamespace.h */; };
93F1997608245E59001E9ABC /* KWQObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869F02DE3B8601EA4122 /* KWQObject.h */; };
93F1997708245E59001E9ABC /* KWQPageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* KWQPageState.h */; };
93F1997A08245E59001E9ABC /* KWQPainter.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786A302DE3B8601EA4122 /* KWQPainter.h */; };
93F1998208245E59001E9ABC /* KWQPtrList.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869902DE3B8601EA4122 /* KWQPtrList.h */; };
93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */; };
93F1998A08245E59001E9ABC /* KWQRegExp.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786B302DE3B8601EA4122 /* KWQRegExp.h */; };
......@@ -340,7 +343,6 @@
93F19A3C08245E59001E9ABC /* KWQListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* KWQListImpl.cpp */; };
93F19A3F08245E59001E9ABC /* KWQTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* KWQTextField.mm */; };
93F19A4008245E59001E9ABC /* KWQObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851D02DE375901EA4122 /* KWQObject.cpp */; };
93F19A4208245E59001E9ABC /* KWQPainter.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851F02DE375901EA4122 /* KWQPainter.mm */; };
93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* KWQRegExp.cpp */; };
93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* KWQTextArea.mm */; };
93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* KWQTextEdit.mm */; };
......@@ -1295,6 +1297,10 @@
93386B91037045B3008635CE /* KWQResourceLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQResourceLoader.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9353673E09AED79200D35CD6 /* ScrollBarMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollBarMode.h; path = platform/ScrollBarMode.h; sourceTree = "<group>"; };
9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewMac.mm; sourceTree = "<group>"; };
935367E409AF77DD00D35CD6 /* GraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsContext.h; path = platform/GraphicsContext.h; sourceTree = "<group>"; };
935367E809AF77EF00D35CD6 /* GraphicsContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GraphicsContextMac.mm; sourceTree = "<group>"; };
935367EC09AF77FC00D35CD6 /* GraphicsContextCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContextCG.cpp; sourceTree = "<group>"; };
9353686A09AF78F600D35CD6 /* TextDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDirection.h; path = platform/TextDirection.h; sourceTree = "<group>"; };
935C475C09AC4CA000A6AAB4 /* History.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = History.h; sourceTree = "<group>"; };
935C475E09AC4CAE00A6AAB4 /* HistoryMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryMac.mm; sourceTree = "<group>"; };
935C476009AC4CD100A6AAB4 /* Length.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Length.h; sourceTree = "<group>"; };
......@@ -2218,7 +2224,6 @@
F587851B02DE375901EA4122 /* KWQTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextField.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851C02DE375901EA4122 /* KWQTextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851D02DE375901EA4122 /* KWQObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQObject.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851F02DE375901EA4122 /* KWQPainter.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQPainter.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587852B02DE375901EA4122 /* KWQRegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KWQRegExp.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587853502DE375901EA4122 /* KWQTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587853602DE375901EA4122 /* KWQTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -2256,7 +2261,6 @@
F587869902DE3B8601EA4122 /* KWQPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869E02DE3B8601EA4122 /* KWQNamespace.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQNamespace.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587869F02DE3B8601EA4122 /* KWQObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQObject.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786A302DE3B8601EA4122 /* KWQPainter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPainter.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786AC02DE3B8601EA4122 /* KWQPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58786B302DE3B8601EA4122 /* KWQRegExp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQRegExp.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -2379,6 +2383,7 @@
6582A14C09999D6C00BEEB6D /* FloatSizeMac.mm */,
BCC47E2209A3D6B300ADB771 /* FontFamilyMac.mm */,
935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */,
935367E809AF77EF00D35CD6 /* GraphicsContextMac.mm */,
6582A14D09999D6C00BEEB6D /* ImageMac.mm */,
6582A14E09999D6D00BEEB6D /* ImageSourceMac.cpp */,
6582A14F09999D6D00BEEB6D /* IntPointMac.mm */,
......@@ -2511,6 +2516,7 @@
93032CCC09AEC36200F82A18 /* cg */ = {
isa = PBXGroup;
children = (
935367EC09AF77FC00D35CD6 /* GraphicsContextCG.cpp */,
93032CC709AEC34300F82A18 /* PathCG.cpp */,
);
name = cg;
......@@ -3356,6 +3362,7 @@
BCC47E6A09A3FE4700ADB771 /* FontDescription.h */,
BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */,
BCC47E2509A3D6F100ADB771 /* FontFamily.h */,
935367E409AF77DD00D35CD6 /* GraphicsContext.h */,
BC6B7BAE0993603C0052867B /* Image.cpp */,
BCD75ABB0989A446003E28DF /* Image.h */,
BC9C328A09933A6D001D6924 /* ImageAnimationObserver.h */,
......@@ -3396,6 +3403,7 @@
93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */,
93CD4FDD0995F9EA007ECC97 /* StringImpl.h */,
93E62D990985F41600E1B5E3 /* SystemTime.h */,
9353686A09AF78F600D35CD6 /* TextDirection.h */,
657BD74B09AFDC54005A2056 /* TextEncoding.cpp */,
657BD74C09AFDC54005A2056 /* TextEncoding.h */,
93309EA1099EB78C0056E581 /* Timer.cpp */,
......@@ -3841,8 +3849,6 @@
F587869E02DE3B8601EA4122 /* KWQNamespace.h */,
F587851D02DE375901EA4122 /* KWQObject.cpp */,
F587869F02DE3B8601EA4122 /* KWQObject.h */,
F58786A302DE3B8601EA4122 /* KWQPainter.h */,
F587851F02DE375901EA4122 /* KWQPainter.mm */,
F587869902DE3B8601EA4122 /* KWQPtrList.h */,
F58786AD02DE3B8601EA4122 /* KWQPtrQueue.h */,
F587852B02DE375901EA4122 /* KWQRegExp.cpp */,
......@@ -3932,7 +3938,6 @@
93F1997508245E59001E9ABC /* KWQNamespace.h in Headers */,
93F1997608245E59001E9ABC /* KWQObject.h in Headers */,
93F1997708245E59001E9ABC /* KWQPageState.h in Headers */,
93F1997A08245E59001E9ABC /* KWQPainter.h in Headers */,
93F1998208245E59001E9ABC /* KWQPtrList.h in Headers */,
93F1998308245E59001E9ABC /* KWQPtrQueue.h in Headers */,
93F1998A08245E59001E9ABC /* KWQRegExp.h in Headers */,
......@@ -4388,6 +4393,8 @@
6593923809AE4346002C531F /* KURL.h in Headers */,
BC6D6DD309AF906600F59759 /* Font.h in Headers */,
9353673F09AED79200D35CD6 /* ScrollBarMode.h in Headers */,
935367E509AF77DD00D35CD6 /* GraphicsContext.h in Headers */,
9353686B09AF78F600D35CD6 /* TextDirection.h in Headers */,
657BD74E09AFDC54005A2056 /* StreamingTextDecoder.h in Headers */,
657BD75009AFDC54005A2056 /* TextEncoding.h in Headers */,
BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */,
......@@ -5047,7 +5054,6 @@
93F19A3C08245E59001E9ABC /* KWQListImpl.cpp in Sources */,
93F19A3F08245E59001E9ABC /* KWQTextField.mm in Sources */,
93F19A4008245E59001E9ABC /* KWQObject.cpp in Sources */,
93F19A4208245E59001E9ABC /* KWQPainter.mm in Sources */,
93F19A4A08245E59001E9ABC /* KWQRegExp.cpp in Sources */,
93F19A5108245E59001E9ABC /* KWQTextArea.mm in Sources */,
93F19A5308245E59001E9ABC /* KWQTextEdit.mm in Sources */,
......@@ -5505,6 +5511,8 @@
6593923A09AE435C002C531F /* KURLMac.mm in Sources */,
BC6D6DD209AF906600F59759 /* Font.cpp in Sources */,
9353676B09AED88B00D35CD6 /* ScrollViewMac.mm in Sources */,
935367E909AF77EF00D35CD6 /* GraphicsContextMac.mm in Sources */,
935367ED09AF77FC00D35CD6 /* GraphicsContextCG.cpp in Sources */,
BC9B62E509B3DC85006131EB /* KWQFontMetrics.mm in Sources */,
657BD74D09AFDC54005A2056 /* StreamingTextDecoder.cpp in Sources */,
657BD74F09AFDC54005A2056 /* TextEncoding.cpp in Sources */,
......
......@@ -34,6 +34,7 @@
#import "FoundationExtras.h"
#import "FramePrivate.h"
#import "FrameView.h"
#import "GraphicsContext.h"
#import "HTMLFormElementImpl.h"
#import "HTMLGenericFormElementImpl.h"
#import "InlineTextBox.h"
......@@ -2998,7 +2999,7 @@ void MacFrame::setDisplaysWithFocusAttributes(bool flag)
if (documentView && renderer()) {
doc->updateLayout(); // Ensure layout is up to date.
IntRect visibleRect(enclosingIntRect([documentView visibleRect]));
QPainter p;
GraphicsContext p;
p.setUpdatingControlTints(true);
paint(&p, visibleRect);
}
......
......@@ -32,6 +32,7 @@
#import "DocumentTypeImpl.h"
#import "FrameTree.h"
#import "FrameView.h"
#import "GraphicsContext.h"
#import "HTMLFormElementImpl.h"
#import "HTMLInputElementImpl.h"
#import "KWQAccObjectCache.h"
......@@ -1011,21 +1012,15 @@ static BOOL nowPrinting(WebCoreFrameBridge *self)
m_frame->sendScrollEvent();
}
- (void)drawRect:(NSRect)rect withPainter:(QPainter *)p
- (void)drawRect:(NSRect)rect
{
GraphicsContext context(nowPrinting(self));
context.setUsesInactiveTextBackgroundColor(!m_frame->displaysWithFocusAttributes());
[self _setupRootForPrinting:YES];
m_frame->paint(p, enclosingIntRect(rect));
m_frame->paint(&context, enclosingIntRect(rect));
[self _setupRootForPrinting:NO];
}
- (void)drawRect:(NSRect)rect
{
QPainter painter(nowPrinting(self));
bool displaysWithFocusAttributes = m_frame->displaysWithFocusAttributes();
painter.setUsesInactiveTextBackgroundColor(!displaysWithFocusAttributes);
[self drawRect:rect withPainter:&painter];
}
// Used by pagination code called from AppKit when a standalone web page is printed.
- (NSArray*)computePageRectsWithPrintWidthScaleFactor:(float)printWidthScaleFactor printHeight:(float)printHeight
{
......
......@@ -1873,7 +1873,7 @@ void CSSStyleSelector::applyProperty( int id, CSSValueImpl *value )
{
HANDLE_INHERIT_AND_INITIAL(direction, Direction)
if(!primitiveValue) break;
style->setDirection( (EDirection) (primitiveValue->getIdent() - CSS_VAL_LTR) );
style->setDirection(primitiveValue->getIdent() == CSS_VAL_LTR ? LTR : RTL);
return;
}
case CSS_PROP_DISPLAY:
......
......@@ -27,25 +27,25 @@
#include "SelectionController.h"
#include "DocumentImpl.h"
#include "EventNames.h"
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "InlineTextBox.h"
#include "IntRect.h"
#include "dom_node.h"
#include "PlatformString.h"
#include "VisiblePosition.h"
#include "dom2_eventsimpl.h"
#include "dom2_rangeimpl.h"
#include "dom_elementimpl.h"
#include "dom_node.h"
#include "htmlediting.h"
#include "render_canvas.h"
#include "render_object.h"
#include "render_style.h"
#include "VisiblePosition.h"
#include "visible_text.h"
#include "visible_units.h"
#include "dom2_rangeimpl.h"
#include "dom2_eventsimpl.h"
#include "dom_elementimpl.h"
#include "EventNames.h"
#include <kxmlcore/Assertions.h>
#include <qpainter.h>
#define EDIT_DEBUG 0
......@@ -822,7 +822,7 @@ void SelectionController::needsCaretRepaint()
v->updateContents(caretRepaintRect(), false);
}
void SelectionController::paintCaret(QPainter *p, const IntRect &rect)
void SelectionController::paintCaret(GraphicsContext *p, const IntRect &rect)
{
if (! m_sel.isCaret())
return;
......
......@@ -34,7 +34,7 @@
namespace WebCore {
class Frame;
class QPainter;
class GraphicsContext;
class RenderObject;
class VisiblePosition;
class SelectionController;
......@@ -179,7 +179,7 @@ private:
void layout();
void needsCaretRepaint();
void paintCaret(QPainter*, const IntRect &rect);
void paintCaret(GraphicsContext*, const IntRect &rect);
IntRect caretRepaintRect() const;
int xPosForVerticalArrowNavigation(EPositionType, bool recalc = false) const;
......
......@@ -53,7 +53,7 @@ KCanvasCreator *KCanvasCreator::self()
KCanvasPath* KCanvasCreator::createRoundedRectangle(float x, float y, float width, float height, float rx, float ry) const
{
KCanvasPath* path = QPainter::renderingDevice()->createPath();
KCanvasPath* path = renderingDevice()->createPath();
if (width <= 0.0f || height <= 0.0f || !path)
return path;
......@@ -96,7 +96,7 @@ KCanvasPath* KCanvasCreator::createRoundedRectangle(float x, float y, float widt
KCanvasPath* KCanvasCreator::createRectangle(float x, float y, float width, float height) const
{
KCanvasPath* path = QPainter::renderingDevice()->createPath();
KCanvasPath* path = renderingDevice()->createPath();
if (width <= 0.0f || height <= 0.0f || !path)
return path;
......@@ -111,7 +111,7 @@ KCanvasPath* KCanvasCreator::createRectangle(float x, float y, float width, floa
KCanvasPath* KCanvasCreator::createEllipse(float cx, float cy, float rx, float ry) const
{
KCanvasPath* path = QPainter::renderingDevice()->createPath();
KCanvasPath* path = renderingDevice()->createPath();
if (rx <= 0.0f || ry <= 0.0f || !path)
return path;
......@@ -151,7 +151,7 @@ KCanvasPath* KCanvasCreator::createCircle(float cx, float cy, float r) const
KCanvasPath* KCanvasCreator::createLine(float x1, float y1, float x2, float y2) const
{
KCanvasPath* path = QPainter::renderingDevice()->createPath();
KCanvasPath* path = renderingDevice()->createPath();
if ((x1 == x2 && y1 == y2) || !path)
return path;
......
......@@ -26,7 +26,6 @@
#include "config.h"
#if SVG_SUPPORT
#include <qpainter.h>
#include <qtextstream.h>
#include "KCanvasPath.h"
......@@ -54,7 +53,7 @@ QTextStream &operator<<(QTextStream &ts, const KCClipData &d)
ts << "[winding=" << d.windRule << "]";
if (d.bboxUnits)
ts << " [bounding box mode=" << d.bboxUnits << "]";
ts << " [path=" << QPainter::renderingDevice()->stringForPath(d.path.get()) << "]";
ts << " [path=" << renderingDevice()->stringForPath(d.path.get()) << "]";
return ts;
}
......
......@@ -24,20 +24,18 @@
#if SVG_SUPPORT
#include "KCanvasResources.h"
#include "DocumentImpl.h"
#include "GraphicsContext.h"
#include "IntRect.h"
#include "kcanvas/KCanvas.h"
#include "kcanvas/RenderPath.h"
#include "kcanvas/KCanvasImage.h"
#include "KCanvasMatrix.h"
#include "KCanvasContainer.h"
#include "KCanvasImage.h"
#include "KCanvasMatrix.h"
#include "KCanvasTreeDebug.h"
#include "KRenderingDevice.h"
#include "RenderPath.h"
#include "SVGStyledElementImpl.h"
#include <kcanvas/KCanvas.h>
#include <qtextstream.h>
#include "KCanvasTreeDebug.h"
#include "DocumentImpl.h"
namespace WebCore {
......@@ -242,7 +240,7 @@ void KCanvasMarker::draw(const FloatRect &rect, double x, double y, double strok
// FIXME: PaintInfo should be passed into this method instead.
// FIXME: bounding box fractions lost
QPainter p;
GraphicsContext p;
RenderObject::PaintInfo info(&p, enclosingIntRect(rect), PaintActionForeground, 0);
m_marker->setLocalTransform(rotation.multiply(translation).qmatrix());
static_cast<KCanvasContainer *>(m_marker)->setDrawsContents(true);
......
......@@ -308,7 +308,7 @@ static QTextStream &operator<<(QTextStream &ts, const RenderPath &o)
writeStyle(ts, o);
ts << " [data=\"" << QPainter::renderingDevice()->stringForPath(o.path()) << "\"]";
ts << " [data=\"" << renderingDevice()->stringForPath(o.path()) << "\"]";