Commit 300a8929 authored by akling@apple.com's avatar akling@apple.com
Browse files

Simplify some more Settings access where we have a Frame in reach.

<https://webkit.org/b/120256>

Reviewed by Darin Adler.

RenderObjects can always find Settings through the Frame.

* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paint):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154688 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7b9e3522
2013-08-27 Andreas Kling <akling@apple.com>
Simplify some more Settings access where we have a Frame in reach.
<https://webkit.org/b/120256>
Reviewed by Darin Adler.
RenderObjects can always find Settings through the Frame.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paint):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource):
2013-08-27 Andreas Kling <akling@apple.com>
 
RenderView::flowThreadController() should return a reference.
......@@ -592,7 +592,7 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
if (isPrinting) {
if (styleToUse->printColorAdjust() == PrintColorAdjustEconomy)
forceBackgroundToWhite = true;
if (textRenderer()->document().settings() && textRenderer()->document().settings()->shouldPrintBackgrounds())
if (textRenderer()->frame().settings().shouldPrintBackgrounds())
forceBackgroundToWhite = false;
}
......
......@@ -786,7 +786,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
if (document().printing()) {
if (style()->printColorAdjust() == PrintColorAdjustEconomy)
forceBackgroundToWhite = true;
if (document().settings() && document().settings()->shouldPrintBackgrounds())
if (frame().settings().shouldPrintBackgrounds())
forceBackgroundToWhite = false;
}
......
......@@ -232,7 +232,7 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
effectiveTransform.multiply(filterData->shearFreeAbsoluteTransform);
OwnPtr<ImageBuffer> sourceGraphic;
RenderingMode renderingMode = object->document().page()->settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
RenderingMode renderingMode = object->frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
if (!SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, sourceGraphic, ColorSpaceLinearRGB, renderingMode)) {
ASSERT(!m_filter.contains(object));
filterData->savedContext = context;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment