Issue 126148: Webkit merge from 44668 to 44682.

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 126148: Webkit merge from 44668 to 44682. (Closed)

Created:
11 years, 6 months ago by tony

Modified:
9 years, 7 months ago

Reviewers:
levin

CC:
chromium-reviews_googlegroups.com

Visibility:
Public.

Description

Webkit merge from 44668 to 44682. Fix a the compile by renaming JSONObject to InspectorJSONObject (upstream r44682) and add a test expection for a new test. The windows expectation is just a copy of the linux one, I need to rebaseline it on windows.

Patch Set 1 #

Patch Set 2 : passes lint #

Created: 11 years, 6 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+181 lines, -1 line)			Patch
M	DEPS	View		1 chunk	+1 line, -1 line	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.checksum	View		1 chunk	+1 line, -0 lines	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.png	View		0 chunks	+-1 lines, --1 lines	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/nth-child-dynamic-expected.txt	View		1 chunk	+88 lines, -0 lines	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.checksum	View		1 chunk	+1 line, -0 lines	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.png	View		0 chunks	+-1 lines, --1 lines	0 comments	Download
A	webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/nth-child-dynamic-expected.txt	View		1 chunk	+88 lines, -0 lines	0 comments	Download
M	webkit/tools/layout_tests/test_expectations.txt	View	1	1 chunk	+2 lines, -0 lines	0 comments	Download
M	webkit/webkit.gyp	View		2 chunks	+2 lines, -2 lines	0 comments	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

levin

LGTM Both png files show up as empty for me. If they look fine to ...

11 years, 6 months ago (2009-06-15 19:51:15 UTC) #2

tony

11 years, 6 months ago (2009-06-15 19:57:59 UTC) #3

Ah, right.  That's because git cl upload doesn't upload the images properly (I
think it needs to set a mime type or something).

On 2009/06/15 19:51:15, levin wrote:
> LGTM
> 
> Both png files show up as empty for me.  If they look fine to you, then that
is
> fine with me.

Expand Messages | Collapse Messages