Bug 147384 – Clean up RefPtrCairo.cpp

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

[Michael Catanzaro]

Coding standards say: "Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons."

[Michael Catanzaro]

Created attachment 257702 [details]
Patch

[Martin Robinson]

Comment on attachment 257702 [details]
Patch

I cannot recall if this was due to an issue with LIKELY on some platforms. If all the bots are green though, feel free to land this.

[Michael Catanzaro]

Windows bot has been broken for a week now, and if there was an issue with LIKELY I bet it was on Windows. :(

Would you mind if I simply get rid of all the uses of LIKELY in this patch as well? I'm pretty sure it's hocus pocus. http://stackoverflow.com/a/1851905 has a good explanation....

[Martin Robinson]

(In reply to comment #3)
> Windows bot has been broken for a week now, and if there was an issue with
> LIKELY I bet it was on Windows. :(
> 
> Would you mind if I simply get rid of all the uses of LIKELY in this patch
> as well? I'm pretty sure it's hocus pocus.
> http://stackoverflow.com/a/1851905 has a good explanation....

That comment also says:

"Besides the useless branch hint for the predictor, __builtin_expect has its use, the compiler may reorder the code to improve cache usage or save memory."

[Michael Catanzaro]

Comment on attachment 257702 [details]
Patch

OK, I'll keep LIKELY then, although if Intel recommends against using it I think it's _likely_ safe to remove. If it's a problem for WinCairo I guess we'll find out when the EWS is fixed... if that even is a WinCairo bot, I think it's probably AppleWindows....

[WebKit Commit Bot]

Comment on attachment 257702 [details]
Patch

Rejecting attachment 257702 [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-02', 'apply-attachment', '--no-update', '--non-interactive', 257702, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
-apply', '--force', '--reviewer', u'Martin Robinson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 2 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/ChangeLog.rej
patching file Source/WebCore/platform/graphics/cairo/RefPtrCairo.cpp

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Martin Robinson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

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

[Michael Catanzaro]

I don't understand why webkit-patch and the commit-queue can't handle changelog updates anymore. I don't see any changes to the tools, and I'm not doing anything differently....

[Michael Catanzaro]

Committed r187546: <http://trac.webkit.org/changeset/187546>