Title: [100098] trunk/Source/WebKit/chromium
- Revision
- 100098
- Author
- [email protected]
- Date
- 2011-11-13 19:06:43 -0800 (Sun, 13 Nov 2011)
Log Message
[Chromium] Remove WebFileChooserParams::acceptTypes
https://bugs.webkit.org/show_bug.cgi?id=71998
Reviewed by Darin Fisher.
* public/WebFileChooserParams.h: Remove acceptTypes.
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::runOpenPanel): Remove acceptTypes generatio code.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (100097 => 100098)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 00:02:06 UTC (rev 100097)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 03:06:43 UTC (rev 100098)
@@ -1,3 +1,14 @@
+2011-11-13 Kent Tamura <[email protected]>
+
+ [Chromium] Remove WebFileChooserParams::acceptTypes
+ https://bugs.webkit.org/show_bug.cgi?id=71998
+
+ Reviewed by Darin Fisher.
+
+ * public/WebFileChooserParams.h: Remove acceptTypes.
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::runOpenPanel): Remove acceptTypes generatio code.
+
2011-11-11 Nico Weber <[email protected]>
[chromium] Remove 2 static initializers and 3 exit time destructors. Turn on -Wexit-time-destructors.
Modified: trunk/Source/WebKit/chromium/public/WebFileChooserParams.h (100097 => 100098)
--- trunk/Source/WebKit/chromium/public/WebFileChooserParams.h 2011-11-14 00:02:06 UTC (rev 100097)
+++ trunk/Source/WebKit/chromium/public/WebFileChooserParams.h 2011-11-14 03:06:43 UTC (rev 100098)
@@ -50,12 +50,6 @@
// |initialValue| is a filename which the dialog should select by default.
// It can be an empty string.
WebString initialValue;
- // |acceptTypes| has a comma-separated MIME types such as "audio/*,text/plain".
- // The dialog may restrict selectable files to the specified MIME types.
- // This value comes from an 'accept' attribute value of an INPUT element, so it
- // might be an incorrectly formatted string.
- // DEPRECATED: Use acceptMIMETypes;
- WebString acceptTypes;
// This contains MIME type strings such as "audio/*" "text/plain".
// The dialog may restrict selectable files to the specified MIME types.
// This list comes from an 'accept' attribute value of an INPUT element, and
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (100097 => 100098)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2011-11-14 00:02:06 UTC (rev 100097)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2011-11-14 03:06:43 UTC (rev 100098)
@@ -672,15 +672,6 @@
params.directory = false;
#endif
params.acceptMIMETypes = fileChooser->settings().acceptMIMETypes;
- // FIXME: Remove WebFileChooserParams::acceptTypes.
- StringBuilder builder;
- const Vector<String>& acceptTypeList = fileChooser->settings().acceptMIMETypes;
- for (unsigned i = 0; i < acceptTypeList.size(); ++i) {
- if (i > 0)
- builder.append(',');
- builder.append(acceptTypeList[i]);
- }
- params.acceptTypes = builder.toString();
params.selectedFiles = fileChooser->settings().selectedFiles;
if (params.selectedFiles.size() > 0)
params.initialValue = params.selectedFiles[0];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
