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

Unified Diff: sky/engine/web/WebElement.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/WebDocument.cpp ('k') | sky/engine/web/WebLeakDetector.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/web/WebElement.cpp
diff --git a/sky/engine/web/WebElement.cpp b/sky/engine/web/WebElement.cpp
index 78273334611d304d3d1cad8600996730cc90f030..4aa25ae1483979347fc5f939c0d86d512fb613aa 100644
--- a/sky/engine/web/WebElement.cpp
+++ b/sky/engine/web/WebElement.cpp
@@ -31,7 +31,7 @@
#include "sky/engine/config.h"
#include "sky/engine/public/web/WebElement.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/dom/Element.h"
#include "sky/engine/core/dom/custom/CustomElementProcessingStack.h"
#include "sky/engine/core/dom/shadow/ShadowRoot.h"
@@ -73,7 +73,7 @@ bool WebElement::setAttribute(const WebString& attrName, const WebString& attrVa
CustomElementProcessingStack::CallbackDeliveryScope deliverCustomElementCallbacks;
TrackExceptionState exceptionState;
unwrap<Element>()->setAttribute(attrName, attrValue, exceptionState);
- return !exceptionState.hadException();
+ return !exceptionState.had_exception();
}
unsigned WebElement::attributeCount() const
« no previous file with comments | « sky/engine/web/WebDocument.cpp ('k') | sky/engine/web/WebLeakDetector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698