diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit/chromium/src/EventListenerWrapper.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit/chromium/src/EventListenerWrapper.h')
| -rw-r--r-- | Source/WebKit/chromium/src/EventListenerWrapper.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/WebKit/chromium/src/EventListenerWrapper.h b/Source/WebKit/chromium/src/EventListenerWrapper.h index 75b6a95..83e1cf1 100644 --- a/Source/WebKit/chromium/src/EventListenerWrapper.h +++ b/Source/WebKit/chromium/src/EventListenerWrapper.h @@ -37,21 +37,19 @@ namespace WebCore { class ScriptExecutionContext; } -using namespace WebCore; - namespace WebKit { class WebDOMEventListener; // FIXME: Remove the DeprecatedEventListenerWrapper class below once Chromium // switched to using WebDOMEvent. -class EventListenerWrapper : public EventListener { +class EventListenerWrapper : public WebCore::EventListener { public: EventListenerWrapper(WebDOMEventListener*); ~EventListenerWrapper(); - virtual bool operator==(const EventListener&); - virtual void handleEvent(ScriptExecutionContext*, Event*); + virtual bool operator==(const WebCore::EventListener&); + virtual void handleEvent(WebCore::ScriptExecutionContext*, WebCore::Event*); void webDOMEventListenerDeleted(); |