From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebKit/chromium/src/EventListenerWrapper.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Source/WebKit/chromium/src/EventListenerWrapper.h') 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(); -- cgit v1.1