Bug 189605

Summary: REGRESSION (r235954): Fix build failure on watchOS
Product: WebKit Reporter: David Kilzer (:ddkilzer) <ddkilzer>
Component: WebKit Misc.Assignee: David Kilzer (:ddkilzer) <ddkilzer>
Status: RESOLVED FIXED    
Severity: Normal CC: achristensen, alecflett, beidson, cdumez, commit-queue, ews-watchlist, ggaren, jsbell, sihui_liu, thorton, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: Safari 10   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 189415    
Attachments:
Description Flags
Patch v1
none
Patch v2 none

David Kilzer (:ddkilzer)
Reported 2018-09-13 16:41:13 PDT
Fix build failure on watchOS: error: reference to 'KeyType' is ambiguous A header in IMFoundation.framework and `using WebCore::IndexedDB::KeyType` in Source/WebCore/Modules/indexeddb/IDBKey.h are conflicting with unified source files. Note that r235954 was rolled out in r235995, so this isn't needed until r235954 is relanded: https://trac.webkit.org/changeset/235995/webkit
Attachments
Patch v1 (30.97 KB, patch)
2018-09-13 16:45 PDT, David Kilzer (:ddkilzer) 		no flags
DetailsFormatted DiffDiff
Patch v2 (31.96 KB, patch)
2018-09-13 19:28 PDT, David Kilzer (:ddkilzer) 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
David Kilzer (:ddkilzer)
Comment 1 2018-09-13 16:43:14 PDT
I have a fix. Sorry I didn't get it prepped in time.
David Kilzer (:ddkilzer)
Comment 2 2018-09-13 16:45:20 PDT
Created attachment 349714 [details] Patch v1
David Kilzer (:ddkilzer)
Comment 3 2018-09-13 19:28:59 PDT
Created attachment 349725 [details] Patch v2
Sihui Liu
Comment 4 2018-09-14 00:33:21 PDT
(In reply to David Kilzer (:ddkilzer) from comment #3) > Created attachment 349725 [details] > Patch v2 Thanks for doing this! Do you think I should merge it into r235954, or you commit this before my resubmitting r235954?
David Kilzer (:ddkilzer)
Comment 5 2018-09-14 05:13:01 PDT
(In reply to Sihui Liu from comment #4) > (In reply to David Kilzer (:ddkilzer) from comment #3) > > Created attachment 349725 [details] > > Patch v2 > > Thanks for doing this! Do you think I should merge it into r235954, or you > commit this before my resubmitting r235954? I would commit it separately. Makes it easier to roll-in/roll-out r235954 just in case there's another build failure.
Sihui Liu
Comment 6 2018-09-14 08:22:33 PDT
(In reply to David Kilzer (:ddkilzer) from comment #5) > (In reply to Sihui Liu from comment #4) > > (In reply to David Kilzer (:ddkilzer) from comment #3) > > > Created attachment 349725 [details] > > > Patch v2 > > > > Thanks for doing this! Do you think I should merge it into r235954, or you > > commit this before my resubmitting r235954? > > I would commit it separately. Makes it easier to roll-in/roll-out r235954 > just in case there's another build failure. Great! Thanks.
Geoffrey Garen
Comment 7 2018-09-14 09:11:50 PDT
Comment on attachment 349725 [details] Patch v2 r=me
WebKit Commit Bot
Comment 8 2018-09-14 09:38:26 PDT
Comment on attachment 349725 [details] Patch v2 Clearing flags on attachment: 349725 Committed r236007: <https://trac.webkit.org/changeset/236007>
WebKit Commit Bot
Comment 9 2018-09-14 09:38:28 PDT
All reviewed patches have been landed. Closing bug.
Radar WebKit Bug Importer
Comment 10 2018-09-14 09:39:59 PDT
<rdar://problem/44459094>
Note You need to log in before you can comment on or make changes to this bug.