Merge the Sky Engine changes from the SkyDart branch

sky/engine/web/WebElement.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 #include "sky/engine/core/rendering/RenderBoxModelObject.h"
 #include "sky/engine/core/rendering/RenderObject.h"
 #include "sky/engine/public/platform/WebRect.h"
 #include "sky/engine/public/web/WebDocument.h"
 #include "sky/engine/wtf/PassRefPtr.h"
 
 namespace blink {
@@ skipping 21 matching lines @@
     return constUnwrap<Element>()->getAttribute(attrName);
 }
 
 bool WebElement::setAttribute(const WebString& attrName, const WebString& attrValue)
 {
     // TODO: Custom element callbacks need to be called on WebKit API methods that
     // mutate the DOM in any way.
     CustomElementProcessingStack::CallbackDeliveryScope deliverCustomElementCallbacks;
     TrackExceptionState exceptionState;
     unwrap<Element>()->setAttribute(attrName, attrValue, exceptionState);
-    return !exceptionState.hadException();
+    return !exceptionState.had_exception();
 }
 
 unsigned WebElement::attributeCount() const
 {
     if (!constUnwrap<Element>()->hasAttributes())
         return 0;
     return constUnwrap<Element>()->attributes().size();
 }
 
 WebNode WebElement::shadowRoot() const
@@ skipping 37 matching lines @@
     m_private = elem;
     return *this;
 }
 
 WebElement::operator PassRefPtr<Element>() const
 {
     return toElement(m_private.get());
 }
 
 } // namespace blink