Set ComputedStyle on Node and use that in buildOwnLayout()

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index 3983e1b82f1f7f8ba5754617a52b40633a1c087c..2da1ea38908b3df2a778cf2cc424062065290e17 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -627,13 +627,13 @@ void HTMLMediaElement::attach(const AttachContext& context)
 {
     HTMLElement::attach(context);
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
 void HTMLMediaElement::didRecalcStyle(StyleRecalcChange)
 {
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -1057,7 +1057,7 @@ void HTMLMediaElement::loadResource(const WebMediaPlayerSource& source, const Co
     // they are available.
     updateDisplayState();
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -1106,7 +1106,7 @@ void HTMLMediaElement::startPlayerLoad(const KURL& playerProvidedUrl)
         return;
     }
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->setShouldDoFullPaintInvalidation();
     // Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
     m_audioSourceProvider.wrap(m_webMediaPlayer->getAudioSourceProvider());
@@ -1322,7 +1322,7 @@ void HTMLMediaElement::waitForSourceChange()
 
     updateDisplayState();
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -1361,7 +1361,7 @@ void HTMLMediaElement::noneSupported()
     // 7 - Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
     setShouldDelayLoadEvent(false);
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -1596,7 +1596,7 @@ void HTMLMediaElement::setReadyState(ReadyState state)
 
         if (mediaControls())
             mediaControls()->reset();
-        if (layoutObject())
+        if (hasLayoutObject())
             layoutObject()->updateFromElement();
     }
 
@@ -1673,7 +1673,7 @@ void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
         scheduleEvent(EventTypeNames::progress);
         m_previousProgressTime = time;
         m_sentStalledEvent = false;
-        if (layoutObject())
+        if (hasLayoutObject())
             layoutObject()->updateFromElement();
     } else if (timedelta > 3.0 && !m_sentStalledEvent) {
         scheduleEvent(EventTypeNames::stalled);
@@ -2933,7 +2933,7 @@ void HTMLMediaElement::durationChanged(double duration, bool requestSeek)
 
     if (mediaControls())
         mediaControls()->reset();
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 
     if (requestSeek)
@@ -3009,7 +3009,7 @@ void HTMLMediaElement::repaint()
         m_webLayer->invalidate();
 
     updateDisplayState();
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
@@ -3021,7 +3021,7 @@ void HTMLMediaElement::sizeChanged()
     if (m_readyState > HAVE_NOTHING && isHTMLVideoElement())
         scheduleEvent(EventTypeNames::resize);
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -3158,7 +3158,7 @@ void HTMLMediaElement::updatePlayState()
             mediaControls()->playbackStopped();
     }
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 }
 
@@ -3202,7 +3202,7 @@ void HTMLMediaElement::clearMediaPlayer()
     if (mediaControls())
         mediaControls()->refreshCastButtonVisibilityWithoutUpdate();
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
@@ -3227,7 +3227,7 @@ void HTMLMediaElement::stop()
     m_paused = true;
     m_seeking = false;
 
-    if (layoutObject())
+    if (hasLayoutObject())
         layoutObject()->updateFromElement();
 
     stopPeriodicTimers();