Changeset 66622 in webkit

Timestamp:

Sep 1, 2010 3:55:53 PM (14 years ago)

Author:

jer.noble@apple.com

Message:

2010-08-31 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

QuickTime will accept a PDF as the source for a movie, and happily
convert that PDF into a .mov. WebKit should disable the eat and grip
PDF components which allow this.

Test: http/tests/media/pdf-served-as-pdf.html

• platform/graphics/mac/MediaPlayerPrivateQTKit.mm: (WebCore::MediaPlayerPrivate::createQTMovie): Add PDF eat and grip components to the components which are disabled before opening a QTMovie.

2010-08-31 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

Added a new test, similar to the text-served-as-text.html test, which
expects an error thrown when a PDF is set as the source of a <video>
element.

• http/tests/media/pdf-served-as-pdf-expected.txt: Added.
• http/tests/media/pdf-served-as-pdf.html: Added.
• http/tests/media/resources/test.pdf: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/pdf-served-as-pdf-expected.txt (added)
• LayoutTests/http/tests/media/pdf-served-as-pdf.html (added)
• LayoutTests/http/tests/media/resources/test.pdf (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-31  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
+        
+        Added a new test, similar to the text-served-as-text.html test, which
+        expects an error thrown when a PDF is set as the source of a <video>
+        element.
+
+        * http/tests/media/pdf-served-as-pdf-expected.txt: Added.
+        * http/tests/media/pdf-served-as-pdf.html: Added.
+        * http/tests/media/resources/test.pdf: Added.
+
 2010-09-01  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-31  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
+        
+        QuickTime will accept a PDF as the source for a movie, and happily
+        convert that PDF into a .mov.  WebKit should disable the eat and grip
+        PDF components which allow this.
+
+        Test: http/tests/media/pdf-served-as-pdf.html
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivate::createQTMovie): Add PDF eat and grip
+        components to the components which are disabled before opening a 
+        QTMovie.
+
 2010-09-01  Rob Buis  <rwlbuis@gmail.com>
 

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

@@ -265 +265 @@
 {
     // We must disable components each time we open a movie because we cannot guarantee
-    // that the QTKitServer process hasn't disappeared on us:
-    uint32_t componentsToDisable[4][5] = {
+    // 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] = {
         {'eat ', 'TEXT', 'text', 0, 0},
         {'eat ', 'TXT ', 'text', 0, 0},    
         {'eat ', 'utxt', 'text', 0, 0},  
         {'eat ', 'TEXT', 'tx3g', 0, 0},  
+        {'eat ', 'PDF ', 'vide', 0, 0},  
+        {'eat ', 'PDF ', 'vide', 0, 0},  
+        {'grip', 'PDF ', 'appl', 0, 0},  
+        {'grip', 'PDF ', 'appl', 0, 0},  
+        {'imdc', 'pdf ', 'appl', 0, 0},  
     };
     for (size_t i = 0; i < sizeof(componentsToDisable)/sizeof(componentsToDisable[0]); ++i)