Changeset 66997 in webkit

Timestamp:

Sep 8, 2010 11:17:25 AM (14 years ago)

Author:

aestes@apple.com

Message:

Incorporate additional feedback from
​https://bugs.webkit.org/show_bug.cgi?id=45364.

Rubber-stamped by Darin Adler.

• html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::parametersForPlugin): Rename urlParam to
urlParameter.

• loader/SubframeLoader.h: Add argument names to the definition of

SubframeLoader::resourceWillUsePlugin().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (3 diffs)
• loader/SubframeLoader.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-08  Andy Estes  <aestes@apple.com>
+
+        Rubber-stamped by Darin Adler.
+
+        Incorporate additional feedback from
+        https://bugs.webkit.org/show_bug.cgi?id=45364.
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::parametersForPlugin): Rename urlParam to
+        urlParameter.
+        * loader/SubframeLoader.h: Add argument names to the definition of
+        SubframeLoader::resourceWillUsePlugin().
+
 2010-09-07  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/html/HTMLObjectElement.cpp

@@ -164 +164 @@
 {
     HashSet<StringImpl*, CaseFoldingHash> uniqueParamNames;
-    String urlParam;
+    String urlParameter;
     
     // Scan the PARAM children and store their name/value pairs.
@@ -182 +182 @@
 
         // FIXME: url adjustment does not belong in this function.
-        if (url.isEmpty() && urlParam.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url")))
-            urlParam = deprecatedParseURL(p->value());
+        if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url")))
+            urlParameter = deprecatedParseURL(p->value());
         // FIXME: serviceType calculation does not belong in this function.
         if (serviceType.isEmpty() && equalIgnoringCase(name, "type")) {
@@ -223 +223 @@
     // resource's URL to be given by a param named "src", "movie", "code" or "url"
     // if we know that resource points to a plug-in.
-    if (url.isEmpty() && !urlParam.isEmpty()) {
+    if (url.isEmpty() && !urlParameter.isEmpty()) {
         SubframeLoader* loader = document()->frame()->loader()->subframeLoader();
-        if (loader->resourceWillUsePlugin(urlParam, serviceType))
-            url = urlParam;
+        if (loader->resourceWillUsePlugin(urlParameter, serviceType))
+            url = urlParameter;
     }
 }

trunk/WebCore/loader/SubframeLoader.h

@@ -77 +77 @@
     bool containsPlugins() const { return m_containsPlugins; }
     
-    bool resourceWillUsePlugin(const String&, const String&);
+    bool resourceWillUsePlugin(const String& url, const String& mimeType);
 
 private: