Rename imageSizeForLayoutObject() to imageSize()

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2381 matching lines @@
 bool LayoutObject::isRooted() const
 {
     const LayoutObject* object = this;
     while (object->parent() && !object->hasLayer())
         object = object->parent();
     if (object->hasLayer())
         return toLayoutBoxModelObject(object)->layer()->root()->isRootLayer();
     return false;
 }
 
-RespectImageOrientationEnum LayoutObject::shouldRespectImageOrientation() const
+RespectImageOrientationEnum LayoutObject::shouldRespectImageOrientation(const LayoutObject* layoutObject)
 {
+    if (!layoutObject)
+        return DoNotRespectImageOrientation;
+
     // Respect the image's orientation if it's being used as a full-page image or
     // it's an <img> and the setting to respect it everywhere is set or the <img>
     // has image-orientation: from-image style. FIXME: crbug.com/498233
-    if (document().isImageDocument())
+    if (layoutObject->document().isImageDocument())
         return RespectImageOrientation;
 
-    if (!isHTMLImageElement(node()))
+    if (!isHTMLImageElement(layoutObject->node()))
         return DoNotRespectImageOrientation;
 
-    if (document().settings() && document().settings()->shouldRespectImageOrientation())
+    if (layoutObject->document().settings() && layoutObject->document().settings()->shouldRespectImageOrientation())
         return RespectImageOrientation;
 
-    if (style() && style()->respectImageOrientation() == RespectImageOrientation)
+    if (layoutObject->style() && layoutObject->style()->respectImageOrientation() == RespectImageOrientation)
         return RespectImageOrientation;
 
     return DoNotRespectImageOrientation;
 }
 
 LayoutObject* LayoutObject::container(const LayoutBoxModelObject* paintInvalidationContainer, bool* paintInvalidationContainerSkipped) const
 {
     if (paintInvalidationContainerSkipped)
         *paintInvalidationContainerSkipped = false;
 
@@ skipping 1073 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif