diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/loader/icon | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/loader/icon')
| -rw-r--r-- | WebCore/loader/icon/IconFetcher.cpp | 1 | ||||
| -rw-r--r-- | WebCore/loader/icon/IconLoader.cpp | 4 | ||||
| -rw-r--r-- | WebCore/loader/icon/IconLoader.h | 3 | ||||
| -rw-r--r-- | WebCore/loader/icon/wince/IconDatabaseWince.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/loader/icon/IconFetcher.cpp b/WebCore/loader/icon/IconFetcher.cpp index d1aa2f3..3d3df39 100644 --- a/WebCore/loader/icon/IconFetcher.cpp +++ b/WebCore/loader/icon/IconFetcher.cpp @@ -32,6 +32,7 @@ #include "HTMLNames.h" #include "ResourceHandle.h" #include "ResourceRequest.h" +#include "SharedBuffer.h" namespace WebCore { diff --git a/WebCore/loader/icon/IconLoader.cpp b/WebCore/loader/icon/IconLoader.cpp index 5dd000e..eb49087 100644 --- a/WebCore/loader/icon/IconLoader.cpp +++ b/WebCore/loader/icon/IconLoader.cpp @@ -49,9 +49,9 @@ IconLoader::IconLoader(Frame* frame) { } -auto_ptr<IconLoader> IconLoader::create(Frame* frame) +PassOwnPtr<IconLoader> IconLoader::create(Frame* frame) { - return auto_ptr<IconLoader>(new IconLoader(frame)); + return new IconLoader(frame); } IconLoader::~IconLoader() diff --git a/WebCore/loader/icon/IconLoader.h b/WebCore/loader/icon/IconLoader.h index 7b96ed8..1ebac48 100644 --- a/WebCore/loader/icon/IconLoader.h +++ b/WebCore/loader/icon/IconLoader.h @@ -27,7 +27,6 @@ #define IconLoader_h #include "SubresourceLoaderClient.h" -#include <memory> #include <wtf/Forward.h> #include <wtf/Noncopyable.h> #include <wtf/RefPtr.h> @@ -40,7 +39,7 @@ class SharedBuffer; class IconLoader : private SubresourceLoaderClient, public Noncopyable { public: - static std::auto_ptr<IconLoader> create(Frame*); + static PassOwnPtr<IconLoader> create(Frame*); ~IconLoader(); void startLoading(); diff --git a/WebCore/loader/icon/wince/IconDatabaseWince.cpp b/WebCore/loader/icon/wince/IconDatabaseWince.cpp index e6d686c..54a36e5 100644 --- a/WebCore/loader/icon/wince/IconDatabaseWince.cpp +++ b/WebCore/loader/icon/wince/IconDatabaseWince.cpp @@ -22,12 +22,12 @@ #include "IconDatabase.h" #include "AutodrainedPool.h" -#include "CString.h" #include "DocumentLoader.h" #include "FileSystem.h" #include "IconDatabaseClient.h" #include "IconRecord.h" #include "Image.h" +#include <wtf/text/CString.h> namespace WebCore { |