third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp - Issue 20076: WebKit merge 40500:40539 [WebKit side]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp

===================================================================

--- third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp (revision 9118)

+++ third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive.cpp (working copy)

@@ -554,8 +554,10 @@

const String& iconURL = iconDatabase()->iconURLForPageURL(responseURL);

if (!iconURL.isEmpty() && iconDatabase()->iconDataKnownForIconURL(iconURL)) {

RefPtr<SharedBuffer> data = iconDatabase()->iconForPageURL(responseURL, IntSize(16, 16))->data();

- RefPtr<ArchiveResource> resource = ArchiveResource::create(data.release(), KURL(iconURL), "image/x-icon", "", "");

- subresources.append(resource.release());

+ if (data) {

+ RefPtr<ArchiveResource> resource = ArchiveResource::create(data.release(), KURL(iconURL), "image/x-icon", "", "");

+ subresources.append(resource.release());

+ }

}