Title: [92009] trunk/Source/WebCore
- Revision
- 92009
- Author
- [email protected]
- Date
- 2011-07-29 14:29:01 -0700 (Fri, 29 Jul 2011)
Log Message
2011-07-29 Eric Carlson <[email protected]>
Load delegate not consulted before loading some poster images
https://bugs.webkit.org/show_bug.cgi?id=65270
Reviewed by Joseph Pecoraro.
* html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::setDisplayMode): Don't ask a load delegate if it is OK to
load an empty poster url.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92008 => 92009)
--- trunk/Source/WebCore/ChangeLog 2011-07-29 21:17:21 UTC (rev 92008)
+++ trunk/Source/WebCore/ChangeLog 2011-07-29 21:29:01 UTC (rev 92009)
@@ -1,3 +1,14 @@
+2011-07-29 Eric Carlson <[email protected]>
+
+ Load delegate not consulted before loading some poster images
+ https://bugs.webkit.org/show_bug.cgi?id=65270
+
+ Reviewed by Joseph Pecoraro.
+
+ * html/HTMLVideoElement.cpp:
+ (WebCore::HTMLVideoElement::setDisplayMode): Don't ask a load delegate if it is OK to
+ load an empty poster url.
+
2011-07-29 Jeff Miller <[email protected]>
Re-sort one more file in the WebCore project with Visual Studio.
Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (92008 => 92009)
--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2011-07-29 21:17:21 UTC (rev 92008)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2011-07-29 21:29:01 UTC (rev 92009)
@@ -198,9 +198,13 @@
HTMLMediaElement::setDisplayMode(mode);
if (player() && player()->canLoadPoster()) {
- Frame* frame = document()->frame();
- FrameLoader* loader = frame ? frame->loader() : 0;
- if (loader && loader->willLoadMediaElementURL(poster))
+ bool canLoad = true;
+ if (!poster.isEmpty()) {
+ Frame* frame = document()->frame();
+ FrameLoader* loader = frame ? frame->loader() : 0;
+ canLoad = loader && loader->willLoadMediaElementURL(poster);
+ }
+ if (canLoad)
player()->setPoster(poster);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
