Title: [154688] trunk/Source/WebCore
- Revision
- 154688
- Author
- [email protected]
- Date
- 2013-08-27 08:26:10 -0700 (Tue, 27 Aug 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154687 => 154688)
--- trunk/Source/WebCore/ChangeLog 2013-08-27 15:20:12 UTC (rev 154687)
+++ trunk/Source/WebCore/ChangeLog 2013-08-27 15:26:10 UTC (rev 154688)
@@ -1,5 +1,21 @@
2013-08-27 Andreas Kling <[email protected]>
+ 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 <[email protected]>
+
RenderView::flowThreadController() should return a reference.
<https://webkit.org/b/120363>
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (154687 => 154688)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-08-27 15:20:12 UTC (rev 154687)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-08-27 15:26:10 UTC (rev 154688)
@@ -592,7 +592,7 @@
if (isPrinting) {
if (styleToUse->printColorAdjust() == PrintColorAdjustEconomy)
forceBackgroundToWhite = true;
- if (textRenderer()->document().settings() && textRenderer()->document().settings()->shouldPrintBackgrounds())
+ if (textRenderer()->frame().settings().shouldPrintBackgrounds())
forceBackgroundToWhite = false;
}
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (154687 => 154688)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2013-08-27 15:20:12 UTC (rev 154687)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2013-08-27 15:26:10 UTC (rev 154688)
@@ -786,7 +786,7 @@
if (document().printing()) {
if (style()->printColorAdjust() == PrintColorAdjustEconomy)
forceBackgroundToWhite = true;
- if (document().settings() && document().settings()->shouldPrintBackgrounds())
+ if (frame().settings().shouldPrintBackgrounds())
forceBackgroundToWhite = false;
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (154687 => 154688)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2013-08-27 15:20:12 UTC (rev 154687)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2013-08-27 15:26:10 UTC (rev 154688)
@@ -232,7 +232,7 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
