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

Unified Diff: sky/engine/core/editing/VisiblePosition.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/TextIterator.cpp ('k') | sky/engine/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/VisiblePosition.cpp
diff --git a/sky/engine/core/editing/VisiblePosition.cpp b/sky/engine/core/editing/VisiblePosition.cpp
index 6cd49f60ae91208a9268abe0735c41b6f38278db..542cdbffd1c8118eae6e26e3d7c87bfd2b2dd0d4 100644
--- a/sky/engine/core/editing/VisiblePosition.cpp
+++ b/sky/engine/core/editing/VisiblePosition.cpp
@@ -27,7 +27,7 @@
#include "sky/engine/config.h"
#include "sky/engine/core/editing/VisiblePosition.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/Range.h"
#include "sky/engine/core/dom/Text.h"
@@ -722,7 +722,7 @@ bool setStart(Range *r, const VisiblePosition &visiblePosition)
Position p = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
TrackExceptionState exceptionState;
r->setStart(p.containerNode(), p.offsetInContainerNode(), exceptionState);
- return !exceptionState.hadException();
+ return !exceptionState.had_exception();
}
bool setEnd(Range *r, const VisiblePosition &visiblePosition)
@@ -732,7 +732,7 @@ bool setEnd(Range *r, const VisiblePosition &visiblePosition)
Position p = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
TrackExceptionState exceptionState;
r->setEnd(p.containerNode(), p.offsetInContainerNode(), exceptionState);
- return !exceptionState.hadException();
+ return !exceptionState.had_exception();
}
Element* enclosingBlockFlowElement(const VisiblePosition& visiblePosition)
« no previous file with comments | « sky/engine/core/editing/TextIterator.cpp ('k') | sky/engine/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698