Source/core/rendering/RenderView.cpp - Issue 589283002: Move painting code from RenderView to ViewPainter.

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 589283002: Move painting code from RenderView to ViewPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Merged. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/rendering/RenderView.cpp

diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp

index ff1f41082d9daf20e7ac2f30850cded9c70bb79e..78a7aeba62d70a66764d094a08df83377b3393e9 100644

--- a/Source/core/rendering/RenderView.cpp

+++ b/Source/core/rendering/RenderView.cpp

@@ -27,6 +27,7 @@

#include "core/html/HTMLFrameOwnerElement.h"

#include "core/html/HTMLIFrameElement.h"

#include "core/page/Page.h"

+#include "core/paint/ViewPainter.h"

#include "core/rendering/ColumnInfo.h"

#include "core/rendering/FlowThreadController.h"

#include "core/rendering/GraphicsContextAnnotator.h"

@@ -313,82 +314,12 @@ void RenderView::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout

void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)

{

- // If we ever require layout but receive a paint anyway, something has gone horribly wrong.

- ASSERT(!needsLayout());

- // RenderViews should never be called to paint with an offset not on device pixels.

- ASSERT(LayoutPoint(IntPoint(paintOffset.x(), paintOffset.y())) == paintOffset);

- ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);

- // This avoids painting garbage between columns if there is a column gap.

- if (m_frameView && style()->isOverflowPaged())

- paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundColor());

- paintObject(paintInfo, paintOffset);

-static inline bool rendererObscuresBackground(RenderBox* rootBox)

- ASSERT(rootBox);

- RenderStyle* style = rootBox->style();

- if (style->visibility() != VISIBLE

- || style->opacity() != 1

- || style->hasFilter()

- || style->hasTransform())

- return false;

- if (rootBox->compositingState() == PaintsIntoOwnBacking)

- return false;

- const RenderObject* rootRenderer = rootBox->rendererForRootBackground();

- if (rootRenderer->style()->backgroundClip() == TextFillBox)

- return false;

- return true;

-bool RenderView::rootFillsViewportBackground(RenderBox* rootBox) const

- ASSERT(rootBox);

- // CSS Boxes always fill the viewport background (see paintRootBoxFillLayers)

- if (!rootBox->isSVG())

- return true;

- return rootBox->frameRect().contains(frameRect());

+ ViewPainter(*this).paint(paintInfo, paintOffset);

}

void RenderView::paintBoxDecorationBackground(PaintInfo& paintInfo, const LayoutPoint&)

{

- if (document().ownerElement() || !view())

- return;

- if (paintInfo.skipRootBackground())

- return;

- bool shouldPaintBackground = true;

- Node* documentElement = document().documentElement();

- if (RenderBox* rootBox = documentElement ? toRenderBox(documentElement->renderer()) : 0)

- shouldPaintBackground = !rootFillsViewportBackground(rootBox) || !rendererObscuresBackground(rootBox);

- // If painting will entirely fill the view, no need to fill the background.

- if (!shouldPaintBackground)

- return;

- // This code typically only executes if the root element's visibility has been set to hidden,

- // if there is a transform on the <html>, or if there is a page scale factor less than 1.

- // Only fill with the base background color (typically white) if we're the root document,

- // since iframes/frames with no background in the child document should show the parent's background.

- if (!frameView()->isTransparent()) {

- Color baseColor = frameView()->baseBackgroundColor();

- if (baseColor.alpha()) {

- CompositeOperator previousOperator = paintInfo.context->compositeOperation();

- paintInfo.context->setCompositeOperation(CompositeCopy);

- paintInfo.context->fillRect(paintInfo.rect, baseColor);

- paintInfo.context->setCompositeOperation(previousOperator);

- } else {

- paintInfo.context->clearRect(paintInfo.rect);

- }

+ ViewPainter(*this).paintBoxDecorationBackground(paintInfo);

}

void RenderView::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)

« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | no next file » | no next file with comments »