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

Unified Diff: sky/engine/core/frame/LocalFrame.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/frame/LocalDOMWindow.cpp ('k') | sky/engine/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/LocalFrame.h
diff --git a/sky/engine/core/frame/LocalFrame.h b/sky/engine/core/frame/LocalFrame.h
index eeab185de10f38235eb43b05c2e6505bae06391d..99c6873a00069e7edf053488014195ac9570456c 100644
--- a/sky/engine/core/frame/LocalFrame.h
+++ b/sky/engine/core/frame/LocalFrame.h
@@ -37,6 +37,7 @@
namespace blink {
class Color;
+ class DartController;
class Document;
class Editor;
class Element;
@@ -56,7 +57,6 @@ namespace blink {
class Node;
class Range;
class RenderView;
- class ScriptController;
class SpellChecker;
class TreeScope;
class TreeScope;
@@ -92,7 +92,7 @@ namespace blink {
FrameSelection& selection() const;
InputMethodController& inputMethodController() const;
FetchContext& fetchContext() const;
- ScriptController& script();
+ DartController& dart();
SpellChecker& spellChecker() const;
FrameConsole& console() const;
@@ -126,7 +126,7 @@ namespace blink {
RefPtr<FrameView> m_view;
- OwnPtr<ScriptController> m_script;
+ OwnPtr<DartController> m_dart;
const OwnPtr<Editor> m_editor;
const OwnPtr<SpellChecker> m_spellChecker;
const OwnPtr<FrameSelection> m_selection;
@@ -141,9 +141,9 @@ namespace blink {
return m_view.get();
}
- inline ScriptController& LocalFrame::script()
+ inline DartController& LocalFrame::dart()
{
- return *m_script;
+ return *m_dart;
}
inline FrameSelection& LocalFrame::selection() const
« no previous file with comments | « sky/engine/core/frame/LocalDOMWindow.cpp ('k') | sky/engine/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698