Issue 10993046: Merge 129585

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

Issue 10993046: Merge 129585 (Closed)

Created:
8 years, 2 months ago by Chris Evans

Modified:
8 years, 2 months ago

Reviewers:
abarth-chromium, abarth

CC:
chromium-reviews

Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1271/

Visibility:
Public.

More Reviews

Description

Merge 129585 BUG=145915 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129693

Patch Set 1 #

Created: 8 years, 2 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+0 lines, --3 lines)			Patch
A +	LayoutTests/http/tests/security/resources/set-cookie.php	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/http/tests/security/svg-image-leak.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/http/tests/security/svg-image-leak-expected.txt	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	Source/WebCore/platform/network/chromium/ResourceHandle.cpp	View	1 chunk	+3 lines, -0 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

abarth-chromium

8 years, 2 months ago (2012-09-26 20:22:17 UTC) #2

LGTM

On Wed, Sep 26, 2012 at 1:20 PM,  <cevans@chromium.org> wrote:
> Reviewers: abarth_webkit.org,
>
> Description:
> Merge 129585
> BUG=145915
>
> Please review this at https://codereview.chromium.org/10993046/
>
> SVN Base: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
>
> Affected files:
>   A  +  LayoutTests/http/tests/security/resources/set-cookie.php
>   A  +  LayoutTests/http/tests/security/svg-image-leak-expected.txt
>   A  +  LayoutTests/http/tests/security/svg-image-leak.html
>   M     Source/WebCore/platform/network/chromium/ResourceHandle.cpp
>
>
> ### BEGIN SVN COPY METADATA
> #$ cp trunk/LayoutTests/http/tests/security/svg-image-leak-expected.txt
> LayoutTests/http/tests/security/svg-image-leak-expected.txt
> #$ cp trunk/LayoutTests/http/tests/security/resources/set-cookie.php
> LayoutTests/http/tests/security/resources/set-cookie.php
> #$ cp trunk/LayoutTests/http/tests/security/svg-image-leak.html
> LayoutTests/http/tests/security/svg-image-leak.html
> ### END SVN COPY METADATA
> Index: LayoutTests/http/tests/security/resources/set-cookie.php
> Index: LayoutTests/http/tests/security/svg-image-leak-expected.txt
> Index: LayoutTests/http/tests/security/svg-image-leak.html
> Index: Source/WebCore/platform/network/chromium/ResourceHandle.cpp
> ===================================================================
> --- Source/WebCore/platform/network/chromium/ResourceHandle.cpp (revision
> 129692)
> +++ Source/WebCore/platform/network/chromium/ResourceHandle.cpp (working
> copy)
> @@ -218,6 +218,9 @@
>
>  bool ResourceHandle::start(NetworkingContext* context)
>  {
> +    if (!context)
> +        return false;
> +
>      d->start();
>      return true;
>  }
>
>

Expand Messages | Collapse Messages