diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
| commit | a59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch) | |
| tree | fa539db054a20a67bff2fc891c33b0f4ec632916 /Source/WebKit2/UIProcess/WebContext.cpp | |
| parent | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff) | |
| download | qtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz | |
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContext.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebContext.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp index 8ddc93d83..f7ea141c2 100644 --- a/Source/WebKit2/UIProcess/WebContext.cpp +++ b/Source/WebKit2/UIProcess/WebContext.cpp @@ -79,10 +79,6 @@ #include "WebSoupRequestManagerProxy.h" #endif -#if ENABLE(VIBRATION) -#include "WebVibrationProxy.h" -#endif - #ifndef NDEBUG #include <wtf/RefCountedLeakCounter.h> #endif @@ -165,9 +161,6 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa #if USE(SOUP) m_soupRequestManagerProxy = WebSoupRequestManagerProxy::create(this); #endif -#if ENABLE(VIBRATION) - m_vibrationProxy = WebVibrationProxy::create(this); -#endif #if !LOG_DISABLED WebKit::initializeLogChannelsIfNecessary(); @@ -244,11 +237,6 @@ WebContext::~WebContext() m_soupRequestManagerProxy->clearContext(); #endif -#if ENABLE(VIBRATION) - m_vibrationProxy->invalidate(); - m_vibrationProxy->clearContext(); -#endif - invalidateCallbackMap(m_dictionaryCallbacks); platformInvalidateContext(); @@ -553,9 +541,6 @@ void WebContext::disconnectProcess(WebProcessProxy* process) #if USE(SOUP) m_soupRequestManagerProxy->invalidate(); #endif -#if ENABLE(VIBRATION) - m_vibrationProxy->invalidate(); -#endif // When out of process plug-ins are enabled, we don't want to invalidate the plug-in site data // manager just because the web process crashes since it's not involved. |