Commit 75e35dde authored by thakis@chromium.org's avatar thakis@chromium.org

2011-04-05 Nico Weber <thakis@chromium.org>

        Reviewed by Dimitri Glazkov.

        [chromium] Don't have 'using namespace' declarations in header files
        https://bugs.webkit.org/show_bug.cgi?id=57882

        * src/EventListenerWrapper.cpp:
        * src/EventListenerWrapper.h:
        * src/VideoFrameChromiumImpl.h:
        * src/WebDOMEventListener.cpp:
        * src/WebDOMEventListenerPrivate.cpp:
        * src/WebDOMEventListenerPrivate.h:
        (WebKit::WebDOMEventListenerPrivate::ListenerInfo::ListenerInfo):

git-svn-id: svn://svn.chromium.org/blink/trunk@82996 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3d630370
2011-04-05 Nico Weber <thakis@chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] Don't have 'using namespace' declarations in header files
https://bugs.webkit.org/show_bug.cgi?id=57882
* src/EventListenerWrapper.cpp:
* src/EventListenerWrapper.h:
* src/VideoFrameChromiumImpl.h:
* src/WebDOMEventListener.cpp:
* src/WebDOMEventListenerPrivate.cpp:
* src/WebDOMEventListenerPrivate.h:
(WebKit::WebDOMEventListenerPrivate::ListenerInfo::ListenerInfo):
2011-04-05 Zelidrag Hornung <zelidrag@chromium.org>
Reviewed by David Levin.
......
......@@ -37,6 +37,8 @@
#include "WebDOMEvent.h"
#include "WebDOMEventListener.h"
using namespace WebCore;
namespace WebKit {
EventListenerWrapper::EventListenerWrapper(WebDOMEventListener* webDOMEventListener)
......
......@@ -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();
......
......@@ -34,16 +34,14 @@
#include "VideoFrameChromium.h"
#include "WebVideoFrame.h"
using namespace WebCore;
namespace WebKit {
// A wrapper class for WebKit::WebVideoFrame. Objects can be created in WebKit
// and used in WebCore because of the VideoFrameChromium interface.
class VideoFrameChromiumImpl : public VideoFrameChromium {
class VideoFrameChromiumImpl : public WebCore::VideoFrameChromium {
public:
// Converts a WebCore::VideoFrameChromium to a WebKit::WebVideoFrame.
static WebVideoFrame* toWebVideoFrame(VideoFrameChromium*);
static WebVideoFrame* toWebVideoFrame(WebCore::VideoFrameChromium*);
// Creates a VideoFrameChromiumImpl object to wrap the given WebVideoFrame.
// The VideoFrameChromiumImpl does not take ownership of the WebVideoFrame
......@@ -59,7 +57,7 @@ public:
virtual int stride(unsigned plane) const;
virtual const void* data(unsigned plane) const;
virtual unsigned texture(unsigned plane) const;
virtual const IntSize requiredTextureSize(unsigned plane) const;
virtual const WebCore::IntSize requiredTextureSize(unsigned plane) const;
virtual bool hasPaddingBytes(unsigned plane) const;
private:
......
......@@ -33,6 +33,8 @@
#include "WebDOMEventListenerPrivate.h"
using namespace WebCore;
namespace WebKit {
WebDOMEventListener::WebDOMEventListener()
......
......@@ -34,6 +34,8 @@
#include "EventListenerWrapper.h"
#include "WebDOMEventListener.h"
using namespace WebCore;
namespace WebKit {
WebDOMEventListenerPrivate::WebDOMEventListenerPrivate(WebDOMEventListener* webDOMEventListener)
......
......@@ -39,8 +39,6 @@ namespace WebCore {
class Node;
}
using namespace WebCore;
namespace WebKit {
class EventListenerWrapper;
......@@ -52,12 +50,12 @@ public:
~WebDOMEventListenerPrivate();
EventListenerWrapper* createEventListenerWrapper(
const WebString& eventType, bool useCapture, Node* node);
const WebString& eventType, bool useCapture, WebCore::Node*);
// Gets the ListenerEventWrapper for a specific node.
// Used by WebNode::removeDOMEventListener().
EventListenerWrapper* getEventListenerWrapper(
const WebString& eventType, bool useCapture, Node* node);
const WebString& eventType, bool useCapture, WebCore::Node*);
// Called by the WebDOMEventListener when it is about to be deleted.
void webDOMEventListenerDeleted();
......@@ -68,7 +66,7 @@ public:
struct ListenerInfo {
ListenerInfo(const WebString& eventType, bool useCapture,
EventListenerWrapper* eventListenerWrapper,
Node* node)
WebCore::Node* node)
: eventType(eventType)
, useCapture(useCapture)
, eventListenerWrapper(eventListenerWrapper)
......@@ -79,7 +77,7 @@ public:
WebString eventType;
bool useCapture;
EventListenerWrapper* eventListenerWrapper;
Node* node;
WebCore::Node* node;
};
private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment