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

Unified Diff: sky/engine/core/editing/DeleteFromTextNodeCommand.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/DOMSelection.cpp ('k') | sky/engine/core/editing/EditingStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/DeleteFromTextNodeCommand.cpp
diff --git a/sky/engine/core/editing/DeleteFromTextNodeCommand.cpp b/sky/engine/core/editing/DeleteFromTextNodeCommand.cpp
index 1fd2cf67948c4a8ee2dc533d1b5d6c54d2c41ea4..fae9db614e951814ba3db0cfbbace81af1a44e5a 100644
--- a/sky/engine/core/editing/DeleteFromTextNodeCommand.cpp
+++ b/sky/engine/core/editing/DeleteFromTextNodeCommand.cpp
@@ -26,8 +26,8 @@
#include "sky/engine/config.h"
#include "sky/engine/core/editing/DeleteFromTextNodeCommand.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/Text.h"
namespace blink {
@@ -52,7 +52,7 @@ void DeleteFromTextNodeCommand::doApply()
TrackExceptionState exceptionState;
m_text = m_node->substringData(m_offset, m_count, exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return;
m_node->deleteData(m_offset, m_count, exceptionState, CharacterData::DeprecatedRecalcStyleImmediatlelyForEditing);
« no previous file with comments | « sky/engine/core/editing/DOMSelection.cpp ('k') | sky/engine/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698