Bug 121752 - [Nix] Updating Nix trunk files
Summary: [Nix] Updating Nix trunk files
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 117658
  Show dependency treegraph
 
Reported: 2013-09-21 16:15 PDT by Thiago de Barros Lacerda
Modified: 2013-09-27 14:08 PDT (History)
13 users (show)

See Also:


Attachments
Patch (20.78 KB, patch)
2013-09-21 16:23 PDT, Thiago de Barros Lacerda
benjamin: review+
benjamin: commit-queue-
Details | Formatted Diff | Diff
Patch (20.24 KB, patch)
2013-09-27 10:34 PDT, Thiago de Barros Lacerda
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from webkit-ews-13 for mac-mountainlion-wk2 (977.26 KB, application/zip)
2013-09-27 12:21 PDT, Build Bot
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
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.