| Summary: | Tap highlighting: Support better outlines for multiline inlines | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Kenneth Rohde Christiansen <kenneth> | ||||
| Component: | WebCore Misc. | Assignee: | Kenneth Rohde Christiansen <kenneth> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | hausmann, webkit.review.bot | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Unspecified | ||||||
| OS: | Unspecified | ||||||
| Attachments: |
|
||||||
|
Description
Kenneth Rohde Christiansen
2012-01-31 05:42:56 PST
Created attachment 124714 [details]
Patch
Attachment 124714 [details] did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit 09fbdf8..3b3325c master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 106354 = 09fbdf8bc1525cf6c284e230088f23103db232bd r106355 = 3b3325cd5a20bf357b8fdad5c0c1dcb448125ec4 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Applying: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. Comment on attachment 124714 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124714&action=review > Source/WebCore/page/GestureTapHighlighter.cpp:133 > +inline bool contains(LayoutRect rect, int x) missing "static" keyword? > Source/WebCore/page/GestureTapHighlighter.cpp:173 > + if (!first.isEmpty()) { > + addRectWithRoundedCorners(path, first, > + true, true, > + !contains(middle, first.x()) && !contains(last, first.x()), > + !contains(middle, first.maxX()) && !contains(last, first.maxX())); I wish there was a way to write this more readable, i.e. make it clearer what the meaning of the booleans here is. Corrected patch landed in 106357. |