diff options
| author | Ben Murdoch <benm@google.com> | 2012-01-11 10:54:53 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-13 10:09:03 +0100 |
| commit | 16e49e63e74d9236b0d8b72846201697a8ebaedc (patch) | |
| tree | f7a2226792e2d34fed9a65bc6986b120bd0a1277 /Source/WebCore/rendering | |
| parent | b62fb73a22ae38019efcdb050bf61e0e22327b9d (diff) | |
| download | external_webkit-16e49e63e74d9236b0d8b72846201697a8ebaedc.zip external_webkit-16e49e63e74d9236b0d8b72846201697a8ebaedc.tar.gz external_webkit-16e49e63e74d9236b0d8b72846201697a8ebaedc.tar.bz2 | |
Add support for HTML Media Capture "capture" attribute.
Add support in WebKit for the newly specified "capture"
attribute to be used on HTML file pickers. Maintains
support for the legacy implementation of the API
(a MIME type parameter on the 'accept' attribute) for
backwards compatibility. Note the 'capture' attribute takes
precedent over a MIME type parameter.
See http://www.w3.org/TR/html-media-capture/#captureparam
for details.
Requires changes in the framework
(I494adc1274ca21ce8fe52a6c7b6b758217927e66)
and Browser (I38dfe2df043fdba1388384dbd3b5370737eb38e5).
Bug: 5771207
Change-Id: I0a921be31fda79a43c05da4fe22d9c808d92709c
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderFileUploadControl.cpp | 7 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderFileUploadControl.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderFileUploadControl.cpp b/Source/WebCore/rendering/RenderFileUploadControl.cpp index 8056662..109d219 100644 --- a/Source/WebCore/rendering/RenderFileUploadControl.cpp +++ b/Source/WebCore/rendering/RenderFileUploadControl.cpp @@ -122,6 +122,13 @@ String RenderFileUploadControl::acceptTypes() return static_cast<HTMLInputElement*>(node())->accept(); } +#if ENABLE(MEDIA_CAPTURE) +String RenderFileUploadControl::capture() +{ + return static_cast<HTMLInputElement*>(node())->capture(); +} +#endif + void RenderFileUploadControl::chooseIconForFiles(FileChooser* chooser, const Vector<String>& filenames) { if (Chrome* chromePointer = chrome()) diff --git a/Source/WebCore/rendering/RenderFileUploadControl.h b/Source/WebCore/rendering/RenderFileUploadControl.h index e9fb7f0..b57260d 100644 --- a/Source/WebCore/rendering/RenderFileUploadControl.h +++ b/Source/WebCore/rendering/RenderFileUploadControl.h @@ -68,6 +68,9 @@ private: #endif String acceptTypes(); void chooseIconForFiles(FileChooser*, const Vector<String>&); +#if ENABLE(MEDIA_CAPTURE) + String capture(); +#endif Chrome* chrome() const; int maxFilenameWidth() const; |