sky/engine/core/painting/LayoutRoot.cpp - Issue 1190123003: Decouple Canvas from DisplayList and map Picture and PictureRecorder more directly to their Skia co…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/core/painting/LayoutRoot.cpp

Issue 1190123003: Decouple Canvas from DisplayList and map Picture and PictureRecorder more directly to their Skia co… (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Rebased version of previous patch Created 5 years, 6 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: sky/engine/core/painting/LayoutRoot.cpp

diff --git a/sky/engine/core/painting/LayoutRoot.cpp b/sky/engine/core/painting/LayoutRoot.cpp

index c63acaa76d9e6278bcacc742cda8ad4a5d16d219..78c3ee6c7757409615c6ed29e44bb851c9400885 100644

--- a/sky/engine/core/painting/LayoutRoot.cpp

+++ b/sky/engine/core/painting/LayoutRoot.cpp

@@ -10,6 +10,7 @@

#include "sky/engine/core/frame/FrameView.h"

#include "sky/engine/core/frame/LocalFrame.h"

#include "sky/engine/core/frame/Settings.h"

+#include "sky/engine/core/painting/Canvas.h"

#include "sky/engine/core/painting/PaintingTasks.h"

#include "sky/engine/platform/geometry/IntRect.h"

#include "third_party/skia/include/core/SkCanvas.h"

@@ -83,7 +84,7 @@ void LayoutRoot::layout()

void LayoutRoot::paint(Canvas* canvas)

{

- if (m_document)

+ if (m_document && canvas && canvas->skCanvas())

rootElement()->paint(canvas);

}

« no previous file with comments | « sky/engine/core/painting/Canvas.idl ('k') | sky/engine/core/painting/PaintingCallback.idl » ('j') | sky/engine/core/painting/PictureRecorder.h » ('J')