Bug 189394 - Clean up FontAttributeChanges.cpp after r235748
Summary: Clean up FontAttributeChanges.cpp after r235748
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Wenson Hsieh
URL:
Keywords: DoNotImportToRadar
Depends on:
Blocks:
 
Reported: 2018-09-06 21:05 PDT by Wenson Hsieh
Modified: 2018-10-01 13:54 PDT (History)
5 users (show)

See Also:


Attachments
Patch (5.14 KB, patch)
2018-09-06 21:13 PDT, Wenson Hsieh
thorton: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff
Patch for landing (4.20 KB, patch)
2018-09-07 15:32 PDT, Wenson Hsieh
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Wenson Hsieh 2018-09-06 21:05:41 PDT
On a second glance, a couple of things are wonky here:
- This file isn't in the unified sources list (!). It's currently building via the Xcode project only.
- Since this file is not just for Cocoa platforms, the #imports should be replaced by #includes.
Comment 1 Wenson Hsieh 2018-09-06 21:13:51 PDT
Created attachment 349109 [details]
Patch
Comment 2 WebKit Commit Bot 2018-09-07 15:18:52 PDT
Comment on attachment 349109 [details]
Patch

Rejecting attachment 349109 [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', 'apply-attachment', '--no-update', '--non-interactive', 349109, '--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=349109&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=189394&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 349109 from bug 189394.
Fetching: https://bugs.webkit.org/attachment.cgi?id=349109
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Tim Horton']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 4 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/Sources.txt
patching file Source/WebCore/WebCore.xcodeproj/project.pbxproj
Hunk #1 succeeded at 4824 (offset 1 line).
Hunk #2 FAILED at 28781.
Hunk #3 FAILED at 29788.
Hunk #4 succeeded at 31494 (offset 5 lines).
2 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/WebCore.xcodeproj/project.pbxproj.rej
patching file Source/WebCore/editing/FontAttributeChanges.cpp

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

Full output: https://webkit-queues.webkit.org/results/9133546
Comment 3 Wenson Hsieh 2018-09-07 15:32:28 PDT
Created attachment 349208 [details]
Patch for landing
Comment 4 WebKit Commit Bot 2018-09-07 15:53:56 PDT
Comment on attachment 349208 [details]
Patch for landing

Clearing flags on attachment: 349208

Committed r235814: <https://trac.webkit.org/changeset/235814>