sky/engine/core/frame/Screen.h - Issue 922893002: Merge the Sky Engine changes from the SkyDart branch

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/frame/Screen.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: sky/engine/core/frame/Screen.h

diff --git a/sky/engine/core/frame/Screen.h b/sky/engine/core/frame/Screen.h

index 87f98c5dd85ae6140f6018f019194c99ac937508..c74b33c973299d1a91c82aef61d23d1c504c02e3 100644

--- a/sky/engine/core/frame/Screen.h

+++ b/sky/engine/core/frame/Screen.h

@@ -30,7 +30,7 @@

#ifndef SKY_ENGINE_CORE_FRAME_SCREEN_H_

#define SKY_ENGINE_CORE_FRAME_SCREEN_H_

-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"

+#include "sky/engine/tonic/dart_wrappable.h"

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

#include "sky/engine/platform/Supplementable.h"

#include "sky/engine/platform/heap/Handle.h"

@@ -41,7 +41,7 @@ namespace blink {

class LocalFrame;

-class Screen final : public RefCounted<Screen>, public ScriptWrappable, public DOMWindowProperty, public Supplementable<Screen> {

+class Screen final : public RefCounted<Screen>, public DartWrappable, public DOMWindowProperty, public Supplementable<Screen> {

DEFINE_WRAPPERTYPEINFO();

public:

static PassRefPtr<Screen> create(LocalFrame* frame)

« no previous file with comments | « sky/engine/core/frame/Location.idl ('k') | sky/engine/core/frame/Settings.h » ('j') | no next file with comments »