Move the common parsing logic for intrinsicSize attribute to a shared namespace

The logic for parsing intrinsicSize attribute is shared among
HTML{Image,Video}Element and SVGImageElement. Moving it to
blink/core/html/media/media_element_parser_helpers to avoidredundant
code.

Bug: 874629
Change-Id: I20e1dc6b626eb86e8919c621b1c98401eaa9d201
Reviewed-on: https://chromium-review.googlesource.com/1217163Reviewed-by: Steve Kobes <skobes@chromium.org>
Commit-Queue: Luna Lu <loonybear@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590008}

third_party/blink/renderer/core/html/BUILD.gn

@@ -489,6 +489,8 @@ blink_core_sources("html") {
     "media/media_custom_controls_fullscreen_detector.h",
     "media/media_document.cc",
     "media/media_document.h",
+    "media/media_element_parser_helpers.cc",
+    "media/media_element_parser_helpers.h",
     "media/media_error.h",
     "media/media_fragment_uri_parser.cc",
     "media/media_fragment_uri_parser.h",

third_party/blink/renderer/core/html/html_image_element.cc

@@ -41,6 +41,7 @@
 #include "third_party/blink/renderer/core/html/html_image_fallback_helper.h"
 #include "third_party/blink/renderer/core/html/html_picture_element.h"
 #include "third_party/blink/renderer/core/html/html_source_element.h"
+#include "third_party/blink/renderer/core/html/media/media_element_parser_helpers.h"
 #include "third_party/blink/renderer/core/html/parser/html_parser_idioms.h"
 #include "third_party/blink/renderer/core/html/parser/html_srcset_parser.h"
 #include "third_party/blink/renderer/core/html_names.h"
@@ -292,7 +293,18 @@ void HTMLImageElement::ParseAttribute(
   } else if (name == intrinsicsizeAttr &&
              RuntimeEnabledFeatures::
                  ExperimentalProductivityFeaturesEnabled()) {
-    ParseIntrinsicSizeAttribute(params.new_value);
+    String message;
+    bool intrinsic_size_changed =
+        MediaElementParserHelpers::ParseIntrinsicSizeAttribute(
+            params.new_value, &overridden_intrinsic_size_, &message);
+    if (!message.IsEmpty()) {
+      GetDocument().AddConsoleMessage(ConsoleMessage::Create(
+          kOtherMessageSource, kWarningMessageLevel, message));
+    }
+
+    if (intrinsic_size_changed && GetLayoutObject() &&
+        GetLayoutObject()->IsLayoutImage())
+      ToLayoutImage(GetLayoutObject())->IntrinsicSizeChanged();
   } else {
     HTMLElement::ParseAttribute(params);
   }
@@ -589,31 +601,6 @@ IntSize HTMLImageElement::GetOverriddenIntrinsicSize() const {
   return overridden_intrinsic_size_;
 }
 
-void HTMLImageElement::ParseIntrinsicSizeAttribute(const String& value) {
-  unsigned new_width = 0, new_height = 0;
-  Vector<String> size;
-  value.Split('x', size);
-  if (!value.IsEmpty() &&
-      (size.size() != 2 ||
-       !ParseHTMLNonNegativeInteger(size.at(0), new_width) ||
-       !ParseHTMLNonNegativeInteger(size.at(1), new_height))) {
-    GetDocument().AddConsoleMessage(
-        ConsoleMessage::Create(kOtherMessageSource, kWarningMessageLevel,
-                               "Unable to parse intrinsicSize: expected "
-                               "[unsigned] x [unsigned], got " +
-                                   value));
-    new_width = 0;
-    new_height = 0;
-  }
-
-  IntSize new_size(new_width, new_height);
-  if (overridden_intrinsic_size_ != new_size) {
-    overridden_intrinsic_size_ = new_size;
-    if (GetLayoutObject() && GetLayoutObject()->IsLayoutImage())
-      ToLayoutImage(GetLayoutObject())->IntrinsicSizeChanged();
-  }
-}
-
 KURL HTMLImageElement::Src() const {
   return GetDocument().CompleteURL(getAttribute(srcAttr));
 }

third_party/blink/renderer/core/html/html_image_element.h

@@ -224,8 +224,6 @@ class CORE_EXPORT HTMLImageElement final
   void NotifyViewportChanged();
   void CreateMediaQueryListIfDoesNotExist();
 
-  void ParseIntrinsicSizeAttribute(const String& value);
-
   Member<HTMLImageLoader> image_loader_;
   Member<ViewportChangeListener> listener_;
   Member<HTMLFormElement> form_;

third_party/blink/renderer/core/html/media/html_video_element.cc

@@ -41,6 +41,7 @@
 #include "third_party/blink/renderer/core/fullscreen/fullscreen.h"
 #include "third_party/blink/renderer/core/fullscreen/fullscreen_options.h"
 #include "third_party/blink/renderer/core/html/media/media_custom_controls_fullscreen_detector.h"
+#include "third_party/blink/renderer/core/html/media/media_element_parser_helpers.h"
 #include "third_party/blink/renderer/core/html/media/media_remoting_interstitial.h"
 #include "third_party/blink/renderer/core/html/media/picture_in_picture_interstitial.h"
 #include "third_party/blink/renderer/core/html/parser/html_parser_idioms.h"
@@ -211,7 +212,18 @@ void HTMLVideoElement::ParseAttribute(
   } else if (params.name == intrinsicsizeAttr &&
              RuntimeEnabledFeatures::
                  ExperimentalProductivityFeaturesEnabled()) {
-    ParseIntrinsicSizeAttribute(params.new_value);
+    String message;
+    bool intrinsic_size_changed =
+        MediaElementParserHelpers::ParseIntrinsicSizeAttribute(
+            params.new_value, &overridden_intrinsic_size_, &message);
+    if (!message.IsEmpty()) {
+      GetDocument().AddConsoleMessage(ConsoleMessage::Create(
+          kOtherMessageSource, kWarningMessageLevel, message));
+    }
+
+    if (intrinsic_size_changed && GetLayoutObject() &&
+        GetLayoutObject()->IsVideo())
+      ToLayoutVideo(GetLayoutObject())->IntrinsicSizeChanged();
   } else {
     HTMLMediaElement::ParseAttribute(params);
   }
@@ -242,31 +254,6 @@ IntSize HTMLVideoElement::GetOverriddenIntrinsicSize() const {
   return overridden_intrinsic_size_;
 }
 
-void HTMLVideoElement::ParseIntrinsicSizeAttribute(const String& value) {
-  unsigned new_width = 0, new_height = 0;
-  Vector<String> size;
-  value.Split('x', size);
-  if (!value.IsEmpty() &&
-      (size.size() != 2 ||
-       !ParseHTMLNonNegativeInteger(size.at(0), new_width) ||
-       !ParseHTMLNonNegativeInteger(size.at(1), new_height))) {
-    GetDocument().AddConsoleMessage(
-        ConsoleMessage::Create(kOtherMessageSource, kWarningMessageLevel,
-                               "Unable to parse intrinsicSize: expected "
-                               "[unsigned] x [unsigned], got " +
-                                   value));
-    new_width = 0;
-    new_height = 0;
-  }
-
-  IntSize new_size(new_width, new_height);
-  if (overridden_intrinsic_size_ != new_size) {
-    overridden_intrinsic_size_ = new_size;
-    if (GetLayoutObject() && GetLayoutObject()->IsVideo())
-      ToLayoutVideo(GetLayoutObject())->IntrinsicSizeChanged();
-  }
-}
-
 bool HTMLVideoElement::IsURLAttribute(const Attribute& attribute) const {
   return attribute.GetName() == posterAttr ||
          HTMLMediaElement::IsURLAttribute(attribute);

third_party/blink/renderer/core/html/media/html_video_element.h

@@ -220,8 +220,6 @@ class CORE_EXPORT HTMLVideoElement final : public HTMLMediaElement,
   void DidMoveToNewDocument(Document& old_document) override;
   void SetDisplayMode(DisplayMode) override;
 
-  void ParseIntrinsicSizeAttribute(const String& value);
-
   Member<HTMLImageLoader> image_loader_;
   Member<MediaCustomControlsFullscreenDetector>
       custom_controls_fullscreen_detector_;

third_party/blink/renderer/core/html/media/media_element_parser_helpers.cc

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/blink/renderer/core/html/media/media_element_parser_helpers.h"
+#include "third_party/blink/renderer/core/html/parser/html_parser_idioms.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
+#include "third_party/blink/renderer/platform/wtf/vector.h"
+
+namespace blink {
+
+namespace MediaElementParserHelpers {
+
+bool ParseIntrinsicSizeAttribute(const String& value,
+                                 IntSize* intrinsic_size,
+                                 String* message) {
+  unsigned new_width = 0, new_height = 0;
+  Vector<String> size;
+  value.Split('x', size);
+  if (!value.IsEmpty() &&
+      (size.size() != 2 ||
+       !ParseHTMLNonNegativeInteger(size.at(0), new_width) ||
+       !ParseHTMLNonNegativeInteger(size.at(1), new_height))) {
+    *message =
+        "Unable to parse intrinsicSize: expected [unsigned] x [unsigned]"
+        ", got " +
+        value;
+    new_width = 0;
+    new_height = 0;
+  }
+  IntSize new_size(new_width, new_height);
+  if (*intrinsic_size != new_size) {
+    *intrinsic_size = new_size;
+    return true;
+  }
+  return false;
+}
+
+}  // namespace MediaElementParserHelpers
+
+}  // namespace blink

third_party/blink/renderer/core/html/media/media_element_parser_helpers.h

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_MEDIA_MEDIA_ELEMENT_PARSER_HELPERS_H_
+#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_MEDIA_MEDIA_ELEMENT_PARSER_HELPERS_H_
+
+#include "third_party/blink/renderer/platform/geometry/int_size.h"
+
+namespace blink {
+
+namespace MediaElementParserHelpers {
+
+// Parses the intrinsicSize attribute of HTMLImageElement, HTMLVideoElement, and
+// SVGImageElement. Returns true if the value is updated.
+// https://github.com/ojanvafai/intrinsicsize-attribute/blob/master/README.md
+bool ParseIntrinsicSizeAttribute(const String& value,
+                                 IntSize* intrinsic_size,
+                                 String* message);
+
+}  // namespace MediaElementParserHelpers
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_HTML_MEDIA_MEDIA_ELEMENT_PARSER_HELPERS_H_