diff options
| -rw-r--r-- | WebCore/bindings/v8/ScriptController.cpp | 1 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.h | 2 | ||||
| -rw-r--r-- | WebCore/dom/Element.h | 1 | ||||
| -rw-r--r-- | WebCore/page/DOMWindow.idl | 4 | ||||
| -rw-r--r-- | WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp index 6ba70d6..aa38ba0 100644 --- a/WebCore/bindings/v8/ScriptController.cpp +++ b/WebCore/bindings/v8/ScriptController.cpp @@ -32,7 +32,6 @@ #include "config.h" #include "ScriptController.h" - #include "PlatformBridge.h" #include "CString.h" #include "Document.h" diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h index 2761100..b00915e 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.h +++ b/WebCore/bindings/v8/V8DOMWrapper.h @@ -241,7 +241,6 @@ namespace WebCore { static PassRefPtr<EventListener> getEventListener(V8Proxy* proxy, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup); - #if ENABLE(XPATH) // XPath-related utilities static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy = 0) @@ -254,7 +253,6 @@ namespace WebCore { return resolver; } #endif - // DOMImplementation is a singleton and it is handled in a special // way. A wrapper is generated per document and stored in an // internal field of the document. diff --git a/WebCore/dom/Element.h b/WebCore/dom/Element.h index ce25d70..bc9a7d7 100644 --- a/WebCore/dom/Element.h +++ b/WebCore/dom/Element.h @@ -94,6 +94,7 @@ public: DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend); DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel); #endif + const AtomicString& getIDAttribute() const; bool hasAttribute(const QualifiedName&) const; const AtomicString& getAttribute(const QualifiedName&) const; diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index cfc9401..71d7ca4 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -290,12 +290,12 @@ module window { #if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS attribute EventListener onorientationchange; #endif -#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS + #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS attribute [DontEnum] EventListener ontouchstart; attribute [DontEnum] EventListener ontouchmove; attribute [DontEnum] EventListener ontouchend; attribute [DontEnum] EventListener ontouchcancel; -#endif + #endif // EventTarget interface [Custom] void addEventListener(in DOMString type, diff --git a/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp b/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp index 134e206..3ade2ed 100644 --- a/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp +++ b/WebCore/platform/network/android/NetworkStateNotifierAndroid.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008, The Android Open Source Project + * Copyright 2009, The Android Open Source Project * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |