Changeset 129001 in webkit

Timestamp:

Sep 19, 2012 7:11:48 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] remove static_cast which will cause video crash
​https://bugs.webkit.org/show_bug.cgi?id=97070

Patch by Jonathan Dong <Jonathan Dong> on 2012-09-19
Reviewed by Antonio Gomes.

Removed the static_cast to avoid layering violation which
will cause a runtime crash.
We won't create a real MediaPlayerPrivate object before we call
MediaPlayer::load(), so if we use player()->implementation()
before calling load() in some cases, it points to a
NullMediaPlayerPrivate object. Here we should not use static_cast,
instead we should use HTMLMediaElement::percentLoaded() to
avoid layering violation as we don't have the buffering bug which
the deleted comment refers to.

Internally reviewed by Max Feil.

Test case: media/video-size.html

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/RenderThemeBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [BlackBerry] remove static_cast which will cause video crash
+        https://bugs.webkit.org/show_bug.cgi?id=97070
+
+        Reviewed by Antonio Gomes.
+
+        Removed the static_cast to avoid layering violation which
+        will cause a runtime crash.
+        We won't create a real MediaPlayerPrivate object before we call
+        MediaPlayer::load(), so if we use player()->implementation()
+        before calling load() in some cases, it points to a
+        NullMediaPlayerPrivate object. Here we should not use static_cast,
+        instead we should use HTMLMediaElement::percentLoaded() to
+        avoid layering violation as we don't have the buffering bug which
+        the deleted comment refers to.
+
+        Internally reviewed by Max Feil.
+
+        Test case: media/video-size.html
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):
+
 2012-09-19  Rick Byers  <rbyers@chromium.org>
 

trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp

@@ -922 +922 @@
 
     float fullScreenMultiplier = determineFullScreenMultiplier(mediaElement);
-    float loaded = 0;
-    // FIXME: replace loaded with commented out one when buffer bug is fixed (see comment in
-    // MediaPlayerPrivateMMrenderer::percentLoaded).
-    // loaded = mediaElement->percentLoaded();
-    if (mediaElement->player() && mediaElement->player()->implementation())
-        loaded = static_cast<MediaPlayerPrivate *>(mediaElement->player()->implementation())->percentLoaded();
+    float loaded = mediaElement->percentLoaded();
     float position = mediaElement->duration() > 0 ? (mediaElement->currentTime() / mediaElement->duration()) : 0;