Merge 132398

Source/WebCore/rendering/RenderVideo.cpp

Index: Source/WebCore/rendering/RenderVideo.cpp
===================================================================
--- Source/WebCore/rendering/RenderVideo.cpp	(revision 132816)
+++ Source/WebCore/rendering/RenderVideo.cpp	(working copy)
@@ -195,13 +195,10 @@
     if (Frame* frame = this->frame())
         page = frame->page();
 
-    if (!displayingPoster) {
-        if (!mediaPlayer) {
-            if (page && paintInfo.phase == PaintPhaseForeground)
-                page->addRelevantUnpaintedObject(this, visualOverflowRect());
-            return;
-        }
-        updatePlayer();
+    if (!displayingPoster && !mediaPlayer) {
+        if (page && paintInfo.phase == PaintPhaseForeground)
+            page->addRelevantUnpaintedObject(this, visualOverflowRect());
+        return;
     }
 
     LayoutRect rect = videoBox();