[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jer.noble at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 679119ca6e56e674ebbd5fb523e90b3089a7d667
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 17:38:08 2010 +0000

    2010-09-11  Jer Noble  <jer.noble at apple.com>
    
            Reviewed by Eric Carlson.
    
            http/tests/media/text-served-as-text.html failing on Windows (Debug+Release)
            https://bugs.webkit.org/show_bug.cgi?id=45603
    
            Disable the eat/text components under Windows the same way as we do on the Mac.
    
            * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
            * platform/graphics/win/QTMovie.cpp:
            * platform/graphics/win/QTMovie.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d00ba0f..2cbab48 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-11  Jer Noble  <jer.noble at apple.com>
+
+        Reviewed by Eric Carlson.
+
+        http/tests/media/text-served-as-text.html failing on Windows (Debug+Release)
+        https://bugs.webkit.org/show_bug.cgi?id=45603
+
+        Disable the eat/text components under Windows the same way as we do on the Mac.
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        * platform/graphics/win/QTMovie.cpp:
+        * platform/graphics/win/QTMovie.h:
+
 2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index e864753..354e0bf 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -298,6 +298,24 @@ void MediaPlayerPrivateQuickTimeVisualContext::setUpCookiesForQuickTime(const St
     }
 }
 
+static void disableComponentsOnce()
+{
+    static bool sComponentsDisabled = false;
+    if (sComponentsDisabled)
+        return;
+    sComponentsDisabled = true;
+
+    uint32_t componentsToDisable[][5] = {
+        {'eat ', 'TEXT', 'text', 0, 0},
+        {'eat ', 'TXT ', 'text', 0, 0},    
+        {'eat ', 'utxt', 'text', 0, 0},  
+        {'eat ', 'TEXT', 'tx3g', 0, 0},  
+    };
+
+    for (size_t i = 0; i < sizeof(componentsToDisable) / sizeof(componentsToDisable[0]); ++i) 
+        QTMovie::disableComponent(componentsToDisable[i]);
+}
+
 void MediaPlayerPrivateQuickTimeVisualContext::load(const String& url)
 {
     if (!QTMovie::initializeQuickTime()) {
@@ -307,6 +325,8 @@ void MediaPlayerPrivateQuickTimeVisualContext::load(const String& url)
         return;
     }
 
+    disableComponentsOnce();
+
     // Initialize the task timer.
     MediaPlayerPrivateTaskTimer::initialize();
 
diff --git a/WebCore/platform/graphics/win/QTMovie.cpp b/WebCore/platform/graphics/win/QTMovie.cpp
index f48ddc5..375d8c2 100644
--- a/WebCore/platform/graphics/win/QTMovie.cpp
+++ b/WebCore/platform/graphics/win/QTMovie.cpp
@@ -280,6 +280,16 @@ QTMovie::~QTMovie()
     delete m_private;
 }
 
+void QTMovie::disableComponent(uint32_t cd[5])
+{
+    ComponentDescription nullDesc = {'null', 'base', kAppleManufacturer, 0, 0};
+    Component nullComp = FindNextComponent(0, &nullDesc);
+    Component disabledComp = 0;
+
+    while (disabledComp = FindNextComponent(disabledComp, (ComponentDescription*)&cd[0]))
+        CaptureComponent(disabledComp, nullComp);
+}
+
 void QTMovie::addClient(QTMovieClient* client)
 {
     if (client)
diff --git a/WebCore/platform/graphics/win/QTMovie.h b/WebCore/platform/graphics/win/QTMovie.h
index 470e0e9..e205b68 100644
--- a/WebCore/platform/graphics/win/QTMovie.h
+++ b/WebCore/platform/graphics/win/QTMovie.h
@@ -62,6 +62,8 @@ public:
     static bool initializeQuickTime();
     static void taskTimerFired();
 
+    static void disableComponent(uint32_t[5]);
+
     QTMovie(QTMovieClient*);
     ~QTMovie();
 

-- 
WebKit Debian packaging