Even more explicit LayoutUnit conversion

third_party/WebKit/Source/core/layout/LayoutMedia.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 34 matching lines @@
 {
     return toHTMLMediaElement(node());
 }
 
 void LayoutMedia::layout()
 {
     LayoutSize oldSize = contentBoxRect().size();
 
     LayoutImage::layout();
 
-    LayoutSize newSize = contentBoxRect().size();
+    LayoutRect newRect = contentBoxRect();
 
     LayoutState state(*this, locationOffset());
 
     // Iterate the children in reverse order so that the media controls are laid
     // out before the text track container. This is to ensure that the text
     // track rendering has an up-to-date position of the media controls for
     // overlap checking, see LayoutVTTCue.
 #if ENABLE(ASSERT)
     bool seenTextTrackContainer = false;
 #endif
     for (LayoutObject* child = m_children.lastChild(); child; child = child->previousSibling()) {
 #if ENABLE(ASSERT)
         if (child->node()->isMediaControls())
             ASSERT(!seenTextTrackContainer);
         else if (child->node()->isTextTrackContainer())
             seenTextTrackContainer = true;
         else
             ASSERT_NOT_REACHED();
 #endif
 
-        if (newSize == oldSize && !child->needsLayout())
+        if (newRect.size() == oldSize && !child->needsLayout())
             continue;
 
         LayoutBox* layoutBox = toLayoutBox(child);
-        layoutBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
+        layoutBox->setLocation(newRect.location());
         // TODO(philipj): Remove the mutableStyleRef() and depend on CSS
         // width/height: inherit to match the media element size.
-        layoutBox->mutableStyleRef().setHeight(Length(newSize.height(), Fixed));
-        layoutBox->mutableStyleRef().setWidth(Length(newSize.width(), Fixed));
+        layoutBox->mutableStyleRef().setHeight(Length(newRect.height(), Fixed));
+        layoutBox->mutableStyleRef().setWidth(Length(newRect.width(), Fixed));
         layoutBox->forceLayout();
     }
 
     clearNeedsLayout();
 
     // Notify our MediaControls that a layout has happened.
-    if (mediaElement() && mediaElement()->mediaControls() && newSize.width() != oldSize.width())
-        mediaElement()->mediaControls()->notifyPanelWidthChanged(newSize.width());
+    if (mediaElement() && mediaElement()->mediaControls() && newRect.width() != oldSize.width())
+        mediaElement()->mediaControls()->notifyPanelWidthChanged(newRect.width());
 }
 
 bool LayoutMedia::isChildAllowed(LayoutObject* child, const ComputedStyle&) const
 {
     // Two types of child layout objects are allowed: media controls
     // and the text track container. Filter children by node type.
     ASSERT(child->node());
 
     // The user agent stylesheet (mediaControls.css) has
     // ::-webkit-media-controls { display: flex; }. If author style
@@ skipping 40 matching lines @@
 
 void LayoutMedia::setRequestPositionUpdates(bool want)
 {
     if (want)
         view()->registerMediaForPositionChangeNotification(*this);
     else
         view()->unregisterMediaForPositionChangeNotification(*this);
 }
 
 } // namespace blink