[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 50a5de375699902792f045e4526f2851b967899d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 31 17:58:35 2010 +0000

    2010-12-31  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Eric Seidel.
    
            Make retrieving extraMediaControlsStyleSheet be page dependent.
            https://bugs.webkit.org/show_bug.cgi?id=51752
    
            Use themeForPage to retrieve extraMediaControlsStyleSheet for media
            controls.
    
            No new tests because no platform-specific theme implementation uses
            the passed page pointer yet.
    
            * css/CSSStyleSelector.cpp:
            (WebCore::CSSStyleSelector::styleForElement):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 778dc26..35e160b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-31  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Make retrieving extraMediaControlsStyleSheet be page dependent.
+        https://bugs.webkit.org/show_bug.cgi?id=51752
+
+        Use themeForPage to retrieve extraMediaControlsStyleSheet for media
+        controls.
+
+        No new tests because no platform-specific theme implementation uses
+        the passed page pointer yet.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleForElement):
+
 2010-12-31  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index d2645d9..edb216f 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -1260,7 +1260,7 @@ PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* e, RenderStyl
     static bool loadedMediaStyleSheet;
     if (!loadedMediaStyleSheet && (e->hasTagName(videoTag) || e->hasTagName(audioTag))) {
         loadedMediaStyleSheet = true;
-        String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::defaultTheme()->extraMediaControlsStyleSheet();
+        String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(e->document()->page())->extraMediaControlsStyleSheet();
         CSSStyleSheet* mediaControlsSheet = parseUASheet(mediaRules);
         defaultStyle->addRulesFromSheet(mediaControlsSheet, screenEval());
         defaultPrintStyle->addRulesFromSheet(mediaControlsSheet, printEval());

-- 
WebKit Debian packaging