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

Unified Diff: sky/engine/web/WebDocument.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/web/Sky.cpp ('k') | sky/engine/web/WebElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebDocument.cpp
diff --git a/sky/engine/web/WebDocument.cpp b/sky/engine/web/WebDocument.cpp
index 1580c0517dc95dee1baefed391d1f7879e479984..849b68ddf3b3409dbe7881a5a76c80df66475174 100644
--- a/sky/engine/web/WebDocument.cpp
+++ b/sky/engine/web/WebDocument.cpp
@@ -31,10 +31,7 @@
#include "sky/engine/config.h"
#include "sky/engine/public/web/WebDocument.h"
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
-#include "sky/engine/bindings/core/v8/ScriptState.h"
-#include "sky/engine/bindings/core/v8/ScriptValue.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/animation/AnimationTimeline.h"
#include "sky/engine/core/css/StyleSheetContents.h"
#include "sky/engine/core/dom/Document.h"
@@ -48,7 +45,6 @@
#include "sky/engine/public/web/WebElement.h"
#include "sky/engine/web/WebLocalFrameImpl.h"
#include "sky/engine/wtf/PassRefPtr.h"
-#include "v8/include/v8.h"
namespace blink {
@@ -116,7 +112,7 @@ WebElement WebDocument::createElement(const WebString& tagName)
{
TrackExceptionState exceptionState;
WebElement element(unwrap<Document>()->createElement(tagName, exceptionState));
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return WebElement();
return element;
}
« no previous file with comments | « sky/engine/web/Sky.cpp ('k') | sky/engine/web/WebElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698