Bug 189605 - REGRESSION (r235954): Fix build failure on watchOS
Summary: REGRESSION (r235954): Fix build failure on watchOS
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: Safari 10
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL:
Keywords: InRadar
Depends on:
Blocks: 189415
  Show dependency treegraph
 
Reported: 2018-09-13 16:41 PDT by David Kilzer (:ddkilzer)
Modified: 2018-09-14 09:39 PDT (History)
11 users (show)

See Also:


Attachments
Patch v1 (30.97 KB, patch)
2018-09-13 16:45 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff
Patch v2 (31.96 KB, patch)
2018-09-13 19:28 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 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
Comment 1 David Kilzer (:ddkilzer) 2018-09-13 16:43:14 PDT
I have a fix.  Sorry I didn't get it prepped in time.
Comment 2 David Kilzer (:ddkilzer) 2018-09-13 16:45:20 PDT
Created attachment 349714 [details]
Patch v1
Comment 3 David Kilzer (:ddkilzer) 2018-09-13 19:28:59 PDT
Created attachment 349725 [details]
Patch v2
Comment 4 Sihui Liu 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?
Comment 5 David Kilzer (:ddkilzer) 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.
Comment 6 Sihui Liu 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.
Comment 7 Geoffrey Garen 2018-09-14 09:11:50 PDT
Comment on attachment 349725 [details]
Patch v2

r=me
Comment 8 WebKit Commit Bot 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>
Comment 9 WebKit Commit Bot 2018-09-14 09:38:28 PDT
All reviewed patches have been landed.  Closing bug.
Comment 10 Radar WebKit Bug Importer 2018-09-14 09:39:59 PDT
<rdar://problem/44459094>