Removed clientHeight() from MediaControlsPainter.

Source/core/paint/MediaControlsPainter.cpp

 /*
  * Copyright (C) 2009 Apple Inc.
  * Copyright (C) 2009 Google 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.
@@ skipping 154 matching lines @@
 
     if (!hasSource(mediaElement) || !mediaElement->togglePlayStateWillPlay())
         return false;
 
     static Image* mediaOverlayPlay = platformResource("mediaplayerOverlayPlay",
         "mediaplayerOverlayPlayNew");
 
     IntRect buttonRect(rect);
     if (RuntimeEnabledFeatures::newMediaPlaybackUiEnabled()) {
         // Overlay play button covers the entire player, so center and draw a
-        // smaller button.  Center in the entire element.
-        int mediaHeight = mediaElement->clientHeight();
+        // smaller button.  Center in the entire element.  Do not trigger
+        // a relayout here.
+        const LayoutSize& layoutSize = mediaElement->cachedLayoutSize();
+        if (layoutSize.isEmpty())
+            return false;
+        int mediaHeight = layoutSize.height();
+
+        // Adjust for effective zoom.
+        if (mediaElement->layoutObject() && mediaElement->layoutObject()->style())

[fs, 2015/08/18 07:39:41]

I'm not sure in what cases mediaElement wouldn't have a LayoutObject here seems
unlikely. The style() null-check is unnecessary (you can use styleRef() here
instead).

[liberato (no reviews please), 2015/08/18 16:26:41]

all of this code has been removed.

+            mediaHeight = ceil(mediaHeight / mediaElement->layoutObject()->style()->effectiveZoom());
+
         buttonRect.setX(rect.center().x() - mediaOverlayPlayButtonWidthNew / 2);
         buttonRect.setY(rect.center().y() - mediaOverlayPlayButtonHeightNew / 2
             + (mediaHeight - rect.height()) / 2);
         buttonRect.setWidth(mediaOverlayPlayButtonWidthNew);
         buttonRect.setHeight(mediaOverlayPlayButtonHeightNew);
     }
 
     return paintMediaButton(paintInfo.context, buttonRect, mediaOverlayPlay);
 }
 
@@ skipping 380 matching lines @@
     }
 
     float zoomLevel = style.effectiveZoom();
     if (thumbImage) {
         style.setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
         style.setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
     }
 }
 
 } // namespace blink