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

third_party/WebKit/Source/core/layout/LayoutVideo.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 72 matching lines @@
     // Spec text from 4.8.6
     //
     // The intrinsic width of a video element's playback area is the intrinsic width
     // of the video resource, if that is available; otherwise it is the intrinsic
     // width of the poster frame, if that is available; otherwise it is 300 CSS pixels.
     //
     // The intrinsic height of a video element's playback area is the intrinsic height
     // 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);
     }
 
     if (video->shouldDisplayPosterImage() && !m_cachedImageSize.isEmpty() && !imageResource()->errorOccurred())
         return m_cachedImageSize;
 
     // <video> in standalone media documents should not use the default 300x150
     // size since they also have audio-only files. By setting the intrinsic
@@ skipping 140 matching lines @@
     if (element->isFullscreen() && element->usesOverlayFullscreenVideo())
         return CompositingReasonVideo;
 
     if (shouldDisplayVideo() && supportsAcceleratedRendering())
         return CompositingReasonVideo;
 
     return CompositingReasonNone;
 }
 
 } // namespace blink