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

Unified Diff: sky/engine/core/editing/VisibleUnits.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/VisibleSelection.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/VisibleUnits.cpp
diff --git a/sky/engine/core/editing/VisibleUnits.cpp b/sky/engine/core/editing/VisibleUnits.cpp
index aa6bf6a51613cfa2beb21cebe187ed994251015f..a83f9d1e7113c23bbcb89a71f2bd20bfdc2d0311 100644
--- a/sky/engine/core/editing/VisibleUnits.cpp
+++ b/sky/engine/core/editing/VisibleUnits.cpp
@@ -27,8 +27,8 @@
#include "sky/engine/core/editing/VisibleUnits.h"
#include "gen/sky/platform/RuntimeEnabledFeatures.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/Document.h"
#include "sky/engine/core/dom/Element.h"
#include "sky/engine/core/dom/NodeTraversal.h"
@@ -479,8 +479,8 @@ static VisiblePosition previousBoundary(const VisiblePosition& c, BoundarySearch
searchRange->setStart(start.deprecatedNode(), start.deprecatedEditingOffset(), exceptionState);
searchRange->setEnd(end.deprecatedNode(), end.deprecatedEditingOffset(), exceptionState);
- ASSERT(!exceptionState.hadException());
- if (exceptionState.hadException())
+ ASSERT(!exceptionState.had_exception());
+ if (exceptionState.had_exception())
return VisiblePosition();
SimplifiedBackwardsTextIterator it(searchRange.get());
« no previous file with comments | « sky/engine/core/editing/VisibleSelection.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698