Changeset 170908 in webkit

Timestamp:

Jul 8, 2014, 9:53:03 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] user caption preferences not applied
​https://bugs.webkit.org/show_bug.cgi?id=134599

Reviewed by Sam Weinig.

• page/CaptionUserPreferences.cpp:

(WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride): All Pages in a PageGroup
do not necessarily use the same PageUserContentController, so apply and remove caption user
the style sheet directly to each page rather than to the page group.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferences.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-08  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] user caption preferences not applied
+        https://bugs.webkit.org/show_bug.cgi?id=134599
+
+        Reviewed by Sam Weinig.
+
+        * page/CaptionUserPreferences.cpp:
+        (WebCore::CaptionUserPreferences::updateCaptionStyleSheetOveride): All Pages in a PageGroup
+        do not necessarily use the same PageUserContentController, so apply and remove caption user
+        the style sheet directly to each page rather than to the page group.
+
 2014-07-08  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/page/CaptionUserPreferences.cpp

@@ -34 +34 @@
 #include "Settings.h"
 #include "TextTrackList.h"
+#include "UserContentController.h"
 #include "UserStyleSheetTypes.h"
 
@@ -240 +241 @@
     DEPRECATED_DEFINE_STATIC_LOCAL(URL, captionsStyleSheetURL, (ParsedURLString, "user-captions-override:01F6AF12-C3B0-4F70-AF5E-A3E00234DC23"));
 
-    m_pageGroup.removeUserStyleSheetFromWorld(mainThreadNormalWorld(), captionsStyleSheetURL);
+    auto& pages = m_pageGroup.pages();
+    for (auto& page : pages) {
+        if (auto* pageUserContentController = page->userContentController())
+            pageUserContentController->removeUserStyleSheet(mainThreadNormalWorld(), captionsStyleSheetURL);
+    }
 
     String captionsOverrideStyleSheet = captionsStyleSheetOverride();
@@ -246 +251 @@
         return;
 
-    m_pageGroup.addUserStyleSheetToWorld(mainThreadNormalWorld(), captionsOverrideStyleSheet, captionsStyleSheetURL, Vector<String>(),
-        Vector<String>(), InjectInAllFrames, UserStyleAuthorLevel, InjectInExistingDocuments);
+    for (auto& page : pages) {
+        if (auto* pageUserContentController = page->userContentController()) {
+            auto userStyleSheet = std::make_unique<UserStyleSheet>(captionsOverrideStyleSheet, captionsStyleSheetURL, Vector<String>(), Vector<String>(), InjectInAllFrames, UserStyleAuthorLevel);
+            pageUserContentController->addUserStyleSheet(mainThreadNormalWorld(), std::move(userStyleSheet), InjectInExistingDocuments);
+        }
+    }
 }