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

Unified Diff: sky/engine/core/dom/Document.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/dom/DOMURL.cpp ('k') | sky/engine/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Document.h
diff --git a/sky/engine/core/dom/Document.h b/sky/engine/core/dom/Document.h
index 41e5aede9c1979c5f5f44f98402ceeb06aee1704..fa8d72f5a83d49941dd1ea91264f3ba20ce7bf8d 100644
--- a/sky/engine/core/dom/Document.h
+++ b/sky/engine/core/dom/Document.h
@@ -28,8 +28,8 @@
#ifndef SKY_ENGINE_CORE_DOM_DOCUMENT_H_
#define SKY_ENGINE_CORE_DOM_DOCUMENT_H_
-#include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h"
-#include "sky/engine/bindings/core/v8/ScriptValue.h"
+#include "sky/engine/tonic/dart_value.h"
+#include "sky/engine/bindings2/exception_state_placeholder.h"
#include "sky/engine/core/animation/AnimationClock.h"
#include "sky/engine/core/animation/PendingAnimations.h"
#include "sky/engine/core/dom/ContainerNode.h"
@@ -57,6 +57,7 @@
#include "sky/engine/wtf/PassRefPtr.h"
#include "sky/engine/wtf/WeakPtr.h"
#include "sky/engine/wtf/text/TextEncoding.h"
+#include "sky/engine/wtf/text/TextPosition.h"
namespace blink {
@@ -109,7 +110,6 @@ class ScriptRunner;
class ScriptedAnimationController;
class SegmentedString;
class SelectorQueryCache;
-class SerializedScriptValue;
class Settings;
class StyleEngine;
class StyleResolver;
@@ -453,8 +453,7 @@ public:
IntSize initialViewportSize() const;
- ScriptValue registerElement(ScriptState*, const AtomicString& name, ExceptionState&);
- ScriptValue registerElement(ScriptState*, const AtomicString& name, const Dictionary& options, ExceptionState&);
+ PassRefPtr<DartValue> registerElement(DartState*, const AtomicString& name, ExceptionState&);
CustomElementRegistrationContext& registrationContext() { return *m_registrationContext; }
CustomElementMicrotaskRunQueue* customElementMicrotaskRunQueue();
@@ -511,8 +510,6 @@ public:
void didRecalculateStyleForElement() { ++m_styleRecalcElementCounter; }
- virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
-
protected:
explicit Document(const DocumentInit&);
« no previous file with comments | « sky/engine/core/dom/DOMURL.cpp ('k') | sky/engine/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698