Rename imageSizeForLayoutObject() to imageSize()

third_party/WebKit/Source/modules/imagebitmap/WindowImageBitmapFactories.cpp

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fileapi/Blob.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
+#include "core/layout/LayoutObject.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
 #include "platform/SharedBuffer.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/ImageSource.h"
 #include "public/platform/WebSize.h"
 #include <v8.h>
 
 namespace blink {
 
 static LayoutSize sizeFor(HTMLImageElement* image)
 {
-    if (ImageResource* cachedImage = image->cachedImage())
-        return cachedImage->imageSizeForLayoutObject(image->layoutObject(), 1.0f); // FIXME: Not sure about this.
+    if (ImageResource* cachedImage = image->cachedImage()) {
+        LayoutObject* layoutObject = image->layoutObject();
+        RespectImageOrientationEnum shouldRespectImageOrientation =
+            layoutObject ? layoutObject->shouldRespectImageOrientation() : DoNotRespectImageOrientation;
+        return cachedImage->imageSize(shouldRespectImageOrientation, 1.0f); // FIXME: Not sure about this.

[Yoav Weiss, 2015/11/24 10:29:07]

ditto

[davve, 2015/11/24 12:49:13]

If I had such a function, yes. (again)

+    }
     return LayoutSize();
 }
 
 static IntSize sizeFor(HTMLVideoElement* video)
 {
     if (WebMediaPlayer* webMediaPlayer = video->webMediaPlayer())
         return webMediaPlayer->naturalSize();
     return IntSize();
 }
 
@@ skipping 108 matching lines @@
     if (!sw || !sh) {
         exceptionState.throwDOMException(IndexSizeError, String::format("The source %s provided is 0.", sw ? "height" : "width"));
         return ScriptPromise();
     }
 
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
     return fulfillImageBitmap(scriptState, canvas->isPaintable() ? ImageBitmap::create(canvas, IntRect(sx, sy, sw, sh)) : nullptr);
 }
 
 } // namespace blink