Bug 191732 - Move Lookup Code for better cross platform usage
Summary: Move Lookup Code for better cross platform usage
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Megan Gardner
URL:
Keywords: InRadar
Depends on: 192130
Blocks:
  Show dependency treegraph
 
Reported: 2018-11-15 18:37 PST by Megan Gardner
Modified: 2018-12-06 15:59 PST (History)
8 users (show)

See Also:


Attachments
Patch (76.63 KB, patch)
2018-11-15 19:03 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.83 KB, patch)
2018-11-15 19:10 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (73.59 KB, patch)
2018-11-16 10:01 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (74.12 KB, patch)
2018-11-16 10:40 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.33 KB, patch)
2018-11-16 11:28 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.38 KB, patch)
2018-11-16 11:33 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.39 KB, patch)
2018-11-16 11:45 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.71 KB, patch)
2018-11-16 13:53 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (72.94 KB, patch)
2018-11-16 14:07 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (73.30 KB, patch)
2018-11-16 14:36 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (73.29 KB, patch)
2018-11-16 14:56 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (73.40 KB, patch)
2018-11-16 15:13 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch (71.99 KB, patch)
2018-11-16 16:20 PST, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch for landing (72.81 KB, patch)
2018-11-28 13:20 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch for landing (73.86 KB, patch)
2018-11-29 10:16 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch for landing (73.81 KB, patch)
2018-11-29 13:11 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch for landing (73.92 KB, patch)
2018-11-29 13:48 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch for landing (73.93 KB, patch)
2018-11-29 13:50 PST, Megan Gardner
no flags Details | Formatted Diff | Diff
Patch for landing (73.94 KB, patch)
2018-11-29 14:19 PST, Megan Gardner
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Megan Gardner 2018-11-15 18:37:39 PST
Move Lookup Code for better cross platform usage
Comment 1 Megan Gardner 2018-11-15 19:03:44 PST
Created attachment 355012 [details]
Patch
Comment 2 Radar WebKit Bug Importer 2018-11-15 19:04:17 PST
<rdar://problem/46116194>
Comment 3 Megan Gardner 2018-11-15 19:10:41 PST
Created attachment 355013 [details]
Patch
Comment 4 Megan Gardner 2018-11-16 10:01:49 PST
Created attachment 355070 [details]
Patch
Comment 5 Megan Gardner 2018-11-16 10:40:13 PST
Created attachment 355076 [details]
Patch
Comment 6 Alex Christensen 2018-11-16 11:28:00 PST
Comment on attachment 355076 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=355076&action=review

> Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h:49
> +#else

// USE(APPLE_INTERNAL_SDK)
Extra space above.

> Source/WebCore/editing/cocoa/DictionaryLookup.mm:53
> +
> +

