Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1126)

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 882223005: Remove painting roots. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/rendering/InlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 3cff4bb1516f7bac32bb5d8349419160dd63cabb..eaadad00f656faabf0be3c86d8ada33e65ae0e92 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -667,8 +667,6 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
bool fillWithRed;
if (isTransparent())
fillWithRed = false; // Transparent, don't fill with red.
- else if (m_nodeToDraw)
- fillWithRed = false; // Element images are transparent, don't fill with red.
else
fillWithRed = true;
@@ -696,8 +694,6 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
ASSERT(!m_isPainting);
m_isPainting = true;
- // m_nodeToDraw is used to draw only one element (and its descendants)
- RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
RenderLayer* rootLayer = renderView->layer();
#if ENABLE(ASSERT)
@@ -705,7 +701,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
#endif
- rootLayer->paint(p, rect, renderer);
+ rootLayer->paint(p, rect);
m_isPainting = false;
m_lastPaintTime = currentTime();
@@ -723,11 +719,6 @@ bool FrameView::isPainting() const
return m_isPainting;
}
-void FrameView::setNodeToDraw(Node* node)
-{
- m_nodeToDraw = node;
-}
-
void FrameView::updateLayoutAndStyleForPainting()
{
// Updating layout can run script, which can tear down the FrameView.
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698