Bug 134599 – [iOS] user caption preferences not applied

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Eric Carlson]

The stylesheet generated from user preferences isn't used on iOS when in WK2 mode.

[Eric Carlson]

This is fallout from r162395, because not every Page in a PageGroup uses the same UserContentController.

[Eric Carlson]

Created attachment 234355 [details]
Proposed patch.

[Anders Carlsson]

Comment on attachment 234355 [details]
Proposed patch.

This needs to be done by user caption preferences, not in PageGroup. We're trying to get rid of as much of page group as possible.

[Eric Carlson]

Created attachment 234593 [details]
Proposed patch.

[Build Bot]

Comment on attachment 234593 [details]
Proposed patch.

Attachment 234593 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/5717610662461440

New failing tests:
media/W3C/video/src/src_reflects_attribute_not_source_elements.html

[Build Bot]

Created attachment 234610 [details]
Archive of layout-test-results from webkit-ews-10 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-10  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5

[Sam Weinig]

Comment on attachment 234593 [details]
Proposed patch.

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

> Source/WebCore/page/CaptionUserPreferences.cpp:256
> +            pageUserContentController->addUserStyleSheet(mainThreadNormalWorld(), std::move(userStyleSheet), InjectInExistingDocuments);

I don't think you need to explicitly use std::move here.

[Eric Carlson]

(In reply to comment #7)
> (From update of attachment 234593 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=234593&action=review
> 
> > Source/WebCore/page/CaptionUserPreferences.cpp:256
> > +            pageUserContentController->addUserStyleSheet(mainThreadNormalWorld(), std::move(userStyleSheet), InjectInExistingDocuments);
> 
> I don't think you need to explicitly use std::move here.

It looks like it is necessary.

[WebKit Commit Bot]

Comment on attachment 234593 [details]
Proposed patch.

Clearing flags on attachment: 234593

Committed r170908: <http://trac.webkit.org/changeset/170908>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.