Summary: | [GTK] Fix some warnings | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Rob Buis <rbuis> | ||||||||||||
Component: | New Bugs | Assignee: | Rob Buis <rbuis> | ||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||
Severity: | Normal | CC: | alecflett, beidson, commit-queue, ews-watchlist, fred.wang, jsbell, koivisto, svillar, webkit-bug-importer, zalan | ||||||||||||
Priority: | P2 | Keywords: | InRadar | ||||||||||||
Version: | WebKit Nightly Build | ||||||||||||||
Hardware: | Unspecified | ||||||||||||||
OS: | Unspecified | ||||||||||||||
Attachments: |
|
Description
Rob Buis
2019-12-02 01:59:19 PST
Created attachment 384601 [details]
Patch
Comment on attachment 384601 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384601&action=review > Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp:-267 > - // \ I can't see anything on https://webkit.org/code-style-guidelines/ saying we shouldn't use "C style" but maybe an alternative is to change this '\'. For example use '/' instead and move inline-block to the right. (In reply to Frédéric Wang (:fredw) from comment #2) > Comment on attachment 384601 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=384601&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp:-267 > > - // \ > > I can't see anything on https://webkit.org/code-style-guidelines/ saying we > shouldn't use "C style" but maybe an alternative is to change this '\'. For > example use '/' instead and move inline-block to the right. I have a hard time understanding that part of the ASCII art. I think I'll try your suggestion and CC zalan/antii whether they like it. Created attachment 384609 [details]
Patch
@zalan, antti, is the new ASCII art acceptable? :) It fixes the warning. (In reply to Rob Buis from comment #5) > @zalan, antti, is the new ASCII art acceptable? :) It fixes the warning. Let's just remove those 2 lines: +++ b/Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp @@ -264,8 +264,6 @@ void LineBuilder::alignContentVertically(RunList& runList) ASSERT(!formattingState.lineBoxes().isEmpty()); auto inlineBlockBaselineOffset = formattingState.lineBoxes().last().baselineOffset(); // The inline-block's baseline offset is relative to its content box. Let's convert it relative to the margin box. - // inline-block - // \ // _______________ <- margin box // | // | ____________ <- border box Created attachment 384615 [details]
Patch
Comment on attachment 384615 [details] Patch Rejecting attachment 384615 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 384615, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/13284915 Comment on attachment 384615 [details] Patch Clearing flags on attachment: 384615 Committed r252982: <https://trac.webkit.org/changeset/252982> All reviewed patches have been landed. Closing bug. Reopening to attach new patch. Created attachment 384617 [details]
Patch
Comment on attachment 384617 [details] Patch Rejecting attachment 384617 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 384617, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=384617&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=204739&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 384617 from bug 204739. Fetching: https://bugs.webkit.org/attachment.cgi?id=384617 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 3 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/Modules/indexeddb/IDBDatabase.cpp Hunk #1 FAILED at 278. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/Modules/indexeddb/IDBDatabase.cpp.rej patching file Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp Hunk #1 FAILED at 263. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/13284944 Created attachment 384618 [details]
Patch
|