:(

> Source/WebCore/editing/cocoa/DictionaryLookup.mm:369
> +#endif //  PLATFORM(MAC)

extra space

> Source/WebCore/editing/cocoa/DictionaryLookup.mm:379
> +    return nil;

This is unreachable code on Mac.  I think it needs an #else above.

> Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:161
> +#endif // #if PLATFORM(MAC)

no #if

> Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:176
> +#endif // #if PLATFORM(MAC)

Comment probably not necessary
Comment 7 Megan Gardner 2018-11-16 11:28:11 PST
Created attachment 355084 [details]
Patch
Comment 8 Megan Gardner 2018-11-16 11:33:02 PST
Created attachment 355086 [details]
Patch
Comment 9 Megan Gardner 2018-11-16 11:45:45 PST
Created attachment 355088 [details]
Patch
Comment 10 Alex Christensen 2018-11-16 13:29:40 PST
Comment on attachment 355088 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=355088&action=review

> Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:74
> +void WebPage::performDictionaryLookupAtLocation(const FloatPoint& floatPoint)

I bet if you surrounded this whole function by #if ENABLE(REVEAL) /#else UNUSED_PARAM(...).../#endif it would fix the EWS build failure.

> Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:96
> +void WebPage::performDictionaryLookupForSelection(Frame& frame, const VisibleSelection& selection, TextIndicatorPresentationTransition presentationTransition)

ditto
Comment 11 Wenson Hsieh 2018-11-16 13:34:59 PST
(In reply to Alex Christensen from comment #10)
> Comment on attachment 355088 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=355088&action=review
> 
> > Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:74
> > +void WebPage::performDictionaryLookupAtLocation(const FloatPoint& floatPoint)
> 
> I bet if you surrounded this whole function by #if ENABLE(REVEAL) /#else
> UNUSED_PARAM(...).../#endif it would fix the EWS build failure.

I think you'd want PLATFORM(MAC) || ENABLE(REVEAL), since shipping macOS still needs this chunk of code.

> 
> > Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:96
> > +void WebPage::performDictionaryLookupForSelection(Frame& frame, const VisibleSelection& selection, TextIndicatorPresentationTransition presentationTransition)
> 
> ditto
Comment 12 Megan Gardner 2018-11-16 13:53:52 PST
Created attachment 355112 [details]
Patch
Comment 13 Megan Gardner 2018-11-16 14:07:32 PST
Created attachment 355118 [details]
Patch
Comment 14 Megan Gardner 2018-11-16 14:36:10 PST
Created attachment 355125 [details]
Patch
Comment 15 Megan Gardner 2018-11-16 14:56:38 PST
Created attachment 355134 [details]
Patch
Comment 16 Megan Gardner 2018-11-16 15:13:55 PST
Created attachment 355138 [details]
Patch
Comment 17 Alex Christensen 2018-11-16 16:20:20 PST
Created attachment 355156 [details]
Patch
Comment 18 WebKit Commit Bot 2018-11-26 06:13:26 PST
Comment on attachment 355156 [details]
Patch

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

Parsed 23 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/SourcesCocoa.txt
Hunk #1 succeeded at 77 (offset -5 lines).
Hunk #2 succeeded at 91 (offset -5 lines).
patching file Source/WebCore/PAL/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Hunk #1 succeeded at 406 (offset 4 lines).
Hunk #2 succeeded at 472 (offset 4 lines).
patching file Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
patching file Source/WebCore/PAL/pal/spi/mac/LookupSPI.h
patching file Source/WebCore/PAL/pal/spi/mac/RevealSPI.h
rm 'Source/WebCore/PAL/pal/spi/mac/RevealSPI.h'
patching file Source/WebCore/WebCore.xcodeproj/project.pbxproj
Hunk #1 succeeded at 20536 (offset 122 lines).
Hunk #2 succeeded at 26249 (offset 119 lines).
patching file Source/WebCore/editing/cocoa/DictionaryLookup.mm
patching file Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm
patching file Source/WebCore/editing/mac/DictionaryLookup.h
patching file Source/WebCore/editing/mac/DictionaryLookup.mm
rm 'Source/WebCore/editing/mac/DictionaryLookup.mm'
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/Platform/spi/ios/UIKitSPI.h
Hunk #1 succeeded at 734 (offset 1 line).
patching file Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
patching file Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
Hunk #2 succeeded at 216 (offset 3 lines).
patching file Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Hunk #3 succeeded at 765 (offset 6 lines).
Hunk #4 succeeded at 855 with fuzz 1 (offset 10 lines).
Hunk #5 succeeded at 871 with fuzz 1 (offset 11 lines).
Hunk #6 succeeded at 1472 (offset 11 lines).
Hunk #7 succeeded at 6067 (offset 24 lines).
patching file Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
patching file Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
patching file Source/WebKit/WebProcess/WebPage/WebPage.messages.in
Hunk #1 FAILED at 188.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/WebProcess/WebPage/WebPage.messages.in.rej
patching file Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
patching file Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
Hunk #1 succeeded at 417 (offset 4 lines).
patching file Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

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

Full output: https://webkit-queues.webkit.org/results/10154097
Comment 19 Megan Gardner 2018-11-28 13:20:50 PST
Created attachment 355911 [details]
Patch for landing
Comment 20 WebKit Commit Bot 2018-11-28 14:09:46 PST
The commit-queue encountered the following flaky tests while processing attachment 355911 [details]:

media/W3C/video/events/event_canplay.html bug 192103 (author: pilgrim@chromium.org)
The commit-queue is continuing to process your patch.
Comment 21 WebKit Commit Bot 2018-11-28 14:09:52 PST
The commit-queue encountered the following flaky tests while processing attachment 355911 [details]:

webgl/2.0.0/conformance/more/functions/texSubImage2DHTMLBadArgs.html bug 192104 (author: justin_fan@apple.com)
The commit-queue is continuing to process your patch.
Comment 22 Megan Gardner 2018-11-28 17:41:24 PST
Committed r238653: <https://trac.webkit.org/changeset/238653>
Comment 23 WebKit Commit Bot 2018-11-28 18:53:33 PST
Re-opened since this is blocked by bug 192130
Comment 24 WebKit Commit Bot 2018-11-28 18:56:20 PST
Comment on attachment 355911 [details]
Patch for landing

Rejecting attachment 355911 [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', 355911, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 5000 characters of output:
 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 22 diffs from patch file(s).
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/PAL/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Hunk #1 FAILED at 406.
Hunk #2 FAILED at 472.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj.rej
patching file Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h
patching file Source/WebCore/PAL/pal/spi/mac/LookupSPI.h
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/PAL/pal/spi/mac/LookupSPI.h.rej
The next patch would delete the file Source/WebCore/PAL/pal/spi/mac/RevealSPI.h,
which does not exist!  Applying it anyway.
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: Source/WebCore/PAL/pal/spi/mac/RevealSPI.h
|deleted file mode 100644
|index d6b8da42c85990ae32ea67a0af7753f3db9828a5..0000000000000000000000000000000000000000
|--- Source/WebCore/PAL/pal/spi/mac/RevealSPI.h	(revision 0)
|+++ Source/WebCore/PAL/pal/spi/mac/RevealSPI.h	(working copy)
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file Source/WebCore/SourcesCocoa.txt
Hunk #1 FAILED at 77.
Hunk #2 FAILED at 91.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/SourcesCocoa.txt.rej
patching file Source/WebCore/WebCore.xcodeproj/project.pbxproj
Hunk #1 FAILED at 20519.
Hunk #2 FAILED at 26226.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/WebCore.xcodeproj/project.pbxproj.rej
patching file Source/WebCore/editing/cocoa/DictionaryLookup.mm
patching file Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm.rej
patching file Source/WebCore/editing/mac/DictionaryLookup.h
Hunk #1 FAILED at 23.
Hunk #2 FAILED at 58.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/editing/mac/DictionaryLookup.h.rej
The next patch would delete the file Source/WebCore/editing/mac/DictionaryLookup.mm,
which does not exist!  Applying it anyway.
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: Source/WebCore/editing/mac/DictionaryLookup.mm
|deleted file mode 100644
|index ce9e4474a49fcc9b095b2f4bda6c9ae3f38cfe47..0000000000000000000000000000000000000000
|--- Source/WebCore/editing/mac/DictionaryLookup.mm	(revision 0)
|+++ Source/WebCore/editing/mac/DictionaryLookup.mm	(working copy)
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file Source/WebKit/Platform/spi/ios/UIKitSPI.h
Hunk #1 succeeded at 736 with fuzz 2 (offset 3 lines).
patching file Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
Hunk #1 FAILED at 33.
Hunk #2 FAILED at 190.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm.rej
patching file Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
Hunk #1 FAILED at 87.
Hunk #2 FAILED at 216.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/UIProcess/ios/WKContentViewInteraction.h.rej
patching file Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Hunk #1 FAILED at 112.
Hunk #2 FAILED at 650.
Hunk #3 FAILED at 765.
Hunk #4 FAILED at 855.
Hunk #5 FAILED at 871.
Hunk #6 succeeded at 1461 with fuzz 2 (offset -11 lines).
Hunk #7 FAILED at 6055.
6 out of 7 hunks FAILED -- saving rejects to file Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm.rej
patching file Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
Hunk #1 FAILED at 121.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm.rej
patching file Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
Hunk #1 FAILED at 323.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/mac/WebPageProxyMac.mm.rej
patching file Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
Hunk #1 FAILED at 26.
Hunk #2 succeeded at 61 with fuzz 2 (offset -9 lines).
1 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm.rej
patching file Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
Hunk #1 FAILED at 417.
1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm.rej
patching file Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
Hunk #1 FAILED at 389.
Hunk #2 FAILED at 444.
2 out of 2 hunks FAILED -- saving rejects to file Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm.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/10191243
Comment 25 Megan Gardner 2018-11-29 10:16:35 PST
Created attachment 356017 [details]
Patch for landing
Comment 26 WebKit Commit Bot 2018-11-29 10:54:28 PST
Comment on attachment 356017 [details]
Patch for landing

Clearing flags on attachment: 356017

Committed r238678: <https://trac.webkit.org/changeset/238678>
Comment 27 WebKit Commit Bot 2018-11-29 10:54:30 PST
All reviewed patches have been landed.  Closing bug.
Comment 28 Ryan Haddad 2018-11-29 12:09:14 PST
Reverted r238678 for reason:

Breaks internal builds.

Committed r238682: <https://trac.webkit.org/changeset/238682>
Comment 29 Megan Gardner 2018-11-29 13:11:57 PST
Created attachment 356039 [details]
Patch for landing
Comment 30 Megan Gardner 2018-11-29 13:48:18 PST
Created attachment 356052 [details]
Patch for landing
Comment 31 Megan Gardner 2018-11-29 13:50:18 PST
Created attachment 356053 [details]
Patch for landing
Comment 32 WebKit Commit Bot 2018-11-29 13:57:19 PST
The commit-queue encountered the following flaky tests while processing attachment 356039 [details]:

webgl/1.0.2/conformance/more/functions/texSubImage2DBadArgs.html bug 192176 (author: roger_fong@apple.com)
http/tests/websocket/tests/hybi/inspector/resolveWebSocket.html bug 192177 (author: drousso@apple.com)
The commit-queue is continuing to process your patch.
Comment 33 WebKit Commit Bot 2018-11-29 14:18:03 PST
Comment on attachment 356053 [details]
Patch for landing

Rejecting attachment 356053 [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', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 5000 characters of output:
LE_VIDEO_USES_ELEMENT_FULLSCREEN -DENABLE_WEB_AUDIO -DENABLE_WEB_AUTHN -DENABLE_WEB_RTC -DENABLE_WEBGL -DENABLE_WEBGL2 -DENABLE_WEBGPU -DENABLE_WEBMETAL -DENABLE_WIRELESS_PLAYBACK_TARGET -DENABLE_XSLT -DBUILDING_WEBKIT -DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0 -DGL_SILENCE_DEPRECATION=1 -DGLES_SILENCE_DEPRECATION=1 -DOBJC_OLD_DISPATCH_PROTOTYPES=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.12 -g -fvisibility=hidden -fvisibility-inlines-hidden -fno-threadsafe-statics -Wno-sign-conversion -Winfinite-recursion -Wmove -iquote /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/WebCore-generated-files.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/WebCore-own-target-headers.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/WebCore-all-target-headers.hmap -iquote /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/WebCore-project-headers.hmap -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/include -IPAL -IForwardingHeaders -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxslt -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxml2 -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/WebKitAdditions -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/local/include/WebKitAdditions -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/webrtc -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/local/include/webrtc -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/webrtc/sdk/objc/Framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/local/include/webrtc/sdk/objc/Framework/Headers -I/Volumes/Data/EWS/WebKit/Source/WebCore -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/DerivedSources/x86_64 -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/DerivedSources -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option -F/Volumes/Data/EWS/WebKit/WebKitBuild/Release -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks -isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Carbon.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -include /Volumes/Data/EWS/WebKit/WebKitBuild/PrecompiledHeaders/WebCorePrefix-dnjuakfurgubmjbiggygtnisdjsu/WebCorePrefix.h -MMD -MT dependencies -MF /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource17-mm.d --serialize-diagnostics /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource17-mm.dia -c /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource17-mm.mm -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource17-mm.o

** BUILD FAILED **


The following build commands failed:
	CompileC /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource6-mm.o /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource6-mm.mm normal x86_64 objective-c++ com.apple.compilers.llvm.clang.1_0.compiler
(1 failure)

Full output: https://webkit-queues.webkit.org/results/10202774
Comment 34 Megan Gardner 2018-11-29 14:19:40 PST
Created attachment 356060 [details]
Patch for landing
Comment 35 WebKit Commit Bot 2018-11-29 14:59:16 PST
Comment on attachment 356060 [details]
Patch for landing

Clearing flags on attachment: 356060

Committed r238697: <https://trac.webkit.org/changeset/238697>
Comment 36 WebKit Commit Bot 2018-11-29 14:59:18 PST
All reviewed patches have been landed.  Closing bug.
Comment 37 Alex Christensen 2018-12-06 15:59:51 PST
Comment on attachment 356060 [details]
Patch for landing

View in context: https://bugs.webkit.org/attachment.cgi?id=356060&action=review

> Source/WebCore/editing/cocoa/DictionaryLookup.mm:53
> +#if !PLATFORM(WATCH)

These should all probably be #if !PLATFORM(WATCHOS) to match all the other instances of PLATFORM(WATCHOS) in WebKit.