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

Unified Diff: sky/engine/core/dom/Text.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/dom/StaticNodeList.h ('k') | sky/engine/core/dom/URL.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Text.cpp
diff --git a/sky/engine/core/dom/Text.cpp b/sky/engine/core/dom/Text.cpp
index 253fd01fa57925c9a1d7e8ba6f4ca0d1e3982e0e..096ea498989882db3df03f9a706c9a0765f02a26 100644
--- a/sky/engine/core/dom/Text.cpp
+++ b/sky/engine/core/dom/Text.cpp
@@ -22,8 +22,8 @@
#include "sky/engine/config.h"
#include "sky/engine/core/dom/Text.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/css/resolver/StyleResolver.h"
#include "sky/engine/core/dom/ExceptionCode.h"
#include "sky/engine/core/dom/NodeRenderStyle.h"
@@ -53,7 +53,7 @@ PassRefPtr<Text> Text::splitText(unsigned offset, ExceptionState& exceptionState
// IndexSizeError: Raised if the specified offset is negative or greater than
// the number of 16-bit units in data.
if (offset > length()) {
- exceptionState.throwDOMException(IndexSizeError, "The offset " + String::number(offset) + " is larger than the Text node's length.");
+ exceptionState.ThrowDOMException(IndexSizeError, "The offset " + String::number(offset) + " is larger than the Text node's length.");
return nullptr;
}
@@ -66,7 +66,7 @@ PassRefPtr<Text> Text::splitText(unsigned offset, ExceptionState& exceptionState
if (parentNode())
parentNode()->insertBefore(newText.get(), nextSibling(), exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return nullptr;
if (renderer())
« no previous file with comments | « sky/engine/core/dom/StaticNodeList.h ('k') | sky/engine/core/dom/URL.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698