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

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

Issue 892033003: Consolidate and delete a bunch of paint methods. (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 5ca79c550315227840812d518fbc347557c18930..7798affa2997c99efe6de51ac016c4fb159dd0b3 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -648,11 +648,6 @@ Color FrameView::documentBackgroundColor() const
void FrameView::paint(GraphicsContext* context, const IntRect& rect)
{
- paintContents(context, rect);
-}
-
-void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
-{
#ifndef NDEBUG
bool fillWithRed;
if (isTransparent())
@@ -661,7 +656,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
fillWithRed = true;
if (fillWithRed)
- p->fillRect(rect, Color(0xFF, 0, 0));
+ context->fillRect(rect, Color(0xFF, 0, 0));
#endif
RenderView* renderView = this->renderView();
@@ -688,7 +683,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
#endif
- rootLayer->paint(p, rect);
+ rootLayer->paint(context, rect);
m_isPainting = false;
m_lastPaintTime = currentTime();
« 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