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

Unified Diff: sky/engine/web/WebNode.cpp

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/web/WebLocalFrameImpl.cpp ('k') | sky/engine/web/WebRange.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebNode.cpp
diff --git a/sky/engine/web/WebNode.cpp b/sky/engine/web/WebNode.cpp
index b0ea91b4c021483e964455e38a20e11100778337..7ec8a7b6ae2fe69289386cf6da28c2e945bf2363 100644
--- a/sky/engine/web/WebNode.cpp
+++ b/sky/engine/web/WebNode.cpp
@@ -31,7 +31,7 @@
#include "sky/engine/config.h"
#include "sky/engine/public/web/WebNode.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/dom/Document.h"
#include "sky/engine/core/dom/Element.h"
#include "sky/engine/core/dom/Node.h"
@@ -166,7 +166,7 @@ bool WebNode::remove()
{
TrackExceptionState exceptionState;
m_private->remove(exceptionState);
- return !exceptionState.hadException();
+ return !exceptionState.had_exception();
}
bool WebNode::containsIncludingShadowDOM(const WebNode& other) const
« no previous file with comments | « sky/engine/web/WebLocalFrameImpl.cpp ('k') | sky/engine/web/WebRange.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698