Bug 207514 – Deprecate _WKUserContentWorld replaced by WKContentWorld

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit API

[Alex Christensen]

And add some SPI to aid with transition.

[Alex Christensen]

Created attachment 390309 [details]
patch

[Alex Christensen]

Created attachment 390310 [details]
patch with changelog

[Alex Christensen]

Created attachment 390311 [details]
patch

[Sam Weinig]

Is this being renamed because ContentWorlds extend the functionality beyond the user origin (origin in the sense of https://developer.mozilla.org/en-US/docs/Web/CSS/Cascade#Origin_of_CSS_declarations)? e.g. does this allow modifying the user-agent or author origin?

[Alex Christensen]

That sounds like a good question to ask in the internal review process that settled on that name, or in https://bugs.webkit.org/show_bug.cgi?id=207351 where the API was introduced.  I think it was because of confusion as to who the "User" is in this case, but I can't recall.

[WebKit Commit Bot]

Comment on attachment 390311 [details]
patch

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

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=390311&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=207514&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 390311 from bug 207514.
Fetching: https://bugs.webkit.org/attachment.cgi?id=390311
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Brady Eidson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 17 diffs from patch file(s).
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/Shared/Cocoa/APIObject.mm
patching file Source/WebKit/UIProcess/API/APIContentWorld.cpp
patching file Source/WebKit/UIProcess/API/APIContentWorld.h
patching file Source/WebKit/UIProcess/API/APIUserContentWorld.cpp
patching file Source/WebKit/UIProcess/API/APIUserContentWorld.h
patching file Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm
patching file Source/WebKit/UIProcess/API/Cocoa/WKContentWorldInternal.h
patching file Source/WebKit/UIProcess/API/Cocoa/WKContentWorldPrivate.h
patching file Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm
patching file Source/WebKit/UIProcess/API/Cocoa/WKUserScript.mm
patching file Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h
patching file Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm
patching file Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h
patching file Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h
patching file Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
patching file Source/WebKit/WebKit.xcodeproj/project.pbxproj
Hunk #1 FAILED at 1726.
Hunk #2 FAILED at 4988.
Hunk #3 succeeded at 6965 (offset 8 lines).
Hunk #4 succeeded at 11232 (offset 14 lines).
2 out of 4 hunks FAILED -- saving rejects to file Source/WebKit/WebKit.xcodeproj/project.pbxproj.rej

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

Full output: https://webkit-queues.webkit.org/results/13320786

[Sam Weinig]

(In reply to Alex Christensen from comment #5)
> That sounds like a good question to ask in the internal review process that
> settled on that name, or in https://bugs.webkit.org/show_bug.cgi?id=207351
> where the API was introduced.  I think it was because of confusion as to who
> the "User" is in this case, but I can't recall.

Sorry, I must have missed those. So what is the answer? Does it extend it beyond User?

[Alex Christensen]

I told you everything I know in comment 5.  This question is also not relevant to this patch, which takes an existing API and makes a transition path to it.

Committed to http://trac.webkit.org/r256332

[Radar WebKit Bug Importer]

<rdar://problem/59357037>

[Alex Christensen]

http://trac.webkit.org/r256345

[Ryan Haddad]

Reverted r256345 for reason:

Broke iOS builds.

Committed r256373: <https://trac.webkit.org/changeset/256373>

[Ryan Haddad]

(In reply to Ryan Haddad from comment #11)
> Reverted r256345 for reason:
> 
> Broke iOS builds.
> 
> Committed r256373: <https://trac.webkit.org/changeset/256373>
https://build.webkit.org/builders/Apple%20iOS%2013%20Simulator%20Release%20%28Build%29/builds/3897

[Alex Christensen]

https://trac.webkit.org/changeset/256376/webkit

[Alex Christensen]

Reopening to attach new patch.

[Alex Christensen]

Created attachment 390452 [details]
Patch

[Alex Christensen]

http://trac.webkit.org/r256561