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

Unified Diff: sky/engine/core/frame/LocalDOMWindow.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/ImageBitmap.h ('k') | sky/engine/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/LocalDOMWindow.h
diff --git a/sky/engine/core/frame/LocalDOMWindow.h b/sky/engine/core/frame/LocalDOMWindow.h
index 47b71c5f4cf94fdb4193a09d3f4972bec56ca87a..bc13a4f4300f325511c9b8334f481d9a4954628a 100644
--- a/sky/engine/core/frame/LocalDOMWindow.h
+++ b/sky/engine/core/frame/LocalDOMWindow.h
@@ -27,8 +27,6 @@
#ifndef SKY_ENGINE_CORE_FRAME_LOCALDOMWINDOW_H_
#define SKY_ENGINE_CORE_FRAME_LOCALDOMWINDOW_H_
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/bindings/core/v8/SerializedScriptValue.h"
#include "sky/engine/core/events/EventTarget.h"
#include "sky/engine/core/frame/DOMWindowBase64.h"
#include "sky/engine/core/frame/FrameDestructionObserver.h"
@@ -42,7 +40,6 @@ namespace blink {
class Application;
class CSSStyleDeclaration;
-class Console;
class DOMSelection;
class DOMURL;
class DOMWindowCSS;
@@ -69,7 +66,6 @@ class RequestAnimationFrameCallback;
class ScheduledAction;
class Screen;
class ScriptCallStack;
-class SerializedScriptValue;
class StyleMedia;
enum PageshowEventPersistence {
@@ -112,12 +108,11 @@ public:
Screen& screen() const;
Location& location() const;
- void setLocation(const String& location, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow,
- SetLocationLocking = LockHistoryBasedOnGestureState);
+ void setLocation(const String& location, SetLocationLocking = LockHistoryBasedOnGestureState);
DOMSelection* getSelection();
- void focus(ExecutionContext* = 0);
+ void focus();
int outerHeight() const;
int outerWidth() const;
@@ -147,7 +142,6 @@ public:
double devicePixelRatio() const;
- Console& console() const;
FrameConsole* frameConsole() const;
void printErrorMessage(const String&);
@@ -236,7 +230,6 @@ private:
HashSet<DOMWindowProperty*> m_properties;
mutable RefPtr<Screen> m_screen;
- mutable RefPtr<Console> m_console;
mutable RefPtr<Location> m_location;
mutable RefPtr<DOMWindowCSS> m_css;
« no previous file with comments | « sky/engine/core/frame/ImageBitmap.h ('k') | sky/engine/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698