diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/WebProcess/Plugins/PluginView.h | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/PluginView.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/PluginView.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginView.h b/Source/WebKit2/WebProcess/Plugins/PluginView.h index 9624ac954..cd6363a58 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginView.h +++ b/Source/WebKit2/WebProcess/Plugins/PluginView.h @@ -29,13 +29,12 @@ #include "NPRuntimeObjectMap.h" #include "Plugin.h" #include "PluginController.h" -#include "RunLoop.h" #include "WebFrame.h" - #include <WebCore/MediaCanStartListener.h> +#include <WebCore/PluginViewBase.h> #include <WebCore/ResourceError.h> #include <WebCore/ResourceResponse.h> -#include <WebCore/PluginViewBase.h> +#include <WebCore/RunLoop.h> #include <wtf/Deque.h> // FIXME: Eventually this should move to WebCore. @@ -180,7 +179,7 @@ private: // Pending URLRequests that the plug-in has made. Deque<RefPtr<URLRequest> > m_pendingURLRequests; - RunLoop::Timer<PluginView> m_pendingURLRequestsTimer; + WebCore::RunLoop::Timer<PluginView> m_pendingURLRequestsTimer; // Pending frame loads that the plug-in has made. typedef HashMap<RefPtr<WebFrame>, RefPtr<URLRequest> > FrameLoadMap; |