Bug 51800 - Remove EventQueue.cpp from the wincairo build as it is already included in DOMAllinOne.cpp. Also WKImageCG.
Summary: Remove EventQueue.cpp from the wincairo build as it is already included in DO...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Other
: P2 Minor
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-02 01:17 PST by Carl Lobo
Modified: 2012-01-12 10:32 PST (History)
5 users (show)

See Also:

Attachments
Patch (1.71 KB, patch)
2011-01-02 02:04 PST, Carl Lobo 		no flags Details | Formatted Diff | Diff
Patch (2.58 KB, patch)
2011-01-02 02:40 PST, Carl Lobo 		no flags Details | Formatted Diff | Diff
Patch (3.02 KB, patch)
2011-01-04 21:22 PST, Carl Lobo 		no flags Details | Formatted Diff | Diff
Patch (3.18 KB, patch)
2011-01-04 23:10 PST, Carl Lobo 		eric: review-
commit-queue: commit-queue-
Details | Formatted Diff | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Carl Lobo 2011-01-02 01:17:38 PST 
Remove EventQueue.cpp from the wincairo build as it is already included in DOMAllinOne.cpp
Comment 1 Carl Lobo 2011-01-02 02:04:46 PST 
Created attachment 77774 [details]
Patch
Comment 2 Carl Lobo 2011-01-02 02:40:06 PST 
Created attachment 77775 [details]
Patch
Comment 3 Eric Seidel (no email) 2011-01-03 23:43:22 PST 
Comment on attachment 77775 [details]
Patch

rs=me.
Comment 4 WebKit Commit Bot 2011-01-03 23:45:18 PST 
Comment on attachment 77775 [details]
Patch

Rejecting attachment 77775 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-4', 'apply-attachment', '--no-update', '--non-interactive', 77775]" exit_code: 2
Last 500 characters of output:
#1 succeeded at 1 with fuzz 3.
patching file WebCore/WebCore.vcproj/WebCore.vcproj
Hunk #1 FAILED at 43645.
Hunk #2 FAILED at 43673.
2 out of 2 hunks FAILED -- saving rejects to file WebCore/WebCore.vcproj/WebCore.vcproj.rej
patching file WebKit2/win/WebKit2.vcproj
Hunk #1 FAILED at 951.
1 out of 1 hunk FAILED -- saving rejects to file WebKit2/win/WebKit2.vcproj.rej

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/7306384
Comment 5 Carl Lobo 2011-01-04 21:22:27 PST 
Created attachment 77968 [details]
Patch
Comment 6 Eric Seidel (no email) 2011-01-04 22:22:32 PST 
Comment on attachment 77968 [details]
Patch

I'm confused by all the whitespace changes?
Comment 7 Carl Lobo 2011-01-04 22:25:09 PST 
The file got generated by the IDE. I'll have to remove them by hand I guess.
Comment 8 Carl Lobo 2011-01-04 23:10:32 PST 
Created attachment 77972 [details]
Patch
Comment 9 Eric Seidel (no email) 2011-01-06 12:31:21 PST 
Comment on attachment 77972 [details]
Patch

I'm still confused by the whitespace changes.  Are you suggesting that the existing checked-in file disagrees with what an IDE would generate?  Seems we should be checking-in the IDE version?
Comment 10 Carl Lobo 2011-01-06 18:49:29 PST 
I'm using VCExpress which may differ from Visual Studio. The checked in file is good enough. Fixing the whitespace diffs would anyway ensure that nothing else sneaks in.
Comment 11 WebKit Commit Bot 2011-01-06 20:29:24 PST 
Comment on attachment 77972 [details]
Patch

Rejecting attachment 77972 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-sf-cq', 'apply-attachment', '--no-update', '--non-interactive', 77972]" exit_code: 2
Last 500 characters of output:
/Projects/CommitQueue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1
Parsed 2 diffs from patch file(s).
patching file WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebCore/WebCore.vcproj/WebCore.vcproj
Hunk #1 FAILED at 43701.
1 out of 1 hunk FAILED -- saving rejects to file WebCore/WebCore.vcproj/WebCore.vcproj.rej

Failed to run "[u'/Projects/CommitQueue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/7267447
Comment 12 Eric Seidel (no email) 2011-01-06 20:32:45 PST 
Maybe one of the people who actually work on windows could help you here.
Comment 13 Carl Lobo 2011-01-06 21:25:43 PST 
I guess the best way would be just to ignore the file EventQueue.cpp for all configurations in this case - it is already excluded for the Apple configurations.
Comment 14 Eric Seidel (no email) 2011-06-18 19:55:07 PDT 
Comment on attachment 77972 [details]
Patch

Needs updated patch.
Comment 15 Brent Fulgham 2012-01-12 10:32:36 PST 
The EventQueue.cpp exclusion change was committed by someone else in another bug.  We can close this issue.