diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/loader/archive | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/loader/archive')
| -rw-r--r-- | Source/WebCore/loader/archive/ArchiveFactory.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/loader/archive/ArchiveFactory.cpp b/Source/WebCore/loader/archive/ArchiveFactory.cpp index 693e202..ff324d4 100644 --- a/Source/WebCore/loader/archive/ArchiveFactory.cpp +++ b/Source/WebCore/loader/archive/ArchiveFactory.cpp @@ -32,7 +32,7 @@ #include "MIMETypeRegistry.h" #include "PlatformString.h" -#if PLATFORM(CF) && !PLATFORM(QT) +#if USE(CF) && !PLATFORM(QT) #include "LegacyWebArchive.h" #elif PLATFORM(ANDROID) #include "WebArchiveAndroid.h" @@ -62,7 +62,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes() if (initialized) return mimeTypes; -#if PLATFORM(CF) +#if USE(CF) mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>); #elif PLATFORM(ANDROID) mimeTypes.set("application/x-webarchive-xml", archiveFactoryCreate<WebArchiveAndroid>); diff --git a/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp b/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp index d9575fe..7979423 100644 --- a/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp +++ b/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp @@ -545,10 +545,10 @@ PassRefPtr<LegacyWebArchive> LegacyWebArchive::create(const String& markupString } // Add favicon if one exists for this page, if we are archiving the entire page. - if (nodesSize && nodes[0]->isDocumentNode() && iconDatabase() && iconDatabase()->isEnabled()) { - const String& iconURL = iconDatabase()->iconURLForPageURL(responseURL); - if (!iconURL.isEmpty() && iconDatabase()->iconDataKnownForIconURL(iconURL)) { - if (Image* iconImage = iconDatabase()->iconForPageURL(responseURL, IntSize(16, 16))) { + if (nodesSize && nodes[0]->isDocumentNode() && iconDatabase().isEnabled()) { + const String& iconURL = iconDatabase().iconURLForPageURL(responseURL); + if (!iconURL.isEmpty() && iconDatabase().iconDataKnownForIconURL(iconURL)) { + if (Image* iconImage = iconDatabase().iconForPageURL(responseURL, IntSize(16, 16))) { if (RefPtr<ArchiveResource> resource = ArchiveResource::create(iconImage->data(), KURL(ParsedURLString, iconURL), "image/x-icon", "", "")) subresources.append(resource.release()); } |