Changeset 116592 in webkit
- Timestamp:
- May 9, 2012 6:21:14 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r116584 r116592 1 2012-05-09 Adam Barth <abarth@webkit.org> 2 3 Implement HTML Media Capture 4 https://bugs.webkit.org/show_bug.cgi?id=85958 5 6 Reviewed by Eric Seidel. 7 8 * fast/forms/file/file-input-capture-expected.txt: Added. 9 * fast/forms/file/file-input-capture.html: Added. 10 - Test that the capture attribute works properly. 11 * platform/chromium/test_expectations.txt: 12 * platform/efl/Skipped: 13 * platform/gtk/test_expectations.txt: 14 * platform/mac/Skipped: 15 * platform/qt/Skipped: 16 * platform/win/Skipped: 17 - Skip the test on all platforms. The feature is enabled only on 18 Android, which isn't yet able to run LayoutTests upstream. 19 1 20 2012-05-09 Tony Gentilcore <tonyg@chromium.org> 2 21 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r116571 r116592 3930 3930 BUGWK85951 WIN DEBUG : fast/css/hover-update.html = TEXT PASS 3931 3931 3932 // Requires ENABLE(MEDIA_CAPTURE) 3933 BUGWK85958 : fast/forms/file/file-input-capture.html = TEXT 3934 3932 3935 BUGWK85952 MAC WIN : http/tests/media/media-source/webm/video-media-source-play.html = PASS TIMEOUT 3933 3936 BUGWK85952 WIN : http/tests/media/media-source/webm/video-media-source-seek.html = PASS TIMEOUT -
trunk/LayoutTests/platform/efl/Skipped
r116571 r116592 1942 1942 media/media-can-play-flac-audio.html 1943 1943 1944 # Requires ENABLE(MEDIA_CAPTURE) 1945 fast/forms/file/file-input-capture.html 1946 1944 1947 # The inner <input> should now grow to take the full cell's height. 1945 1948 fast/table/colspanMinWidth-vertical.html -
trunk/LayoutTests/platform/gtk/test_expectations.txt
r116571 r116592 1329 1329 BUGWK84778 : ietestcenter/css3/multicolumn/column-width-negative-001.htm = IMAGE 1330 1330 1331 // Requires ENABLE(MEDIA_CAPTURE) 1332 BUGWK85958 : fast/forms/file/file-input-capture.html = TEXT 1333 1331 1334 // Generate results for your platform(s) 1332 1335 BUGWK85567 : fast/images/png-suite/test.html = IMAGE -
trunk/LayoutTests/platform/mac/Skipped
r116563 r116592 816 816 media/audio-repaint.html 817 817 818 # Requires ENABLE(MEDIA_CAPTURE) 819 fast/forms/file/file-input-capture.html 820 818 821 # https://bugs.webkit.org/show_bug.cgi?id=85522 819 822 http/tests/security/sandboxed-iframe-modify-self.html -
trunk/LayoutTests/platform/qt/Skipped
r116563 r116592 2529 2529 http/tests/inspector/network/network-initiator.html 2530 2530 2531 # Requires ENABLE(MEDIA_CAPTURE) 2532 fast/forms/file/file-input-capture.html 2533 2531 2534 # [Qt] ietestcenter/css3/flexbox tests fail on 32 bit 2532 2535 # https://bugs.webkit.org/show_bug.cgi?id=85596 -
trunk/LayoutTests/platform/win/Skipped
r116563 r116592 1719 1719 fast/table/colspanMinWidth-vertical.html 1720 1720 1721 # Requires ENABLE(MEDIA_CAPTURE) 1722 fast/forms/file/file-input-capture.html 1723 1721 1724 # This should only be a layer change. 1722 1725 # http://webkit.org/b/82129 -
trunk/Source/WebCore/ChangeLog
r116591 r116592 1 2012-05-09 Adam Barth <abarth@webkit.org> 2 3 Implement HTML Media Capture 4 https://bugs.webkit.org/show_bug.cgi?id=85958 5 6 Reviewed by Eric Seidel. 7 8 This patch begins the implementation of 9 http://www.w3.org/TR/html-media-capture/ by adding the capture 10 attribute to HTMLInputElement. 11 12 Test: fast/forms/file/file-input-capture.html 13 14 * html/FileInputType.cpp: 15 (WebCore::FileInputType::handleDOMActivateEvent): 16 * html/HTMLAttributeNames.in: 17 * html/HTMLInputElement.cpp: 18 (WebCore): 19 (WebCore::HTMLInputElement::capture): 20 (WebCore::HTMLInputElement::setCapture): 21 * html/HTMLInputElement.h: 22 (HTMLInputElement): 23 * html/HTMLInputElement.idl: 24 * platform/FileChooser.h: 25 (FileChooserSettings): 26 1 27 2012-05-09 Charles Wei <charles.wei@torchmobile.com.cn> 2 28 -
trunk/Source/WebCore/html/FileInputType.cpp
r116277 r116592 189 189 settings.acceptMIMETypes = input->acceptMIMETypes(); 190 190 settings.selectedFiles = m_fileList->paths(); 191 #if ENABLE(MEDIA_CAPTURE) 192 settings.capture = input->capture(); 193 #endif 191 194 chrome->runOpenPanel(input->document()->frame(), newFileChooser(settings)); 192 195 } -
trunk/Source/WebCore/html/HTMLAttributeNames.in
r116384 r116592 59 59 border 60 60 bordercolor 61 capture 61 62 cellpadding 62 63 cellspacing -
trunk/Source/WebCore/html/HTMLInputElement.cpp
r116499 r116592 1838 1838 } 1839 1839 1840 #if ENABLE(MEDIA_CAPTURE) 1841 String HTMLInputElement::capture() const 1842 { 1843 if (!isFileUpload()) 1844 return String(); 1845 1846 String capture = fastGetAttribute(captureAttr).lower(); 1847 if (capture == "camera" 1848 || capture == "camcorder" 1849 || capture == "microphone" 1850 || capture == "filesystem") 1851 return capture; 1852 1853 return "filesystem"; 1854 } 1855 1856 void HTMLInputElement::setCapture(const String& value) 1857 { 1858 setAttribute(captureAttr, value); 1859 } 1860 1861 #endif 1862 1840 1863 bool HTMLInputElement::isInRequiredRadioButtonGroup() const 1841 1864 { -
trunk/Source/WebCore/html/HTMLInputElement.h
r116499 r116592 242 242 String defaultToolTip() const; 243 243 244 #if ENABLE(MEDIA_CAPTURE) 245 String capture() const; 246 void setCapture(const String& value); 247 #endif 248 244 249 static const int maximumLength; 245 250 -
trunk/Source/WebCore/html/HTMLInputElement.idl
r116389 r116592 116 116 #endif 117 117 118 // See http://www.w3.org/TR/html-media-capture/ 119 attribute [Conditional=MEDIA_CAPTURE] DOMString capture; 118 120 }; 119 121 } -
trunk/Source/WebCore/platform/FileChooser.h
r110557 r116592 57 57 Vector<String> acceptMIMETypes; 58 58 Vector<String> selectedFiles; 59 #if ENABLE(MEDIA_CAPTURE) 60 String capture; 61 #endif 59 62 }; 60 63 -
trunk/Source/WebKit/chromium/ChangeLog
r116587 r116592 1 2012-05-09 Adam Barth <abarth@webkit.org> 2 3 Implement HTML Media Capture 4 https://bugs.webkit.org/show_bug.cgi?id=85958 5 6 Reviewed by Eric Seidel. 7 8 * features.gypi: 9 * public/WebFileChooserParams.h: 10 (WebFileChooserParams): 11 * src/ChromeClientImpl.cpp: 12 (WebKit::ChromeClientImpl::runOpenPanel): 13 1 14 2012-05-09 Dana Jansens <danakj@chromium.org> 2 15 -
trunk/Source/WebKit/chromium/features.gypi
r116474 r116592 72 72 'ENABLE_LINK_PREFETCH=1', 73 73 'ENABLE_LINK_PRERENDER=1', 74 'ENABLE_MEDIA_CAPTURE=0', 74 75 'ENABLE_MEDIA_SOURCE=1', 75 76 'ENABLE_MEDIA_STATISTICS=1', … … 140 141 'feature_defines': [ 141 142 'ENABLE_CALENDAR_PICKER=0', 143 'ENABLE_MEDIA_CAPTURE=1', 142 144 'ENABLE_PAGE_POPUP=0', 143 145 'ENABLE_WEB_AUDIO=0', -
trunk/Source/WebKit/chromium/public/WebFileChooserParams.h
r101122 r116592 63 63 // before opening a file chooser dialog. 64 64 WebVector<WebString> selectedFiles; 65 // See http://www.w3.org/TR/html-media-capture/ for the semantics of the 66 // capture attribute. This string will either be empty (meaning the feature 67 // is disabled) or one of the following values: 68 // - filesystem (default) 69 // - camera 70 // - camcorder 71 // - microphone 72 WebString capture; 65 73 66 74 WebFileChooserParams() -
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
r115702 r116592 739 739 if (params.selectedFiles.size() > 0) 740 740 params.initialValue = params.selectedFiles[0]; 741 #if ENABLE(MEDIA_CAPTURE) 742 params.capture = fileChooser->settings().capture; 743 #else 744 params.capture = WebString(); 745 #endif 741 746 WebFileChooserCompletionImpl* chooserCompletion = 742 747 new WebFileChooserCompletionImpl(fileChooser);
Note: See TracChangeset
for help on using the changeset viewer.