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

Unified Diff: sky/engine/core/editing/SplitElementCommand.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/core/editing/Selection.idl ('k') | sky/engine/core/editing/SplitTextNodeCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/SplitElementCommand.cpp
diff --git a/sky/engine/core/editing/SplitElementCommand.cpp b/sky/engine/core/editing/SplitElementCommand.cpp
index c4adc76639fc2bcb99b70c19377bedde99831806..59a030267e39941171989fd072de406330322f76 100644
--- a/sky/engine/core/editing/SplitElementCommand.cpp
+++ b/sky/engine/core/editing/SplitElementCommand.cpp
@@ -27,8 +27,8 @@
#include "sky/engine/core/editing/SplitElementCommand.h"
#include "gen/sky/core/HTMLNames.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
-#include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h"
+#include "sky/engine/bindings2/exception_state.h"
+#include "sky/engine/bindings2/exception_state_placeholder.h"
#include "sky/engine/core/dom/Element.h"
#include "sky/engine/wtf/Assertions.h"
@@ -59,7 +59,7 @@ void SplitElementCommand::executeApply()
if (!parent || !parent->hasEditableStyle())
return;
parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return;
// Delete id attribute from the second element because the same id cannot be used for more than one element
« no previous file with comments | « sky/engine/core/editing/Selection.idl ('k') | sky/engine/core/editing/SplitTextNodeCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698