Changeset 167514 in webkit

Timestamp:

Apr 18, 2014 4:11:06 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Correct some issues small issues in WK2 file upload InjectedBundle APIs
​https://bugs.webkit.org/show_bug.cgi?id=131852

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-04-18
Reviewed by Dan Bernstein.

• WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:

(API::InjectedBundle::PageUIClient::shouldGenerateFileForUpload):
The default return value, meaning no, should return the null string. The
result is checked later, and null string is a special value meaning no.

• WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:

(WebKit::InjectedBundlePageUIClient::generateFileForUpload):
Pre-check for the correct client function we will use.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Correct some issues small issues in WK2 file upload InjectedBundle APIs
+        https://bugs.webkit.org/show_bug.cgi?id=131852
+
+        Reviewed by Dan Bernstein.
+
+        * WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
+        (API::InjectedBundle::PageUIClient::shouldGenerateFileForUpload):
+        The default return value, meaning no, should return the null string. The
+        result is checked later, and null string is a special value meaning no.
+
+        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+        (WebKit::InjectedBundlePageUIClient::generateFileForUpload):
+        Pre-check for the correct client function we will use.
+
 2014-04-18  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h

@@ -57 +57 @@
     virtual void pageDidScroll(WebKit::WebPage*) { }
 
-    virtual WTF::String shouldGenerateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return emptyString(); }
+    virtual WTF::String shouldGenerateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return WTF::String(); }
     virtual WTF::String generateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return emptyString(); }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp

@@ -102 +102 @@
 String InjectedBundlePageUIClient::generateFileForUpload(WebPage* page, const String& originalFilePath)
 {
-    if (!m_client.shouldGenerateFileForUpload)
+    if (!m_client.generateFileForUpload)
         return String();
     RefPtr<API::String> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));