Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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

 /*
  * Copyright (C) 2006, 2007, 2008, 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 276 matching lines @@
     if (!m_imageSizeIsKnown || imageFitsInWindow())
         return;
 
     m_shouldShrinkImage = !m_shouldShrinkImage;
 
     if (m_shouldShrinkImage) {
         windowSizeChanged(ScaleZoomedDocument);
     } else {
         restoreImageSize(ScaleZoomedDocument);
 
-        updateLayout();
+        updateStyleAndLayout();
 
         double scale = this->scale();
 
         double scrollX = x / scale - static_cast<double>(frame()->view()->width()) / 2;
         double scrollY = y / scale - static_cast<double>(frame()->view()->height()) / 2;
 
         frame()->view()->setScrollPosition(DoublePoint(scrollX, scrollY), ProgrammaticScroll);
     }
 }
 
 void ImageDocument::imageUpdated()
 {
     ASSERT(m_imageElement);
 
     if (m_imageSizeIsKnown)
         return;
 
-    updateLayoutTree();
+    updateStyleAndLayoutTree();
     if (!m_imageElement->cachedImage() || m_imageElement->cachedImage()->imageSize(LayoutObject::shouldRespectImageOrientation(m_imageElement->layoutObject()), pageZoomFactor(this)).isEmpty())
         return;
 
     m_imageSizeIsKnown = true;
 
     if (shouldShrinkToFit()) {
         // Force resizing of the image
         windowSizeChanged(ScaleOnlyUnzoomedDocument);
     }
 }
@@ skipping 117 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener) const
 {
     if (const ImageEventListener* imageEventListener = ImageEventListener::cast(&listener))
         return m_doc == imageEventListener->m_doc;
     return false;
 }
 
 } // namespace blink