Changeset 183705 in webkit

Timestamp:

May 1, 2015, 6:11:28 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Postpone caption style sheet creation
​https://bugs.webkit.org/show_bug.cgi?id=144499

Reviewed by Simon Fraser.
Source/WebCore:

Generating and inserting the caption user style sheet is expensive so don't do it until
we see a text track, and only do it for the first video element in a PageGroup.

Test: media/track/track-user-stylesheet.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::registerWithDocument): Only register for caption preferences
changes if we have done so before.
(WebCore::HTMLMediaElement::unregisterWithDocument): Only unregister for caption preferences
changes if we registered for them.
(WebCore::HTMLMediaElement::addTextTrack): Register for caption preference changes.

• html/HTMLMediaElement.h:

• page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges): Only
generate the style sheet when called for the first time.

LayoutTests:

• media/track/track-user-stylesheet-expected.txt: Added.
• media/track/track-user-stylesheet.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-user-stylesheet-expected.txt (added)
• LayoutTests/media/track/track-user-stylesheet.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-01  Eric Carlson  <eric.carlson@apple.com>
+
+        Postpone caption style sheet creation
+        https://bugs.webkit.org/show_bug.cgi?id=144499
+
+        Reviewed by Simon Fraser.
+
+        * media/track/track-user-stylesheet-expected.txt: Added.
+        * media/track/track-user-stylesheet.html: Added.
+
 2015-05-01  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-01  Eric Carlson  <eric.carlson@apple.com>
+
+        Postpone caption style sheet creation
+        https://bugs.webkit.org/show_bug.cgi?id=144499
+
+        Reviewed by Simon Fraser.
+        
+        Generating and inserting the caption user style sheet is expensive so don't do it until
+        we see a text track, and only do it for the first video element in a PageGroup.
+
+        Test: media/track/track-user-stylesheet.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::registerWithDocument): Only register for caption preferences
+        changes if we have done so before.
+        (WebCore::HTMLMediaElement::unregisterWithDocument): Only unregister for caption preferences
+        changes if we registered for them.
+        (WebCore::HTMLMediaElement::addTextTrack): Register for caption preference changes.
+        * html/HTMLMediaElement.h:
+
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges): Only
+        generate the style sheet when called for the first time.
+
 2015-05-01  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -449 +449 @@
 
 #if ENABLE(VIDEO_TRACK)
-    document.registerForCaptionPreferencesChangedCallbacks(this);
+    if (m_requireCaptionPreferencesChangedCallbacks)
+        document.registerForCaptionPreferencesChangedCallbacks(this);
 #endif
 
@@ -476 +477 @@
 
 #if ENABLE(VIDEO_TRACK)
-    document.unregisterForCaptionPreferencesChangedCallbacks(this);
+    if (m_requireCaptionPreferencesChangedCallbacks)
+        document.unregisterForCaptionPreferencesChangedCallbacks(this);
 #endif
 
@@ -3363 +3365 @@
     if (!RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
         return;
+
+    if (!m_requireCaptionPreferencesChangedCallbacks) {
+        m_requireCaptionPreferencesChangedCallbacks = true;
+        document().registerForCaptionPreferencesChangedCallbacks(this);
+    }
 
     textTracks()->append(track);

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -885 +885 @@
     CueList m_currentlyActiveCues;
     int m_ignoreTrackDisplayUpdate;
+
+    bool m_requireCaptionPreferencesChangedCallbacks { false };
 #endif
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -186 +186 @@
 void CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges()
 {
+    if (m_listeningForPreferenceChanges)
+        return;
+
     if (!MediaAccessibilityLibrary())
         return;
@@ -192 +195 @@
         return;
 
-    if (!m_listeningForPreferenceChanges) {
-        m_listeningForPreferenceChanges = true;
-        m_registeringForNotification = true;
-        CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, userCaptionPreferencesChangedNotificationCallback, kMAXCaptionAppearanceSettingsChangedNotification, 0, CFNotificationSuspensionBehaviorCoalesce);
-        m_registeringForNotification = false;
-    }
+    m_listeningForPreferenceChanges = true;
+    m_registeringForNotification = true;
+    CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, userCaptionPreferencesChangedNotificationCallback, kMAXCaptionAppearanceSettingsChangedNotification, 0, CFNotificationSuspensionBehaviorCoalesce);
+    m_registeringForNotification = false;
 
     // Generating and registering the caption stylesheet can be expensive and this method is called indirectly when the parser creates an audio or
     // video element, so do it after a brief pause.
-    if (m_updateStyleSheetTimer.isActive())
-        m_updateStyleSheetTimer.stop();
     m_updateStyleSheetTimer.startOneShot(0);
 }