diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit/win/WebView.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit/win/WebView.h')
| -rw-r--r-- | Source/WebKit/win/WebView.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h index 957f0a5..db3c2e7 100644 --- a/Source/WebKit/win/WebView.h +++ b/Source/WebKit/win/WebView.h @@ -26,10 +26,10 @@ #ifndef WebView_H #define WebView_H -#include "COMPtr.h" #include "WebKit.h" #include "WebFrame.h" #include "WebPreferences.h" +#include <WebCore/COMPtr.h> #include <WebCore/DragActions.h> #include <WebCore/IntRect.h> #include <WebCore/RefCountedGDIHandle.h> @@ -883,7 +883,7 @@ public: static WTF::String standardUserAgentWithApplicationName(const WTF::String&); - void setIsBeingDestroyed() { m_isBeingDestroyed = true; } + void setIsBeingDestroyed(); bool isBeingDestroyed() const { return m_isBeingDestroyed; } const char* interpretKeyEvent(const WebCore::KeyboardEvent*); |