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

Unified Diff: sky/engine/core/editing/ApplyBlockElementCommand.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/AppendNodeCommand.cpp ('k') | sky/engine/core/editing/CompositeEditCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/ApplyBlockElementCommand.cpp
diff --git a/sky/engine/core/editing/ApplyBlockElementCommand.cpp b/sky/engine/core/editing/ApplyBlockElementCommand.cpp
index af2b3c63dfa96783dc88a74a067cc7f571cee09c..87f8730af02fcbccc8a204bc7957e33b9272d019 100644
--- a/sky/engine/core/editing/ApplyBlockElementCommand.cpp
+++ b/sky/engine/core/editing/ApplyBlockElementCommand.cpp
@@ -28,7 +28,7 @@
#include "sky/engine/core/editing/ApplyBlockElementCommand.h"
#include "gen/sky/core/HTMLNames.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/dom/NodeRenderStyle.h"
#include "sky/engine/core/dom/Text.h"
#include "sky/engine/core/editing/VisiblePosition.h"
@@ -116,7 +116,7 @@ static bool isNewLineAtPosition(const Position& position)
TrackExceptionState exceptionState;
String textAtPosition = toText(textNode)->substringData(offset, 1, exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return false;
return textAtPosition[0] == '\n';
« no previous file with comments | « sky/engine/core/editing/AppendNodeCommand.cpp ('k') | sky/engine/core/editing/CompositeEditCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698