diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit/chromium/src/WebDevToolsAgentImpl.h | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit/chromium/src/WebDevToolsAgentImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/WebDevToolsAgentImpl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h index 6a9663127..f1af576cb 100644 --- a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h +++ b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h @@ -36,7 +36,8 @@ #include "WebDevToolsAgentPrivate.h" #include "WebPageOverlay.h" -#include <public/WebSize.h> +#include "platform/WebSize.h" + #include <wtf/Forward.h> #include <wtf/OwnPtr.h> @@ -75,7 +76,7 @@ public: virtual void didCreateScriptContext(WebFrameImpl*, int worldId); virtual void mainFrameViewCreated(WebFrameImpl*); virtual bool metricsOverridden(); - virtual void webViewResized(const WebSize&); + virtual void webViewResized(); // WebDevToolsAgent implementation. virtual void attach(); @@ -105,8 +106,6 @@ public: virtual void overrideDeviceMetrics(int width, int height, float fontScaleFactor, bool fitWindow); virtual void autoZoomPageToFitWidth(); - virtual void getAllocatedObjects(HashSet<const void*>&); - int hostId() { return m_hostId; } // WebPageOverlay |