[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jcivelli at chromium.org
jcivelli at chromium.org
Wed Dec 22 12:23:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 151ee54f69f3f2e40d0c481d5a31660df4d66d19
Author: jcivelli at chromium.org <jcivelli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 20 18:12:01 2010 +0000
2010-08-20 Jay Civelli <jcivelli at chromium.org>
Reviewed by Darin Fisher.
Removing the deprecated class WebEvent and friends.
https://bugs.webkit.org/show_bug.cgi?id=44296
* WebKit.gyp:
* public/WebEvent.h: Removed.
* public/WebEventListener.h: Removed.
* public/WebMutationEvent.h: Removed.
* public/WebNode.h:
* src/EventListenerWrapper.cpp:
(WebKit::EventListenerWrapper::webDOMEventListenerDeleted):
* src/EventListenerWrapper.h:
* src/WebEvent.cpp: Removed.
* src/WebEventListener.cpp: Removed.
* src/WebEventListenerPrivate.cpp: Removed.
* src/WebEventListenerPrivate.h: Removed.
* src/WebNode.cpp:
(WebKit::WebNode::removeEventListener):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 15f8c70..14c013b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,25 @@
+2010-08-20 Jay Civelli <jcivelli at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Removing the deprecated class WebEvent and friends.
+ https://bugs.webkit.org/show_bug.cgi?id=44296
+
+ * WebKit.gyp:
+ * public/WebEvent.h: Removed.
+ * public/WebEventListener.h: Removed.
+ * public/WebMutationEvent.h: Removed.
+ * public/WebNode.h:
+ * src/EventListenerWrapper.cpp:
+ (WebKit::EventListenerWrapper::webDOMEventListenerDeleted):
+ * src/EventListenerWrapper.h:
+ * src/WebEvent.cpp: Removed.
+ * src/WebEventListener.cpp: Removed.
+ * src/WebEventListenerPrivate.cpp: Removed.
+ * src/WebEventListenerPrivate.h: Removed.
+ * src/WebNode.cpp:
+ (WebKit::WebNode::removeEventListener):
+
2010-08-19 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 65c2eaf..99cdee7 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -159,8 +159,6 @@
'public/WebDragData.h',
'public/WebEditingAction.h',
'public/WebElement.h',
- 'public/WebEvent.h',
- 'public/WebEventListener.h',
'public/WebFileChooserCompletion.h',
'public/WebFileChooserParams.h',
'public/WebFileError.h',
@@ -215,7 +213,6 @@
'public/WebMessagePortChannel.h',
'public/WebMessagePortChannelClient.h',
'public/WebMimeRegistry.h',
- 'public/WebMutationEvent.h',
'public/WebNamedNodeMap.h',
'public/WebNavigationType.h',
'public/WebNode.h',
@@ -427,10 +424,6 @@
'src/WebElement.cpp',
'src/WebEntities.cpp',
'src/WebEntities.h',
- 'src/WebEvent.cpp',
- 'src/WebEventListener.cpp',
- 'src/WebEventListenerPrivate.cpp',
- 'src/WebEventListenerPrivate.h',
'src/WebFileChooserCompletionImpl.cpp',
'src/WebFileChooserCompletionImpl.h',
'src/WebFontCache.cpp',
@@ -482,7 +475,6 @@
'src/WebMediaElement.cpp',
'src/WebMediaPlayerClientImpl.cpp',
'src/WebMediaPlayerClientImpl.h',
- 'src/WebMutationEvent.cpp',
'src/WebNamedNodeMap.cpp',
'src/WebNode.cpp',
'src/WebNodeCollection.cpp',
diff --git a/WebKit/chromium/public/WebEvent.h b/WebKit/chromium/public/WebEvent.h
deleted file mode 100644
index b0964d1..0000000
--- a/WebKit/chromium/public/WebEvent.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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.
- */
-
-#ifndef WebEvent_h
-#define WebEvent_h
-
-#include "WebCommon.h"
-#include "WebNode.h"
-#include "WebString.h"
-
-namespace WebCore { class Event; }
-#if WEBKIT_IMPLEMENTATION
-namespace WTF { template <typename T> class PassRefPtr; }
-#endif
-
-namespace WebKit {
-
-class WebEvent {
-public:
- enum PhaseType {
- CapturingPhase = 1,
- AtTarget = 2,
- BubblingPhase = 3
- };
-
- WebEvent() : m_private(0) { }
- WebEvent(const WebEvent& e) : m_private(0) { assign(e); }
- WebEvent& operator=(const WebEvent& e)
- {
- assign(e);
- return *this;
- }
-
- WEBKIT_API void reset();
- WEBKIT_API void assign(const WebEvent&);
-
- bool isNull() const { return !m_private; }
-
- WEBKIT_API WebString type() const;
- WEBKIT_API WebNode target() const;
- WEBKIT_API WebNode currentTarget() const;
-
- WEBKIT_API PhaseType eventPhase() const;
- WEBKIT_API bool bubbles() const;
- WEBKIT_API bool cancelable() const;
-
- WEBKIT_API bool isUIEvent() const;
- WEBKIT_API bool isMouseEvent() const;
- WEBKIT_API bool isMutationEvent() const;
- WEBKIT_API bool isKeyboardEvent() const;
- WEBKIT_API bool isTextEvent() const;
- WEBKIT_API bool isCompositionEvent() const;
- WEBKIT_API bool isDragEvent() const;
- WEBKIT_API bool isClipboardEvent() const;
- WEBKIT_API bool isMessageEvent() const;
- WEBKIT_API bool isWheelEvent() const;
- WEBKIT_API bool isBeforeTextInsertedEvent() const;
- WEBKIT_API bool isOverflowEvent() const;
- WEBKIT_API bool isPageTransitionEvent() const;
- WEBKIT_API bool isPopStateEvent() const;
- WEBKIT_API bool isProgressEvent() const;
- WEBKIT_API bool isXMLHttpRequestProgressEvent() const;
- WEBKIT_API bool isWebKitAnimationEvent() const;
- WEBKIT_API bool isWebKitTransitionEvent() const;
- WEBKIT_API bool isBeforeLoadEvent() const;
-
-#if WEBKIT_IMPLEMENTATION
- WebEvent(const WTF::PassRefPtr<WebCore::Event>&);
-#endif
-
-protected:
- typedef WebCore::Event WebEventPrivate;
- void assign(WebEventPrivate*);
- WebEventPrivate* m_private;
-
- template<typename T> T* unwrap()
- {
- return static_cast<T*>(m_private);
- }
-
- template<typename T> const T* constUnwrap() const
- {
- return static_cast<const T*>(m_private);
- }
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/WebKit/chromium/public/WebEventListener.h b/WebKit/chromium/public/WebEventListener.h
deleted file mode 100644
index baab8f0..0000000
--- a/WebKit/chromium/public/WebEventListener.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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.
- */
-
-#ifndef WebEventListener_h
-#define WebEventListener_h
-
-#include "WebCommon.h"
-
-#if WEBKIT_IMPLEMENTATION
-namespace WebCore { class Node; }
-#endif
-
-namespace WebKit {
-
-class DeprecatedEventListenerWrapper;
-class WebEvent;
-class WebEventListenerPrivate;
-class WebNode;
-class WebString;
-
-class WebEventListener {
-public:
- WEBKIT_API WebEventListener();
- WEBKIT_API virtual ~WebEventListener();
-
- // Called when an event is received.
- virtual void handleEvent(const WebEvent&) = 0;
-
-#if WEBKIT_IMPLEMENTATION
- void notifyEventListenerDeleted(DeprecatedEventListenerWrapper*);
- DeprecatedEventListenerWrapper* createEventListenerWrapper(const WebString& eventType, bool useCapture, WebCore::Node* node);
- DeprecatedEventListenerWrapper* getEventListenerWrapper(const WebString& eventType, bool useCapture, WebCore::Node* node);
-#endif
-
-private:
- WebEventListenerPrivate* m_private;
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/WebKit/chromium/public/WebMutationEvent.h b/WebKit/chromium/public/WebMutationEvent.h
deleted file mode 100644
index 75eb9c4..0000000
--- a/WebKit/chromium/public/WebMutationEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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.
- */
-#ifndef WebMutationEvent_h
-#define WebMutationEvent_h
-
-#include "WebEvent.h"
-
-#if WEBKIT_IMPLEMENTATION
-namespace WebCore { class Event; }
-#endif
-
-namespace WebKit {
-
-class WebMutationEvent : public WebEvent {
-public:
- enum AttrChangeType {
- Modification = 1,
- Addition = 2,
- Removal = 3
- };
-
- WEBKIT_API WebNode relatedNode() const;
- WEBKIT_API WebString prevValue() const;
- WEBKIT_API WebString newValue() const;
- WEBKIT_API WebString attrName() const;
- WEBKIT_API AttrChangeType attrChange() const;
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index 8b29cc6..f54ff04 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -41,8 +41,6 @@ namespace WebKit {
class WebDOMEventListener;
class WebDOMEventListenerPrivate;
class WebDocument;
-class WebEventListener;
-class WebEventListenerPrivate;
class WebFrame;
class WebNodeList;
@@ -101,8 +99,6 @@ public:
WEBKIT_API bool isElementNode() const;
WEBKIT_API void addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture);
WEBKIT_API void removeEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture);
- WEBKIT_API void addEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture);
- WEBKIT_API void removeEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture);
WEBKIT_API void simulateClick();
WEBKIT_API WebNodeList getElementsByTagName(const WebString&) const;
diff --git a/WebKit/chromium/src/EventListenerWrapper.cpp b/WebKit/chromium/src/EventListenerWrapper.cpp
index d683561..706ba21 100644
--- a/WebKit/chromium/src/EventListenerWrapper.cpp
+++ b/WebKit/chromium/src/EventListenerWrapper.cpp
@@ -36,8 +36,6 @@
#include "WebDOMEvent.h"
#include "WebDOMEventListener.h"
-#include "WebEvent.h"
-#include "WebEventListener.h"
namespace WebKit {
@@ -71,34 +69,4 @@ void EventListenerWrapper::webDOMEventListenerDeleted()
m_webDOMEventListener = 0;
}
-DeprecatedEventListenerWrapper::DeprecatedEventListenerWrapper(WebEventListener* webEventListener)
- : EventListener(EventListener::JSEventListenerType)
- , m_webEventListener(webEventListener)
-{
-}
-
-DeprecatedEventListenerWrapper::~DeprecatedEventListenerWrapper()
-{
- if (m_webEventListener)
- m_webEventListener->notifyEventListenerDeleted(this);
-}
-
-bool DeprecatedEventListenerWrapper::operator==(const EventListener& listener)
-{
- return this == &listener;
-}
-
-void DeprecatedEventListenerWrapper::handleEvent(ScriptExecutionContext* context, Event* event)
-{
- if (!m_webEventListener)
- return;
- WebEvent webEvent(event);
- m_webEventListener->handleEvent(webEvent);
-}
-
-void DeprecatedEventListenerWrapper::webEventListenerDeleted()
-{
- m_webEventListener = 0;
-}
-
} // namespace WebKit
diff --git a/WebKit/chromium/src/EventListenerWrapper.h b/WebKit/chromium/src/EventListenerWrapper.h
index 60afca6..75b6a95 100644
--- a/WebKit/chromium/src/EventListenerWrapper.h
+++ b/WebKit/chromium/src/EventListenerWrapper.h
@@ -42,7 +42,6 @@ using namespace WebCore;
namespace WebKit {
class WebDOMEventListener;
-class WebEventListener;
// FIXME: Remove the DeprecatedEventListenerWrapper class below once Chromium
// switched to using WebDOMEvent.
@@ -60,21 +59,6 @@ private:
WebDOMEventListener* m_webDOMEventListener;
};
-class DeprecatedEventListenerWrapper : public EventListener {
-public:
- DeprecatedEventListenerWrapper(WebEventListener*);
- ~DeprecatedEventListenerWrapper();
-
- virtual bool operator==(const EventListener&);
- virtual void handleEvent(ScriptExecutionContext*, Event*);
-
- void webEventListenerDeleted();
-
-private:
- WebEventListener* m_webEventListener;
-};
-
-
} // namespace WebKit
#endif
diff --git a/WebKit/chromium/src/WebEvent.cpp b/WebKit/chromium/src/WebEvent.cpp
deleted file mode 100644
index 8c68959..0000000
--- a/WebKit/chromium/src/WebEvent.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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 "config.h"
-#include "WebEvent.h"
-
-#include "Event.h"
-#include "Node.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebEventPrivate : public WebCore::Event {
-};
-
-void WebEvent::reset()
-{
- assign(0);
-}
-
-void WebEvent::assign(const WebEvent& other)
-{
- WebEventPrivate* p = const_cast<WebEventPrivate*>(other.m_private);
- if (p)
- p->ref();
- assign(p);
-}
-
-void WebEvent::assign(WebEventPrivate* p)
-{
- // p is already ref'd for us by the caller
- if (m_private)
- m_private->deref();
- m_private = p;
-}
-
-WebEvent::WebEvent(const WTF::PassRefPtr<WebCore::Event>& event)
- : m_private(static_cast<WebEventPrivate*>(event.releaseRef()))
-{
-}
-
-WebString WebEvent::type() const
-{
- ASSERT(m_private);
- return m_private->type();
-}
-
-WebNode WebEvent::target() const
-{
- ASSERT(m_private);
- return WebNode(m_private->target()->toNode());
-}
-
-WebNode WebEvent::currentTarget() const
-{
- ASSERT(m_private);
- return WebNode(m_private->currentTarget()->toNode());
-}
-
-WebEvent::PhaseType WebEvent::eventPhase() const
-{
- ASSERT(m_private);
- return static_cast<WebEvent::PhaseType>(m_private->eventPhase());
-}
-
-bool WebEvent::bubbles() const
-{
- ASSERT(m_private);
- return m_private->bubbles();
-}
-
-bool WebEvent::cancelable() const
-{
- ASSERT(m_private);
- return m_private->cancelable();
-}
-
-bool WebEvent::isUIEvent() const
-{
- ASSERT(m_private);
- return m_private->isUIEvent();
-}
-
-bool WebEvent::isMouseEvent() const
-{
- ASSERT(m_private);
- return m_private->isMouseEvent();
-}
-
-bool WebEvent::isMutationEvent() const
-{
- ASSERT(m_private);
- return m_private->isMutationEvent();
-}
-
-bool WebEvent::isKeyboardEvent() const
-{
- ASSERT(m_private);
- return m_private->isKeyboardEvent();
-}
-
-bool WebEvent::isTextEvent() const
-{
- ASSERT(m_private);
- return m_private->isTextEvent();
-}
-
-bool WebEvent::isCompositionEvent() const
-{
- ASSERT(m_private);
- return m_private->isCompositionEvent();
-}
-
-bool WebEvent::isDragEvent() const
-{
- ASSERT(m_private);
- return m_private->isDragEvent();
-}
-
-bool WebEvent::isClipboardEvent() const
-{
- ASSERT(m_private);
- return m_private->isClipboardEvent();
-}
-
-bool WebEvent::isMessageEvent() const
-{
- ASSERT(m_private);
- return m_private->isMessageEvent();
-}
-
-bool WebEvent::isWheelEvent() const
-{
- ASSERT(m_private);
- return m_private->isWheelEvent();
-}
-
-bool WebEvent::isBeforeTextInsertedEvent() const
-{
- ASSERT(m_private);
- return m_private->isBeforeTextInsertedEvent();
-}
-
-bool WebEvent::isOverflowEvent() const
-{
- ASSERT(m_private);
- return m_private->isOverflowEvent();
-}
-
-bool WebEvent::isPageTransitionEvent() const
-{
- ASSERT(m_private);
- return m_private->isPageTransitionEvent();
-}
-
-bool WebEvent::isPopStateEvent() const
-{
- ASSERT(m_private);
- return m_private->isPopStateEvent();
-}
-
-bool WebEvent::isProgressEvent() const
-{
- ASSERT(m_private);
- return m_private->isProgressEvent();
-}
-
-bool WebEvent::isXMLHttpRequestProgressEvent() const
-{
- ASSERT(m_private);
- return m_private->isXMLHttpRequestProgressEvent();
-}
-
-bool WebEvent::isWebKitAnimationEvent() const
-{
- ASSERT(m_private);
- return m_private->isWebKitAnimationEvent();
-}
-
-bool WebEvent::isWebKitTransitionEvent() const
-{
- ASSERT(m_private);
- return m_private->isWebKitTransitionEvent();
-}
-
-bool WebEvent::isBeforeLoadEvent() const
-{
- ASSERT(m_private);
- return m_private->isBeforeLoadEvent();
-}
-
-} // namespace WebKit
diff --git a/WebKit/chromium/src/WebEventListener.cpp b/WebKit/chromium/src/WebEventListener.cpp
deleted file mode 100644
index 1abce1b..0000000
--- a/WebKit/chromium/src/WebEventListener.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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 "config.h"
-#include "WebEventListener.h"
-
-#include "WebEventListenerPrivate.h"
-
-namespace WebKit {
-
-WebEventListener::WebEventListener()
- : m_private(new WebEventListenerPrivate(this))
-{
-}
-
-WebEventListener::~WebEventListener()
-{
- m_private->webEventListenerDeleted();
- delete m_private;
-}
-
-void WebEventListener::notifyEventListenerDeleted(DeprecatedEventListenerWrapper* wrapper)
-{
- m_private->eventListenerDeleted(wrapper);
-}
-
-DeprecatedEventListenerWrapper* WebEventListener::createEventListenerWrapper(const WebString& eventType, bool useCapture, Node* node)
-{
- return m_private->createEventListenerWrapper(eventType, useCapture, node);
-}
-
-DeprecatedEventListenerWrapper* WebEventListener::getEventListenerWrapper(const WebString& eventType, bool useCapture, Node* node)
-{
- return m_private->getEventListenerWrapper(eventType, useCapture, node);
-}
-
-} // namespace WebKit
diff --git a/WebKit/chromium/src/WebEventListenerPrivate.cpp b/WebKit/chromium/src/WebEventListenerPrivate.cpp
deleted file mode 100644
index ebb39aa..0000000
--- a/WebKit/chromium/src/WebEventListenerPrivate.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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 "config.h"
-#include "WebEventListenerPrivate.h"
-
-#include "EventListenerWrapper.h"
-#include "WebEventListener.h"
-
-namespace WebKit {
-
-WebEventListenerPrivate::WebEventListenerPrivate(WebEventListener* webEventListener)
- : m_webEventListener(webEventListener)
-{
-}
-
-WebEventListenerPrivate::~WebEventListenerPrivate()
-{
-}
-
-DeprecatedEventListenerWrapper* WebEventListenerPrivate::createEventListenerWrapper(const WebString& eventType, bool useCapture, Node* node)
-{
- DeprecatedEventListenerWrapper* listenerWrapper = new DeprecatedEventListenerWrapper(m_webEventListener);
- WebEventListenerPrivate::ListenerInfo listenerInfo(eventType, useCapture, listenerWrapper, node);
- m_listenerWrappers.append(listenerInfo);
- return listenerWrapper;
-}
-
-DeprecatedEventListenerWrapper* WebEventListenerPrivate::getEventListenerWrapper(const WebString& eventType, bool useCapture, Node* node)
-{
- Vector<WebEventListenerPrivate::ListenerInfo>::const_iterator iter;
- for (iter = m_listenerWrappers.begin(); iter != m_listenerWrappers.end(); ++iter) {
- if (iter->node == node)
- return iter->eventListenerWrapper;
- }
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-void WebEventListenerPrivate::webEventListenerDeleted()
-{
- // Notifies all WebEventListenerWrappers that we are going away so they can
- // invalidate their pointer to us.
- Vector<WebEventListenerPrivate::ListenerInfo>::const_iterator iter;
- for (iter = m_listenerWrappers.begin(); iter != m_listenerWrappers.end(); ++iter)
- iter->eventListenerWrapper->webEventListenerDeleted();
-}
-
-void WebEventListenerPrivate::eventListenerDeleted(DeprecatedEventListenerWrapper* eventListener)
-{
- for (size_t i = 0; i < m_listenerWrappers.size(); ++i) {
- if (m_listenerWrappers[i].eventListenerWrapper == eventListener) {
- m_listenerWrappers.remove(i);
- return;
- }
- }
- ASSERT_NOT_REACHED();
-}
-
-} // namespace WebKit
diff --git a/WebKit/chromium/src/WebEventListenerPrivate.h b/WebKit/chromium/src/WebEventListenerPrivate.h
deleted file mode 100644
index fc2612b..0000000
--- a/WebKit/chromium/src/WebEventListenerPrivate.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * 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.
- */
-
-#ifndef WebEventListenerPrivate_h
-#define WebEventListenerPrivate_h
-
-#include "WebString.h"
-
-#include <wtf/Vector.h>
-
-namespace WebCore {
-class Node;
-}
-
-using namespace WebCore;
-
-namespace WebKit {
-
-class DeprecatedEventListenerWrapper;
-class WebEventListener;
-
-class WebEventListenerPrivate {
-public:
- WebEventListenerPrivate(WebEventListener* webEventListener);
- ~WebEventListenerPrivate();
-
- DeprecatedEventListenerWrapper* createEventListenerWrapper(
- const WebString& eventType, bool useCapture, Node* node);
-
- // Gets the DeprecatedEventListenerWrapper for a specific node.
- // Used by WebNode::removeEventListener().
- DeprecatedEventListenerWrapper* getEventListenerWrapper(
- const WebString& eventType, bool useCapture, Node* node);
-
- // Called by the WebEventListener when it is about to be deleted.
- void webEventListenerDeleted();
-
- // Called by the DeprecatedEventListenerWrapper when it is about to be deleted.
- void eventListenerDeleted(DeprecatedEventListenerWrapper* eventListener);
-
- struct ListenerInfo {
- ListenerInfo(const WebString& eventType, bool useCapture,
- DeprecatedEventListenerWrapper* eventListenerWrapper,
- Node* node)
- : eventType(eventType)
- , useCapture(useCapture)
- , eventListenerWrapper(eventListenerWrapper)
- , node(node)
- {
- }
-
- WebString eventType;
- bool useCapture;
- DeprecatedEventListenerWrapper* eventListenerWrapper;
- Node* node;
- };
-
-private:
- WebEventListener* m_webEventListener;
-
- // We keep a list of the wrapper for the WebKit EventListener, it is needed
- // to implement WebNode::removeEventListener().
- Vector<ListenerInfo> m_listenerWrappers;
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/WebKit/chromium/src/WebNode.cpp b/WebKit/chromium/src/WebNode.cpp
index 17140f2..5cfc495 100644
--- a/WebKit/chromium/src/WebNode.cpp
+++ b/WebKit/chromium/src/WebNode.cpp
@@ -41,8 +41,6 @@
#include "WebDOMEvent.h"
#include "WebDOMEventListener.h"
#include "WebDocument.h"
-#include "WebEvent.h"
-#include "WebEventListener.h"
#include "WebFrameImpl.h"
#include "WebNodeList.h"
#include "WebString.h"
@@ -169,24 +167,6 @@ void WebNode::removeEventListener(const WebString& eventType, WebDOMEventListene
// listenerWrapper is now deleted.
}
-void WebNode::addEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture)
-{
- DeprecatedEventListenerWrapper* listenerWrapper =
- listener->createEventListenerWrapper(eventType, useCapture, m_private.get());
- // The listenerWrapper is only referenced by the actual Node. Once it goes
- // away, the wrapper notifies the WebEventListener so it can clear its
- // pointer to it.
- m_private->addEventListener(eventType, adoptRef(listenerWrapper), useCapture);
-}
-
-void WebNode::removeEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture)
-{
- DeprecatedEventListenerWrapper* listenerWrapper =
- listener->getEventListenerWrapper(eventType, useCapture, m_private.get());
- m_private->removeEventListener(eventType, listenerWrapper, useCapture);
- // listenerWrapper is now deleted.
-}
-
void WebNode::simulateClick()
{
RefPtr<Event> noEvent;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list