Rename enums/functions that collide in chromium style in core/html/.

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

Index: third_party/WebKit/Source/core/layout/LayoutVideo.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutVideo.cpp b/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
index f6638f17b9bdb83310cd26dd53eca440bfd9deaf..7c04530985119d4ff3801ab74874bbe0b6a7e542 100644
--- a/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutVideo.cpp
@@ -90,7 +90,7 @@ LayoutSize LayoutVideo::calculateIntrinsicSize()
     // of the video resource, if that is available; otherwise it is the intrinsic
     // height of the poster frame, if that is available; otherwise it is 150 CSS pixels.
     WebMediaPlayer* webMediaPlayer = mediaElement()->webMediaPlayer();
-    if (webMediaPlayer && video->readyState() >= HTMLVideoElement::HAVE_METADATA) {
+    if (webMediaPlayer && video->getReadyState() >= HTMLVideoElement::HAVE_METADATA) {
         IntSize size = webMediaPlayer->naturalSize();
         if (!size.isEmpty())
             return LayoutSize(size);