Bug 114540 – [Windows, WinCairo] ImageBufferCairo.cpp fails to compile after 148247, 148264.

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

[Mark Salisbury]

Created attachment 197897 [details]
Proposed fix

Changes were introduced in ImageBufferCairo.cpp that assume that USE(ACCELERATED_COMPOSITING) is enabled.

The windows cairo build does not have accelerated compositing enabled.

See proposed fix.

[Mark Salisbury]

Created attachment 197901 [details]
Proposed fix

oops... I didn't put the correct bug URL in my change log.  This puts the correct bug ID in.

[Mark Salisbury]

Created attachment 197909 [details]
Proposed fix

This patch adds the file path changed to the change log.  You could guess I didn't run the script to auto-generate the change log.

[WebKit Commit Bot]

Attachment 197909 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp']" exit_code: 1
Source/WebCore/ChangeLog:8:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Brent Fulgham]

Comment on attachment 197909 [details]
Proposed fix

Looks good, but please fix the style issue!

[Mark Salisbury]

Created attachment 197917 [details]
Proposed fix

[Mark Salisbury]

Created attachment 197918 [details]
Proposed fix

oops... I tweaked the patch file by hand but didn't update the magic numbers.  This should apply now.

One of the more difficult 'trivia' fixes I've ever done...

[WebKit Commit Bot]

Comment on attachment 197918 [details]
Proposed fix

Rejecting attachment 197918 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--non-interactive', 197918, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

/Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive).

Full output: http://webkit-queues.appspot.com/results/44122

[Mark Salisbury]

Created attachment 197939 [details]
Proposed fix

I changed 'Not Reviewed' to 'Reviewed by Brent Fulgham.'

stylebots should be appeased now, I hope.

[Brent Fulgham]

Comment on attachment 197939 [details]
Proposed fix

I should have caught that one!  r=me

[WebKit Commit Bot]

Comment on attachment 197939 [details]
Proposed fix

Clearing flags on attachment: 197939

Committed r148357: <http://trac.webkit.org/changeset/148357>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.