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

Unified Diff: sky/engine/core/editing/htmlediting.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/VisibleUnits.cpp ('k') | sky/engine/core/events/CompositionEvent.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/editing/htmlediting.cpp
diff --git a/sky/engine/core/editing/htmlediting.cpp b/sky/engine/core/editing/htmlediting.cpp
index dfe55fca14eda7a34b65f7028e870d0597b3809e..b8478123055b823ba20b4591c342c797f18aa625 100644
--- a/sky/engine/core/editing/htmlediting.cpp
+++ b/sky/engine/core/editing/htmlediting.cpp
@@ -27,8 +27,8 @@
#include "sky/engine/core/editing/htmlediting.h"
#include "gen/sky/core/HTMLElementFactory.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/ElementTraversal.h"
#include "sky/engine/core/dom/NodeTraversal.h"
@@ -504,7 +504,7 @@ PassRefPtr<Range> createRange(Document& document, const VisiblePosition& start,
{
RefPtr<Range> selectedRange = Range::create(document);
selectedRange->setStart(start.deepEquivalent().containerNode(), start.deepEquivalent().computeOffsetInContainerNode(), exceptionState);
- if (!exceptionState.hadException())
+ if (!exceptionState.had_exception())
selectedRange->setEnd(end.deepEquivalent().containerNode(), end.deepEquivalent().computeOffsetInContainerNode(), exceptionState);
return selectedRange.release();
}
« no previous file with comments | « sky/engine/core/editing/VisibleUnits.cpp ('k') | sky/engine/core/events/CompositionEvent.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698