diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKit/win/MemoryStream.h | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/win/MemoryStream.h')
| -rw-r--r-- | WebKit/win/MemoryStream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/win/MemoryStream.h b/WebKit/win/MemoryStream.h index 22ca0f4..7d6e29e 100644 --- a/WebKit/win/MemoryStream.h +++ b/WebKit/win/MemoryStream.h @@ -28,7 +28,7 @@ #include <objidl.h> -#include "COMPtr.h" +#include <WebCore/COMPtr.h> #include <WebCore/SharedBuffer.h> #include <WTF/PassRefPtr.h> #include <WTF/RefPtr.h> @@ -36,7 +36,7 @@ class MemoryStream : public IStream { public: - static MemoryStream* MemoryStream::createInstance(PassRefPtr<WebCore::SharedBuffer> buffer); + static COMPtr<MemoryStream> createInstance(PassRefPtr<WebCore::SharedBuffer> buffer); protected: MemoryStream(PassRefPtr<WebCore::SharedBuffer> buffer); |