Changeset 216439 in webkit

Timestamp:

May 8, 2017 11:28:23 AM (7 years ago)

Author:

Chris Dumez

Message:

Refactor ImageInputType::width() / height() for clarity
​https://bugs.webkit.org/show_bug.cgi?id=171810

Reviewed by Zalan Bujtas.

Refactor ImageInputType::width() / height() for clarity.

• html/ImageInputType.cpp:

(WebCore::ImageInputType::height):
(WebCore::ImageInputType::width):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/ImageInputType.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-08  Chris Dumez  <cdumez@apple.com>
+
+        Refactor ImageInputType::width() / height() for clarity
+        https://bugs.webkit.org/show_bug.cgi?id=171810
+
+        Reviewed by Zalan Bujtas.
+
+        Refactor ImageInputType::width() / height() for clarity.
+
+        * html/ImageInputType.cpp:
+        (WebCore::ImageInputType::height):
+        (WebCore::ImageInputType::width):
+
 2017-05-08  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/ImageInputType.cpp

@@ -180 +180 @@
     element->document().updateLayout();
 
-    if (!element->renderer()) {
-        // Check the attribute first for an explicit pixel value.
-        if (auto optionalHeight = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
-            return optionalHeight.value();
-
-        // If the image is available, use its height.
-        HTMLImageLoader* imageLoader = element->imageLoader();
-        if (imageLoader && imageLoader->image())
-            return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height().toUnsigned();
-    }
-
-    RenderBox* box = element->renderBox();
-    return box ? adjustForAbsoluteZoom(box->contentHeight(), *box) : 0;
+    if (auto* renderer = element->renderer())
+        return adjustForAbsoluteZoom(downcast<RenderBox>(*renderer).contentHeight(), *renderer);
+
+    // Check the attribute first for an explicit pixel value.
+    if (auto optionalHeight = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
+        return optionalHeight.value();
+
+    // If the image is available, use its height.
+    auto* imageLoader = element->imageLoader();
+    if (imageLoader && imageLoader->image())
+        return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height().toUnsigned();
+
+    return 0;
 }
 
@@ -201 +201 @@
     element->document().updateLayout();
 
-    if (!element->renderer()) {
-        // Check the attribute first for an explicit pixel value.
-        if (auto optionalWidth = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
-            return optionalWidth.value();
-
-        // If the image is available, use its width.
-        HTMLImageLoader* imageLoader = element->imageLoader();
-        if (imageLoader && imageLoader->image())
-            return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width().toUnsigned();
-    }
-
-    RenderBox* box = element->renderBox();
-    return box ? adjustForAbsoluteZoom(box->contentWidth(), *box) : 0;
+    if (auto* renderer = element->renderer())
+        return adjustForAbsoluteZoom(downcast<RenderBox>(*renderer).contentWidth(), *renderer);
+
+    // Check the attribute first for an explicit pixel value.
+    if (auto optionalWidth = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
+        return optionalWidth.value();
+
+    // If the image is available, use its width.
+    auto* imageLoader = element->imageLoader();
+    if (imageLoader && imageLoader->image())
+        return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width().toUnsigned();
+
+    return 0;
 }