Changeset 82863 in webkit

Timestamp:

Apr 4, 2011 1:35:42 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-04 David Dorwin <​ddorwin@chromium.org>

Reviewed by David Levin.

Chromium Mac crashes when entering fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=57483

Override extraFullScreenStyleSheet in RenderThemeChromiumMac to avoid hitting the ASSERT_NOT_REACHED in RenderThemeMac.

• WebCore.gyp/WebCore.gyp:
• rendering/RenderThemeChromiumMac.h:
• rendering/RenderThemeChromiumMac.mm: (WebCore::RenderThemeChromiumMac::extraFullScreenStyleSheet):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (1 diff)
• rendering/RenderThemeChromiumMac.h (modified) (1 diff)
• rendering/RenderThemeChromiumMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-04  David Dorwin  <ddorwin@chromium.org>
+
+        Reviewed by David Levin.
+
+        Chromium Mac crashes when entering fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=57483
+
+        Override extraFullScreenStyleSheet in RenderThemeChromiumMac to avoid hitting the ASSERT_NOT_REACHED in RenderThemeMac.
+
+        * WebCore.gyp/WebCore.gyp:
+        * rendering/RenderThemeChromiumMac.h:
+        * rendering/RenderThemeChromiumMac.mm:
+        (WebCore::RenderThemeChromiumMac::extraFullScreenStyleSheet):
+
 2011-04-04  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -640 +640 @@
             '../css/mediaControlsChromium.css',
             '../css/fullscreen.css',
+            # Skip fullscreenQuickTime.
           ],
           'outputs': [

trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h

@@ -41 +41 @@
     virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
     virtual String extraMediaControlsStyleSheet();
-
+#if ENABLE(FULLSCREEN_API)
+    virtual String extraFullScreenStyleSheet();
+#endif
+  
     virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
     virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);

trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm

@@ -136 +136 @@
 }
 
+#if ENABLE(FULLSCREEN_API)
+String RenderThemeChromiumMac::extraFullScreenStyleSheet()
+{
+    // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
+    return String();
+}
+#endif
+
 bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {