Changeset 65743 in webkit


Ignore:
Timestamp:
Aug 20, 2010 11:12:01 AM (14 years ago)
Author:
jcivelli@chromium.org
Message:

2010-08-20 Jay Civelli <​jcivelli@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):
Location:
trunk/WebKit/chromium
Files:
7 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/chromium/ChangeLog

    r65740 r65743  
     12010-08-20  Jay Civelli  <jcivelli@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Removing the deprecated class WebEvent and friends.
     6        https://bugs.webkit.org/show_bug.cgi?id=44296
     7
     8        * WebKit.gyp:
     9        * public/WebEvent.h: Removed.
     10        * public/WebEventListener.h: Removed.
     11        * public/WebMutationEvent.h: Removed.
     12        * public/WebNode.h:
     13        * src/EventListenerWrapper.cpp:
     14        (WebKit::EventListenerWrapper::webDOMEventListenerDeleted):
     15        * src/EventListenerWrapper.h:
     16        * src/WebEvent.cpp: Removed.
     17        * src/WebEventListener.cpp: Removed.
     18        * src/WebEventListenerPrivate.cpp: Removed.
     19        * src/WebEventListenerPrivate.h: Removed.
     20        * src/WebNode.cpp:
     21        (WebKit::WebNode::removeEventListener):
     22
    1232010-08-19  Zhenyao Mo  <zmo@google.com>
    224

  • trunk/WebKit/chromium/WebKit.gyp

    r65718 r65743  
    160160                'public/WebEditingAction.h',
    161161                'public/WebElement.h',
    162                 'public/WebEvent.h',
    163                 'public/WebEventListener.h',
    164162                'public/WebFileChooserCompletion.h',
    165163                'public/WebFileChooserParams.h',
    … …  
    216214                'public/WebMessagePortChannelClient.h',
    217215                'public/WebMimeRegistry.h',
    218                 'public/WebMutationEvent.h',
    219216                'public/WebNamedNodeMap.h',
    220217                'public/WebNavigationType.h',
    … …  
    428425                'src/WebEntities.cpp',
    429426                'src/WebEntities.h',
    430                 'src/WebEvent.cpp',
    431                 'src/WebEventListener.cpp',
    432                 'src/WebEventListenerPrivate.cpp',
    433                 'src/WebEventListenerPrivate.h',
    434427                'src/WebFileChooserCompletionImpl.cpp',
    435428                'src/WebFileChooserCompletionImpl.h',
    … …  
    483476                'src/WebMediaPlayerClientImpl.cpp',
    484477                'src/WebMediaPlayerClientImpl.h',
    485                 'src/WebMutationEvent.cpp',
    486478                'src/WebNamedNodeMap.cpp',
    487479                'src/WebNode.cpp',

  • trunk/WebKit/chromium/public/WebNode.h

    r65633 r65743  
    4242class WebDOMEventListenerPrivate;
    4343class WebDocument;
    44 class WebEventListener;
    45 class WebEventListenerPrivate;
    4644class WebFrame;
    4745class WebNodeList;
    … …  
    102100    WEBKIT_API void addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture);
    103101    WEBKIT_API void removeEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture);
    104     WEBKIT_API void addEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture);
    105     WEBKIT_API void removeEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture);
    106102    WEBKIT_API void simulateClick();
    107103    WEBKIT_API WebNodeList getElementsByTagName(const WebString&) const;

  • trunk/WebKit/chromium/src/EventListenerWrapper.cpp

    r65633 r65743  
    3737#include "WebDOMEvent.h"
    3838#include "WebDOMEventListener.h"
    39 #include "WebEvent.h"
    40 #include "WebEventListener.h"
    4139
    4240namespace WebKit {
    … …  
    7270}
    7371
    74 DeprecatedEventListenerWrapper::DeprecatedEventListenerWrapper(WebEventListener* webEventListener)
    75     : EventListener(EventListener::JSEventListenerType)
    76     , m_webEventListener(webEventListener)
    77 {
    78 }
    79 
    80 DeprecatedEventListenerWrapper::~DeprecatedEventListenerWrapper()
    81 {
    82     if (m_webEventListener)
    83         m_webEventListener->notifyEventListenerDeleted(this);
    84 }
    85 
    86 bool DeprecatedEventListenerWrapper::operator==(const EventListener& listener)
    87 {
    88     return this == &listener;
    89 }
    90 
    91 void DeprecatedEventListenerWrapper::handleEvent(ScriptExecutionContext* context, Event* event)
    92 {
    93     if (!m_webEventListener)
    94         return;
    95     WebEvent webEvent(event);
    96     m_webEventListener->handleEvent(webEvent);
    97 }
    98 
    99 void DeprecatedEventListenerWrapper::webEventListenerDeleted()
    100 {
    101     m_webEventListener = 0;
    102 }
    103 
    10472} // namespace WebKit

  • trunk/WebKit/chromium/src/EventListenerWrapper.h

    r65633 r65743  
    4343
    4444class WebDOMEventListener;
    45 class WebEventListener;
    4645
    4746// FIXME: Remove the DeprecatedEventListenerWrapper class below once Chromium
    … …  
    6160};
    6261
    63 class DeprecatedEventListenerWrapper : public EventListener {
    64 public:
    65     DeprecatedEventListenerWrapper(WebEventListener*);
    66     ~DeprecatedEventListenerWrapper();
    67 
    68     virtual bool operator==(const EventListener&);
    69     virtual void handleEvent(ScriptExecutionContext*, Event*);
    70 
    71     void webEventListenerDeleted();
    72 
    73 private:
    74     WebEventListener* m_webEventListener;
    75 };
    76 
    77 
    7862} // namespace WebKit
    7963

  • trunk/WebKit/chromium/src/WebNode.cpp

    r65633 r65743  
    4242#include "WebDOMEventListener.h"
    4343#include "WebDocument.h"
    44 #include "WebEvent.h"
    45 #include "WebEventListener.h"
    4644#include "WebFrameImpl.h"
    4745#include "WebNodeList.h"
    … …  
    170168}
    171169
    172 void WebNode::addEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture)
    173 {
    174     DeprecatedEventListenerWrapper* listenerWrapper =
    175         listener->createEventListenerWrapper(eventType, useCapture, m_private.get());
    176     // The listenerWrapper is only referenced by the actual Node.  Once it goes
    177     // away, the wrapper notifies the WebEventListener so it can clear its
    178     // pointer to it.
    179     m_private->addEventListener(eventType, adoptRef(listenerWrapper), useCapture);
    180 }
    181 
    182 void WebNode::removeEventListener(const WebString& eventType, WebEventListener* listener, bool useCapture)
    183 {
    184     DeprecatedEventListenerWrapper* listenerWrapper =
    185         listener->getEventListenerWrapper(eventType, useCapture, m_private.get());
    186     m_private->removeEventListener(eventType, listenerWrapper, useCapture);
    187     // listenerWrapper is now deleted.
    188 }
    189 
    190170void WebNode::simulateClick()
    191171{
Note: See TracChangeset for help on using the changeset viewer.