Move ObjectContentType entirely to HTMLPlugInElement

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

Index: third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
index 8c1b6ddc052e35a535c7560bb82f73fc3891fd53..2f34c6721fbc50b2efbd784de3f2a755100e74ec 100644
--- a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
@@ -148,11 +148,8 @@ static void MapDataParamToSrc(Vector<String>* param_names,
 // TODO(schenney): crbug.com/572908 This function should not deal with url or
 // serviceType!
 void HTMLObjectElement::ParametersForPlugin(Vector<String>& param_names,
-                                            Vector<String>& param_values,
-                                            String& url,
-                                            String& service_type) {
+                                            Vector<String>& param_values) {
   HashSet<StringImpl*, CaseFoldingHash> unique_param_names;
-  String url_parameter;
 
   // Scan the PARAM children and store their name/value pairs.
   // Get the URL and type from the params if we don't already have them.
@@ -168,35 +165,25 @@ void HTMLObjectElement::ParametersForPlugin(Vector<String>& param_names,
 
     // TODO(schenney): crbug.com/572908 url adjustment does not belong in this
     // function.
-    if (url.IsEmpty() && url_parameter.IsEmpty() &&
-        (DeprecatedEqualIgnoringCase(name, "src") ||
-         DeprecatedEqualIgnoringCase(name, "movie") ||
-         DeprecatedEqualIgnoringCase(name, "code") ||
-         DeprecatedEqualIgnoringCase(name, "url")))
-      url_parameter = StripLeadingAndTrailingHTMLSpaces(p->Value());
+    // HTML5 says that an object resource's URL is specified by the object's
+    // data attribute, not by a param element. However, for compatibility, allow
+    // the resource's URL to be given by a param named "src", "movie", "code" or
+    // "url" if we know that resource points to a plugin.
+    if (url_.IsEmpty() && (DeprecatedEqualIgnoringCase(name, "src") ||
+                           DeprecatedEqualIgnoringCase(name, "movie") ||
+                           DeprecatedEqualIgnoringCase(name, "code") ||
+                           DeprecatedEqualIgnoringCase(name, "url"))) {
+      url_ = StripLeadingAndTrailingHTMLSpaces(p->Value());
+    }
     // TODO(schenney): crbug.com/572908 serviceType calculation does not belong
     // in this function.
-    if (service_type.IsEmpty() && DeprecatedEqualIgnoringCase(name, "type")) {
-      service_type = p->Value();
-      size_t pos = service_type.Find(";");
+    if (service_type_.IsEmpty() && DeprecatedEqualIgnoringCase(name, "type")) {
+      size_t pos = p->Value().Find(";");
       if (pos != kNotFound)
-        service_type = service_type.Left(pos);
+        service_type_ = p->Value().GetString().Left(pos);
     }
   }
 
-  // When OBJECT is used for an applet via Sun's Java plugin, the CODEBASE
-  // attribute in the tag points to the Java plugin itself (an ActiveX
-  // component) while the actual applet CODEBASE is in a PARAM tag. See
-  // <http://java.sun.com/products/plugin/1.2/docs/tags.html>. This means we
-  // have to explicitly suppress the tag's CODEBASE attribute if there is none
-  // in a PARAM, else our Java plugin will misinterpret it. [4004531]
-  String codebase;
-  if (MIMETypeRegistry::IsJavaAppletMIMEType(service_type)) {

[Nate Chapin, 2017/06/08 18:07:02]

This should be unnecessary now that we never instantiated java.

-    codebase = "codebase";
-    unique_param_names.insert(
-        codebase.Impl());  // pretend we found it in a PARAM already
-  }
-
   // Turn the attributes of the <object> element into arrays, but don't override
   // <param> values.
   AttributeCollection attributes = this->Attributes();
@@ -209,17 +196,6 @@ void HTMLObjectElement::ParametersForPlugin(Vector<String>& param_names,
   }
 
   MapDataParamToSrc(&param_names, &param_values);
-
-  // HTML5 says that an object resource's URL is specified by the object's data
-  // attribute, not by a param element. However, for compatibility, allow the
-  // resource's URL to be given by a param named "src", "movie", "code" or "url"
-  // if we know that resource points to a plugin.
-  if (url.IsEmpty() && !url_parameter.IsEmpty()) {
-    KURL completed_url = GetDocument().CompleteURL(url_parameter);
-    bool use_fallback;
-    if (ShouldUsePlugin(completed_url, service_type, false, use_fallback))

[Nate Chapin, 2017/06/08 18:07:02]

I can't find any evidence that we need to check ShouldUsePlugin() here. We'll
just fall back to checking it when RequestObject() is called. Dropping this
allows us to just check url_ and service_type_ directly in
GetObjectContentType() and other places in HTMLPlugInElement.

-      url = url_parameter;
-  }
 }
 
 bool HTMLObjectElement::HasFallbackContent() const {
@@ -292,17 +268,14 @@ void HTMLObjectElement::UpdatePluginInternal() {
     return;
   }
 
-  String url = this->Url();
-  String service_type = service_type_;
-
   // TODO(schenney): crbug.com/572908 These should be joined into a
   // PluginParameters class.
   Vector<String> param_names;
   Vector<String> param_values;
-  ParametersForPlugin(param_names, param_values, url, service_type);
+  ParametersForPlugin(param_names, param_values);
 
   // Note: url is modified above by parametersForPlugin.
-  if (!AllowedToLoadFrameURL(url)) {
+  if (!AllowedToLoadFrameURL(url_)) {
     DispatchErrorEvent();
     return;
   }
@@ -317,13 +290,12 @@ void HTMLObjectElement::UpdatePluginInternal() {
       GetDocument().GetFrame()->Loader().Client()->OverrideFlashEmbedWithHTML(
           GetDocument().CompleteURL(url_));
   if (!overriden_url.IsEmpty()) {
-    url = url_ = overriden_url.GetString();
-    service_type = service_type_ = "text/html";
+    url_ = overriden_url.GetString();
+    service_type_ = "text/html";
   }
 
-  if (!HasValidClassId() ||
-      !RequestObject(url, service_type, param_names, param_values)) {
-    if (!url.IsEmpty())
+  if (!HasValidClassId() || !RequestObject(param_names, param_values)) {
+    if (!url_.IsEmpty())
       DispatchErrorEvent();
     if (HasFallbackContent())
       RenderFallbackContent();