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

Unified Diff: sky/engine/core/dom/Node.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/MutationRecord.h ('k') | sky/engine/core/dom/Node.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Node.h
diff --git a/sky/engine/core/dom/Node.h b/sky/engine/core/dom/Node.h
index 541ad645cf87c89f6db8e9e6f19e13ed370c0702..d233047d250527d6e797fa63d5da3cde388a12bb 100644
--- a/sky/engine/core/dom/Node.h
+++ b/sky/engine/core/dom/Node.h
@@ -25,7 +25,7 @@
#ifndef SKY_ENGINE_CORE_DOM_NODE_H_
#define SKY_ENGINE_CORE_DOM_NODE_H_
-#include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h"
+#include "sky/engine/bindings2/exception_state_placeholder.h"
#include "sky/engine/core/dom/MutationObserver.h"
#include "sky/engine/core/dom/TreeScope.h"
#include "sky/engine/core/dom/TreeShared.h"
@@ -441,6 +441,7 @@ public:
unsigned short compareDocumentPosition(const Node*, ShadowTreesTreatment = TreatShadowTreesAsDisconnected) const;
virtual Node* toNode() override final;
+ void AcceptDartGCVisitor(DartGCVisitor& visitor) const override;
virtual const AtomicString& interfaceName() const override;
virtual ExecutionContext* executionContext() const override final;
@@ -479,8 +480,6 @@ public:
unsigned lengthOfContents() const;
- virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
-
private:
enum NodeFlags {
HasRareDataFlag = 1,
« no previous file with comments | « sky/engine/core/dom/MutationRecord.h ('k') | sky/engine/core/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698