Changeset 167514 in webkit
- Timestamp:
- Apr 18, 2014 4:11:06 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r167512 r167514 1 2014-04-18 Joseph Pecoraro <pecoraro@apple.com> 2 3 Correct some issues small issues in WK2 file upload InjectedBundle APIs 4 https://bugs.webkit.org/show_bug.cgi?id=131852 5 6 Reviewed by Dan Bernstein. 7 8 * WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h: 9 (API::InjectedBundle::PageUIClient::shouldGenerateFileForUpload): 10 The default return value, meaning no, should return the null string. The 11 result is checked later, and null string is a special value meaning no. 12 13 * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: 14 (WebKit::InjectedBundlePageUIClient::generateFileForUpload): 15 Pre-check for the correct client function we will use. 16 1 17 2014-04-18 Andy Estes <aestes@apple.com> 2 18 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h
r166879 r167514 57 57 virtual void pageDidScroll(WebKit::WebPage*) { } 58 58 59 virtual WTF::String shouldGenerateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return emptyString(); }59 virtual WTF::String shouldGenerateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return WTF::String(); } 60 60 virtual WTF::String generateFileForUpload(WebKit::WebPage*, const WTF::String& originalFilePath) { UNUSED_PARAM(originalFilePath); return emptyString(); } 61 61 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
r166879 r167514 102 102 String InjectedBundlePageUIClient::generateFileForUpload(WebPage* page, const String& originalFilePath) 103 103 { 104 if (!m_client. shouldGenerateFileForUpload)104 if (!m_client.generateFileForUpload) 105 105 return String(); 106 106 RefPtr<API::String> generatedFilePath = adoptRef(toImpl(m_client.generateFileForUpload(toAPI(page), toAPI(originalFilePath.impl()), m_client.base.clientInfo)));
Note: See TracChangeset
for help on using the changeset viewer.