Changeset 66652 in webkit

Timestamp:

Sep 2, 2010 2:32:05 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-09-02 Jer Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

WebKit should not accept PDFs as video.
​https://bugs.webkit.org/show_bug.cgi?id=45013

The code in MediaPlayerPrivate::createQTMovie has been re-arranged.
First, the component disabling is done only once. In 64-bit QTKit will
store the list of disabled components and disable them once QTKitServer
starts, so there is no need to disable them repeatedly. However,
because of a bug in 64-bit QTKit, additional requests of the exact same
component description will be ignored if QTKitServer is not yet running.
To work around this, we must provide the exact component flags for each
eat/PDF and grip/PDF component we wish to disable.

• platform/graphics/mac/MediaPlayerPrivateQTKit.mm: (WebCore::disableComponentsOnce): Added. (WebCore::MediaPlayerPrivate::createQTMovie): Moved the component

disabling code into disableComponentsOnce.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-02  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit should not accept PDFs as video.
+        https://bugs.webkit.org/show_bug.cgi?id=45013
+
+        The code in MediaPlayerPrivate::createQTMovie has been re-arranged.
+        First, the component disabling is done only once. In 64-bit QTKit will
+        store the list of disabled components and disable them once QTKitServer
+        starts, so there is no need to disable them repeatedly.  However,
+        because of a bug in 64-bit QTKit, additional requests of the exact same
+        component description will be ignored if QTKitServer is not yet running.
+        To work around this, we must provide the exact component flags for each
+        eat/PDF and grip/PDF component we wish to disable.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::disableComponentsOnce): Added.
+        (WebCore::MediaPlayerPrivate::createQTMovie): Moved the component
+            disabling code into disableComponentsOnce.
+
 2010-09-02  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -262 +262 @@
 }
 
-void MediaPlayerPrivate::createQTMovie(NSURL *url, NSDictionary *movieAttributes)
-{
-    // We must disable components each time we open a movie because we cannot guarantee
-    // that the QTKitServer process hasn't disappeared on us.  eat/PDF and grip/PDF 
-    // components must be disabled twice since they are registered twice with different
-    // flags:
-    uint32_t componentsToDisable[9][5] = {
+static void disableComponentsOnce()
+{
+    static bool sComponentsDisabled = false;
+    if (sComponentsDisabled)
+        return;
+    sComponentsDisabled = true;
+
+    // eat/PDF and grip/PDF components must be disabled twice since they are registered twice
+    // with different flags.  However, there is currently a bug in 64-bit QTKit (<rdar://problem/8378237>)
+    // which causes subsequent disable component requests of exactly the same type to be ignored if
+    // QTKitServer has not yet started.  As a result, we must pass in exactly the flags we want to
+    // disable per component.  As a failsafe, if in the future these flags change, we will disable the
+    // PDF components for a third time with a wildcard flags field:
+    uint32_t componentsToDisable[11][5] = {
         {'eat ', 'TEXT', 'text', 0, 0},
         {'eat ', 'TXT ', 'text', 0, 0},    
         {'eat ', 'utxt', 'text', 0, 0},  
         {'eat ', 'TEXT', 'tx3g', 0, 0},  
+        {'eat ', 'PDF ', 'vide', 0x44802, 0},
+        {'eat ', 'PDF ', 'vide', 0x45802, 0},
         {'eat ', 'PDF ', 'vide', 0, 0},  
-        {'eat ', 'PDF ', 'vide', 0, 0},  
-        {'grip', 'PDF ', 'appl', 0, 0},  
+        {'grip', 'PDF ', 'appl', 0x844a00, 0},
+        {'grip', 'PDF ', 'appl', 0x845a00, 0},
         {'grip', 'PDF ', 'appl', 0, 0},  
         {'imdc', 'pdf ', 'appl', 0, 0},  
     };
+
     for (size_t i = 0; i < sizeof(componentsToDisable)/sizeof(componentsToDisable[0]); ++i) 
-         wkQTMovieDisableComponent(componentsToDisable[i]);
+        wkQTMovieDisableComponent(componentsToDisable[i]);
+}
+
+void MediaPlayerPrivate::createQTMovie(NSURL *url, NSDictionary *movieAttributes)
+{
+    disableComponentsOnce();
 
     [[NSNotificationCenter defaultCenter] removeObserver:m_objcObserver.get()];