Bug 121752 – [Nix] Updating Nix trunk files

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Thiago de Barros Lacerda]

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.

[Thiago de Barros Lacerda]

Created attachment 212288 [details]
Patch

[Benjamin Poulain]

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.

[Thiago de Barros Lacerda]

(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

[Thiago de Barros Lacerda]

Created attachment 212821 [details]
Patch

[Build Bot]

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

[Build Bot]

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

[WebKit Commit Bot]

Comment on attachment 212821 [details]
Patch

Clearing flags on attachment: 212821

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

[Csaba Osztrogonác]

(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.