Bug 121752

Summary:

[Nix] Updating Nix trunk files

Product:

WebKit

Reporter:

Thiago de Barros Lacerda <thiago.lacerda>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

benjamin, buildbot, cmarcelo, commit-queue, dino, eric.carlson, hugo.lima, kling, kondapallykalyan, luciano.wolf, ossy, rniwa, sergio

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

117658

Attachments:

Description	Flags
Patch	benjamin: review+, benjamin: commit-queue-
Patch	none
Archive of layout-test-results from webkit-ews-13 for mac-mountainlion-wk2	none

Description Thiago de Barros Lacerda 2013-09-21 16:15:28 PDT

When http://www.﷒0﷓, http://www.﷒1﷓ and http://www.﷒2﷓ were merged in trunk, there were some files that were updated but the changes were not included on those bug's patches. This only update those files in trunk.

Comment 1 Thiago de Barros Lacerda 2013-09-21 16:23:15 PDT

Created attachment 212288 [details]
Patch

Comment 2 Benjamin Poulain 2013-09-26 16:56:42 PDT

Comment on attachment 212288 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=212288&action=review

> Source/WebCore/platform/DragImage.h:44
> +#elif PLATFORM(GTK) || PLATFORM(NIX)

Would it be possible to replace this by a #ifdef depending on Cairo?

> Source/WebCore/platform/DragImage.h:64
>  #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX)

There is a PLATFORM(NIX) here which would never match anything.

Comment 3 Thiago de Barros Lacerda 2013-09-27 10:21:48 PDT

(In reply to comment #2)
> (From update of attachment 212288 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=212288&action=review
> 
> > Source/WebCore/platform/DragImage.h:44
> > +#elif PLATFORM(GTK) || PLATFORM(NIX)
> 
> Would it be possible to replace this by a #ifdef depending on Cairo?

EFL also defines USE(CAIRO) so I think it's better to keep this way
> 
> > Source/WebCore/platform/DragImage.h:64
> >  #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX)
> 
> There is a PLATFORM(NIX) here which would never match anything.
Yes, this was left here by mistake... maybe by a wrong merge

Comment 4 Thiago de Barros Lacerda 2013-09-27 10:34:23 PDT

Created attachment 212821 [details]
Patch

Comment 5 Build Bot 2013-09-27 12:21:23 PDT

Comment on attachment 212821 [details]
Patch

Attachment 212821 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/2655189

New failing tests:
media/track/track-cue-rendering-vertical.html

Comment 6 Build Bot 2013-09-27 12:21:25 PDT

Created attachment 212833 [details]
Archive of layout-test-results from webkit-ews-13 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-13  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5

Comment 7 WebKit Commit Bot 2013-09-27 13:24:40 PDT

Comment on attachment 212821 [details]
Patch

Clearing flags on attachment: 212821

Committed r156567: <http://trac.webkit.org/changeset/156567>

Comment 8 Csaba Osztrogonác 2013-09-27 14:08:49 PDT

(In reply to comment #7)
> (From update of attachment 212821 [details])
> Clearing flags on attachment: 212821
> 
> Committed r156567: <http://trac.webkit.org/changeset/156567>

The patch was already landed, so we can close it.