| Differences between
and this patch
- a/Source/JavaScriptCore/ChangeLog +11 lines
Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add option for HTML Media Capture.
9
10
        * Configurations/FeatureDefines.xcconfig:
11
1
2012-02-16  Yuqiang Xian  <yuqiang.xian@intel.com>
12
2012-02-16  Yuqiang Xian  <yuqiang.xian@intel.com>
2
13
3
        Add JSC code profiling support on Linux x86
14
        Add JSC code profiling support on Linux x86
- a/Source/WebCore/ChangeLog +73 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add "capture" attribute for HTML Media Capture.
9
10
        Implement the interface "runCapturePanel()" to run the specific picker for camera, camcorder
11
        and microphone. Each platform can run the capture panel implementing runCapturePanel() in
12
        ChromeClient.
13
14
        Implement MediaCaptureChooser that inherits from FileChooser. It is used for media capture
15
        interface "runCapturePanel()".  Each platform will decide what to launch using "captureType()"
16
        in MediaCaptureChooser class.
17
18
        FileChooserClient::determineCaptureType is used to define the operation for the interactions
19
        between the capture attribute and the accept attribute.
20
21
        No new tests because it is expected just to launch the specific capture panel and other behavior for input element is unchanged.
22
23
        * Configurations/FeatureDefines.xcconfig:
24
        * GNUmakefile.am:
25
        * html/FileInputType.cpp:
26
        (WebCore::FileInputType::handleDOMActivateEvent):
27
        * html/HTMLAttributeNames.in:
28
        * html/HTMLInputElement.cpp:
29
        (WebCore):
30
        (WebCore::HTMLInputElement::capture):
31
        * html/HTMLInputElement.h:
32
        (HTMLInputElement):
33
        * html/HTMLInputElement.idl:
34
        * loader/EmptyClients.h:
35
        (EmptyChromeClient):
36
        (WebCore::EmptyChromeClient::runCapturePanel):
37
        * page/Chrome.cpp:
38
        (WebCore):
39
        (WebCore::Chrome::runCapturePanel):
40
        * page/Chrome.h:
41
        (WebCore):
42
        (Chrome):
43
        * page/ChromeClient.h:
44
        (WebCore):
45
        (ChromeClient):
46
        * platform/FileChooser.cpp:
47
        (WebCore):
48
        (WebCore::FileChooserClient::newMediaCaptureChooser):
49
        (WebCore::FileChooserClient::determineCaptureType):
50
        (WebCore::MediaCaptureChooser::create):
51
        (WebCore::MediaCaptureChooser::~MediaCaptureChooser):
52
        (MediaCaptureNames):
53
        (WebCore::MediaCaptureNames::camera):
54
        (WebCore::MediaCaptureNames::camcorder):
55
        (WebCore::MediaCaptureNames::microphone):
56
        (WebCore::MediaCaptureNames::filesystem):
57
        * platform/FileChooser.h:
58
        (WebCore):
59
        (FileChooserClient):
60
        (FileChooser):
61
        (WebCore::FileChooser::FileChooser):
62
        (MediaCaptureChooser):
63
        (WebCore::MediaCaptureChooser::captureType):
64
        (WebCore::MediaCaptureChooser::MediaCaptureChooser):
65
        (MediaCaptureNames):
66
        * platform/MIMETypeRegistry.cpp:
67
        (WebCore::initializeSupportedImageMIMETypes):
68
        (WebCore):
69
        (WebCore::initializeSupportedCaptureMIMETypes):
70
        (WebCore::MIMETypeRegistry::isSupportedCaptureMIMEType):
71
        * platform/MIMETypeRegistry.h:
72
        (MIMETypeRegistry):
73
1
2012-02-16  Cris Neckar  <cdn@chromium.org>
74
2012-02-16  Cris Neckar  <cdn@chromium.org>
2
75
3
        Correct a misleading comment regarding string delimiters in CSS parsing.
76
        Correct a misleading comment regarding string delimiters in CSS parsing.
- a/Source/WebKit/chromium/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * src/ChromeClientImpl.cpp:
11
        (WebKit):
12
        (WebKit::ChromeClientImpl::runCapturePanel):
13
        * src/ChromeClientImpl.h:
14
        (ChromeClientImpl):
15
1
2012-02-16  Alexandre Elias  <aelias@google.com>
16
2012-02-16  Alexandre Elias  <aelias@google.com>
2
17
3
        [chromium] Bundle page scale factor and limits in CCLayerTreeHost
18
        [chromium] Bundle page scale factor and limits in CCLayerTreeHost
- a/Source/WebKit/efl/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/efl/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebCoreSupport/ChromeClientEfl.cpp:
11
        (WebCore):
12
        (WebCore::ChromeClientEfl::runCapturePanel):
13
        * WebCoreSupport/ChromeClientEfl.h:
14
        (ChromeClientEfl):
15
1
2012-01-31  Raphael Kubo da Costa  <kubo@profusion.mobi>
16
2012-01-31  Raphael Kubo da Costa  <kubo@profusion.mobi>
2
17
3
        [soup] Add support for multiple SoupSessions.
18
        [soup] Add support for multiple SoupSessions.
- a/Source/WebKit/gtk/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/gtk/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebCoreSupport/ChromeClientGtk.cpp:
11
        (WebKit):
12
        (WebKit::ChromeClient::runCapturePanel):
13
        * WebCoreSupport/ChromeClientGtk.h:
14
        (ChromeClient):
15
1
2012-02-16  Adam Barth  <abarth@webkit.org>
16
2012-02-16  Adam Barth  <abarth@webkit.org>
2
17
3
        Attempt to fix the GTK build.
18
        Attempt to fix the GTK build.
- a/Source/WebKit/mac/ChangeLog +14 lines
Lines 1-3 a/Source/WebKit/mac/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * Configurations/FeatureDefines.xcconfig:
11
        * WebCoreSupport/WebChromeClient.h:
12
        * WebCoreSupport/WebChromeClient.mm:
13
        (WebChromeClient::runCapturePanel):
14
1
2012-02-16  Brady Eidson  <beidson@apple.com>
15
2012-02-16  Brady Eidson  <beidson@apple.com>
2
16
3
        <rdar://problem/10616280> and https://bugs.webkit.org/show_bug.cgi?id=78767
17
        <rdar://problem/10616280> and https://bugs.webkit.org/show_bug.cgi?id=78767
- a/Source/WebKit/qt/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/qt/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebCoreSupport/ChromeClientQt.cpp:
11
        (WebCore):
12
        (WebCore::ChromeClientQt::runCapturePanel):
13
        * WebCoreSupport/ChromeClientQt.h:
14
        (ChromeClientQt):
15
1
2012-02-16  Simon Hausmann  <simon.hausmann@nokia.com>
16
2012-02-16  Simon Hausmann  <simon.hausmann@nokia.com>
2
17
3
        Unreviewed brown-paper bag build fix.
18
        Unreviewed brown-paper bag build fix.
- a/Source/WebKit/win/ChangeLog +14 lines
Lines 1-3 a/Source/WebKit/win/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebCoreSupport/WebChromeClient.cpp:
11
        (WebChromeClient::runCapturePanel):
12
        * WebCoreSupport/WebChromeClient.h:
13
        (WebChromeClient):
14
1
2012-02-15  Sadrul Habib Chowdhury  <sadrul@chromium.org>
15
2012-02-15  Sadrul Habib Chowdhury  <sadrul@chromium.org>
2
16
3
        Notify ChromeClient when touch-event handlers are installed/removed.
17
        Notify ChromeClient when touch-event handlers are installed/removed.
- a/Source/WebKit/wince/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/wince/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebCoreSupport/ChromeClientWinCE.cpp:
11
        (WebKit):
12
        (WebKit::ChromeClientWinCE::runCapturePanel):
13
        * WebCoreSupport/ChromeClientWinCE.h:
14
        (ChromeClientWinCE):
15
1
2012-02-15  Patrick Gansterer  <paroga@webkit.org>
16
2012-02-15  Patrick Gansterer  <paroga@webkit.org>
2
17
3
        Unreviewed WinCE build fix after r107606.
18
        Unreviewed WinCE build fix after r107606.
- a/Source/WebKit/wx/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/wx/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add runCapturePanel() to run the capture panel for HTML Media Capture.
9
10
        * WebKitSupport/ChromeClientWx.cpp:
11
        (WebCore):
12
        (WebCore::ChromeClientWx::runCapturePanel):
13
        * WebKitSupport/ChromeClientWx.h:
14
        (ChromeClientWx):
15
1
2012-02-15  Sadrul Habib Chowdhury  <sadrul@chromium.org>
16
2012-02-15  Sadrul Habib Chowdhury  <sadrul@chromium.org>
2
17
3
        Notify ChromeClient when touch-event handlers are installed/removed.
18
        Notify ChromeClient when touch-event handlers are installed/removed.
- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig -1 / +2 lines
Lines 86-91 ENABLE_FILE_SYSTEM = ; a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig_sec1
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
87
ENABLE_GAMEPAD = ;
87
ENABLE_GAMEPAD = ;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
89
ENABLE_HTML_MEDIA_CAPTURE = ;
89
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_SPEECH = ;
92
ENABLE_INPUT_SPEECH = ;
Lines 126-129 ENABLE_WEB_TIMING = ; a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig_sec2
126
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_XSLT = ENABLE_XSLT;
128
ENABLE_XSLT = ENABLE_XSLT;
128
129
129
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
130
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HTML_MEDIA_CAPTURE) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
- a/Source/WebCore/Configurations/FeatureDefines.xcconfig -1 / +2 lines
Lines 86-91 ENABLE_FILE_SYSTEM = ; a/Source/WebCore/Configurations/FeatureDefines.xcconfig_sec1
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
87
ENABLE_GAMEPAD = ;
87
ENABLE_GAMEPAD = ;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
89
ENABLE_HTML_MEDIA_CAPTURE = ;
89
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_SPEECH = ;
92
ENABLE_INPUT_SPEECH = ;
Lines 126-129 ENABLE_WEB_TIMING = ; a/Source/WebCore/Configurations/FeatureDefines.xcconfig_sec2
126
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_XSLT = ENABLE_XSLT;
128
ENABLE_XSLT = ENABLE_XSLT;
128
129
129
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
130
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HTML_MEDIA_CAPTURE) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
- a/Source/WebCore/GNUmakefile.am +8 lines
Lines 445-450 webcore_cppflags += -DENABLE_GEOLOCATION=1 -DENABLE_CLIENT_BASED_GEOLOCATION=1 a/Source/WebCore/GNUmakefile.am_sec1
445
endif # END ENABLE_GEOLOCATION
445
endif # END ENABLE_GEOLOCATION
446
446
447
# ----
447
# ----
448
# HTML Media Capture
449
# ----
450
if ENABLE_HTML_MEDIA_CAPTURE
451
FEATURE_DEFINES += ENABLE_HTML_MEDIA_CAPTURE=1
452
webcore_cppflags += -DENABLE_HTML_MEDIA_CAPTURE=1
453
endif # END ENABLE_HTML_MEDIA_CAPTURE
454
455
# ----
448
# MathML support
456
# MathML support
449
# ----
457
# ----
450
if ENABLE_MATHML
458
if ENABLE_MATHML
- a/Source/WebCore/html/FileInputType.cpp +8 lines
Lines 157-163 void FileInputType::handleDOMActivateEvent(Event* event) a/Source/WebCore/html/FileInputType.cpp_sec1
157
#endif
157
#endif
158
        settings.acceptMIMETypes = input->acceptMIMETypes();
158
        settings.acceptMIMETypes = input->acceptMIMETypes();
159
        settings.selectedFiles = m_fileList->paths();
159
        settings.selectedFiles = m_fileList->paths();
160
#if ENABLE(HTML_MEDIA_CAPTURE)
161
        MediaCaptureType type = determineCaptureType(input);
162
        if (type == FileSystem)
163
            chrome->runOpenPanel(input->document()->frame(), newFileChooser(settings));
164
        else
165
            chrome->runCapturePanel(input->document()->frame(), newMediaCaptureChooser(settings, type));
166
#else
160
        chrome->runOpenPanel(input->document()->frame(), newFileChooser(settings));
167
        chrome->runOpenPanel(input->document()->frame(), newFileChooser(settings));
168
#endif
161
    }
169
    }
162
    event->setDefaultHandled();
170
    event->setDefaultHandled();
163
}
171
}
- a/Source/WebCore/html/HTMLAttributeNames.in +1 lines
Lines 58-63 bgcolor a/Source/WebCore/html/HTMLAttributeNames.in_sec1
58
bgproperties
58
bgproperties
59
border
59
border
60
bordercolor
60
bordercolor
61
capture
61
cellpadding
62
cellpadding
62
cellspacing
63
cellspacing
63
char
64
char
- a/Source/WebCore/html/HTMLInputElement.cpp +7 lines
Lines 1301-1306 String HTMLInputElement::alt() const a/Source/WebCore/html/HTMLInputElement.cpp_sec1
1301
    return fastGetAttribute(altAttr);
1301
    return fastGetAttribute(altAttr);
1302
}
1302
}
1303
1303
1304
#if ENABLE(HTML_MEDIA_CAPTURE)
1305
String HTMLInputElement::capture() const
1306
{
1307
    return fastGetAttribute(captureAttr);
1308
}
1309
#endif
1310
1304
int HTMLInputElement::maxLength() const
1311
int HTMLInputElement::maxLength() const
1305
{
1312
{
1306
    return m_maxLength;
1313
    return m_maxLength;
- a/Source/WebCore/html/HTMLInputElement.h +4 lines
Lines 192-197 public: a/Source/WebCore/html/HTMLInputElement.h_sec1
192
    String accept() const;
192
    String accept() const;
193
    String alt() const;
193
    String alt() const;
194
194
195
#if ENABLE(HTML_MEDIA_CAPTURE)
196
    String capture() const;
197
#endif
198
195
    void setSize(unsigned);
199
    void setSize(unsigned);
196
200
197
    KURL src() const;
201
    KURL src() const;
- a/Source/WebCore/html/HTMLInputElement.idl +3 lines
Lines 34-39 module html { a/Source/WebCore/html/HTMLInputElement.idl_sec1
34
        attribute [Reflect] DOMString accept;
34
        attribute [Reflect] DOMString accept;
35
        attribute [Reflect] DOMString align;
35
        attribute [Reflect] DOMString align;
36
        attribute [Reflect] DOMString alt;
36
        attribute [Reflect] DOMString alt;
37
#if defined(ENABLE_HTML_MEDIA_CAPTURE) && ENABLE_HTML_MEDIA_CAPTURE
38
        attribute [Reflect] DOMString capture;
39
#endif
37
        attribute boolean checked;
40
        attribute boolean checked;
38
        attribute [Reflect] boolean disabled;
41
        attribute [Reflect] boolean disabled;
39
        attribute [Reflect] boolean autofocus;
42
        attribute [Reflect] boolean autofocus;
- a/Source/WebCore/loader/EmptyClients.h +3 lines
Lines 205-210 public: a/Source/WebCore/loader/EmptyClients.h_sec1
205
#endif
205
#endif
206
206
207
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
207
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
208
#if ENABLE(HTML_MEDIA_CAPTURE)
209
    virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>) { }
210
#endif
208
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { }
211
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { }
209
212
210
    virtual void formStateDidChange(const Node*) { }
213
    virtual void formStateDidChange(const Node*) { }
- a/Source/WebCore/page/Chrome.cpp +7 lines
Lines 464-469 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser) a/Source/WebCore/page/Chrome.cpp_sec1
464
    m_client->runOpenPanel(frame, fileChooser);
464
    m_client->runOpenPanel(frame, fileChooser);
465
}
465
}
466
466
467
#if ENABLE(HTML_MEDIA_CAPTURE)
468
void Chrome::runCapturePanel(Frame* frame, PassRefPtr<MediaCaptureChooser> mediaFileChooser)
469
{
470
    m_client->runCapturePanel(frame, mediaFileChooser);
471
}
472
#endif
473
467
void Chrome::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
474
void Chrome::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
468
{
475
{
469
    m_client->loadIconForFiles(filenames, loader);
476
    m_client->loadIconForFiles(filenames, loader);
- a/Source/WebCore/page/Chrome.h +6 lines
Lines 47-52 namespace WebCore { a/Source/WebCore/page/Chrome.h_sec1
47
    class Geolocation;
47
    class Geolocation;
48
    class HitTestResult;
48
    class HitTestResult;
49
    class IntRect;
49
    class IntRect;
50
#if ENABLE(HTML_MEDIA_CAPTURE)
51
    class MediaCaptureChooser;
52
#endif
50
    class NavigationAction;
53
    class NavigationAction;
51
    class Node;
54
    class Node;
52
    class Page;
55
    class Page;
Lines 154-159 namespace WebCore { a/Source/WebCore/page/Chrome.h_sec2
154
#endif
157
#endif
155
158
156
        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
159
        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
160
#if ENABLE(HTML_MEDIA_CAPTURE)
161
        void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>);
162
#endif
157
        void loadIconForFiles(const Vector<String>&, FileIconLoader*);
163
        void loadIconForFiles(const Vector<String>&, FileIconLoader*);
158
#if ENABLE(DIRECTORY_UPLOAD)
164
#if ENABLE(DIRECTORY_UPLOAD)
159
        void enumerateChosenDirectory(FileChooser*);
165
        void enumerateChosenDirectory(FileChooser*);
- a/Source/WebCore/page/ChromeClient.h +6 lines
Lines 55-60 namespace WebCore { a/Source/WebCore/page/ChromeClient.h_sec1
55
    class GraphicsLayer;
55
    class GraphicsLayer;
56
    class HitTestResult;
56
    class HitTestResult;
57
    class IntRect;
57
    class IntRect;
58
#if ENABLE(HTML_MEDIA_CAPTURE)
59
    class MediaCaptureChooser;
60
#endif
58
    class NavigationAction;
61
    class NavigationAction;
59
    class Node;
62
    class Node;
60
    class Page;
63
    class Page;
Lines 224-229 namespace WebCore { a/Source/WebCore/page/ChromeClient.h_sec2
224
#endif
227
#endif
225
228
226
        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
229
        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
230
#if ENABLE(HTML_MEDIA_CAPTURE)
231
        virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>) = 0;
232
#endif
227
        // Asynchronous request to load an icon for specified filenames.
233
        // Asynchronous request to load an icon for specified filenames.
228
        virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) = 0;
234
        virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) = 0;
229
235
- a/Source/WebCore/platform/FileChooser.cpp -3 / +74 lines
Lines 29-36 a/Source/WebCore/platform/FileChooser.cpp_sec1
29
#include "config.h"
29
#include "config.h"
30
#include "FileChooser.h"
30
#include "FileChooser.h"
31
31
32
#include "HTMLNames.h"
33
#include "MIMETypeRegistry.h"
34
32
namespace WebCore {
35
namespace WebCore {
33
36
37
using namespace HTMLNames;
38
34
FileChooserClient::~FileChooserClient()
39
FileChooserClient::~FileChooserClient()
35
{
40
{
36
    discardChooser();
41
    discardChooser();
Lines 50-60 void FileChooserClient::discardChooser() a/Source/WebCore/platform/FileChooser.cpp_sec2
50
        m_chooser->disconnectClient();
55
        m_chooser->disconnectClient();
51
}
56
}
52
57
53
inline FileChooser::FileChooser(FileChooserClient* client, const FileChooserSettings& settings)
58
#if ENABLE(HTML_MEDIA_CAPTURE)
54
    : m_client(client)
59
MediaCaptureChooser* FileChooserClient::newMediaCaptureChooser(const FileChooserSettings& settings, MediaCaptureType device)
55
    , m_settings(settings)
60
{
61
    discardChooser();
62
63
    m_chooser = MediaCaptureChooser::create(this, settings, device);
64
    return static_cast<MediaCaptureChooser*>(m_chooser.get());
65
}
66
67
MediaCaptureType FileChooserClient::determineCaptureType(HTMLInputElement* input)
56
{
68
{
69
    if (!input)
70
        return FileSystem;
71
72
    if (equalIgnoringCase(input->capture(), MediaCaptureNames::camera())) {
73
        for (Vector<String>::const_iterator iterator = input->acceptMIMETypes().begin(); iterator != input->acceptMIMETypes().end(); ++iterator)
74
            if ((*iterator).startsWith("image/") && MIMETypeRegistry::isSupportedCaptureMIMEType(*iterator))
75
                return Camera;
76
    } else if (equalIgnoringCase(input->capture(), MediaCaptureNames::camcorder())) {
77
        for (Vector<String>::const_iterator iterator = input->acceptMIMETypes().begin(); iterator != input->acceptMIMETypes().end(); ++iterator)
78
            if ((*iterator).startsWith("video/") && MIMETypeRegistry::isSupportedCaptureMIMEType(*iterator))
79
                return Camcorder;
80
    } else if (equalIgnoringCase(input->capture(), MediaCaptureNames::microphone())) {
81
        for (Vector<String>::const_iterator iterator = input->acceptMIMETypes().begin(); iterator != input->acceptMIMETypes().end(); ++iterator)
82
            if ((*iterator).startsWith("audio/") && MIMETypeRegistry::isSupportedCaptureMIMEType(*iterator))
83
                return Microphone;
84
    }
85
    return FileSystem;
57
}
86
}
87
#endif
58
88
59
PassRefPtr<FileChooser> FileChooser::create(FileChooserClient* client, const FileChooserSettings& settings)
89
PassRefPtr<FileChooser> FileChooser::create(FileChooserClient* client, const FileChooserSettings& settings)
60
{
90
{
Lines 82-85 void FileChooser::chooseFiles(const Vector<String>& filenames) a/Source/WebCore/platform/FileChooser.cpp_sec3
82
        m_client->filesChosen(filenames);
112
        m_client->filesChosen(filenames);
83
}
113
}
84
114
115
#if ENABLE(HTML_MEDIA_CAPTURE)
116
117
PassRefPtr<MediaCaptureChooser> MediaCaptureChooser::create(FileChooserClient* client, const FileChooserSettings& settings, MediaCaptureType type)
118
{
119
    return adoptRef(new MediaCaptureChooser(client, settings, type));
120
}
121
122
MediaCaptureChooser::~MediaCaptureChooser()
123
{
124
}
125
126
namespace MediaCaptureNames {
127
128
const AtomicString& camera()
129
{
130
    DEFINE_STATIC_LOCAL(AtomicString, name, ("camera"));
131
    return name;
132
}
133
134
const AtomicString& camcorder()
135
{
136
    DEFINE_STATIC_LOCAL(AtomicString, name, ("camcorder"));
137
    return name;
138
}
139
140
const AtomicString& microphone()
141
{
142
    DEFINE_STATIC_LOCAL(AtomicString, name, ("microphone"));
143
    return name;
144
}
145
146
const AtomicString& filesystem()
147
{
148
    DEFINE_STATIC_LOCAL(AtomicString, name, ("filesystem"));
149
    return name;
150
}
151
152
} // namespace WebCore::MediaCaptureNames
153
154
#endif
155
85
}
156
}
- a/Source/WebCore/platform/FileChooser.h -2 / +56 lines
Lines 30-35 a/Source/WebCore/platform/FileChooser.h_sec1
30
#ifndef FileChooser_h
30
#ifndef FileChooser_h
31
#define FileChooser_h
31
#define FileChooser_h
32
32
33
#include "HTMLInputElement.h"
33
#include "PlatformString.h"
34
#include "PlatformString.h"
34
#include <wtf/RefCounted.h>
35
#include <wtf/RefCounted.h>
35
#include <wtf/Vector.h>
36
#include <wtf/Vector.h>
Lines 37-42 a/Source/WebCore/platform/FileChooser.h_sec2
37
namespace WebCore {
38
namespace WebCore {
38
39
39
class FileChooser;
40
class FileChooser;
41
class HTMLInputElement;
42
#if ENABLE(HTML_MEDIA_CAPTURE)
43
class MediaCaptureChooser;
44
#endif
45
46
#if ENABLE(HTML_MEDIA_CAPTURE)
47
enum MediaCaptureType {
48
    FileSystem,
49
    Camera,
50
    Camcorder,
51
    Microphone,
52
};
53
#endif
40
54
41
struct FileChooserSettings {
55
struct FileChooserSettings {
42
    bool allowsMultipleFiles;
56
    bool allowsMultipleFiles;
Lines 55-60 public: a/Source/WebCore/platform/FileChooser.h_sec3
55
protected:
69
protected:
56
    FileChooser* newFileChooser(const FileChooserSettings&);
70
    FileChooser* newFileChooser(const FileChooserSettings&);
57
71
72
#if ENABLE(HTML_MEDIA_CAPTURE)
73
    MediaCaptureChooser* newMediaCaptureChooser(const FileChooserSettings&, MediaCaptureType);
74
    MediaCaptureType determineCaptureType(HTMLInputElement*);
75
#endif
76
58
private:
77
private:
59
    void discardChooser();
78
    void discardChooser();
60
79
Lines 73-85 public: a/Source/WebCore/platform/FileChooser.h_sec4
73
92
74
    const FileChooserSettings& settings() const { return m_settings; }
93
    const FileChooserSettings& settings() const { return m_settings; }
75
94
76
private:
95
protected:
77
    FileChooser(FileChooserClient*, const FileChooserSettings&);
96
    FileChooser(FileChooserClient* client, const FileChooserSettings& settings)
97
        : m_client(client)
98
        , m_settings(settings)
99
    {
100
    }
78
101
102
private:
79
    FileChooserClient* m_client;
103
    FileChooserClient* m_client;
80
    FileChooserSettings m_settings;
104
    FileChooserSettings m_settings;
81
};
105
};
82
106
107
#if ENABLE(HTML_MEDIA_CAPTURE)
108
109
class MediaCaptureChooser : public FileChooser {
110
public:
111
    static PassRefPtr<MediaCaptureChooser> create(FileChooserClient*, const FileChooserSettings&, MediaCaptureType);
112
    ~MediaCaptureChooser();
113
114
    MediaCaptureType captureType() { return m_captureType; }
115
116
private:
117
    MediaCaptureChooser(FileChooserClient* client, const FileChooserSettings& settings, MediaCaptureType type)
118
        : FileChooser(client, settings)
119
        , m_captureType(type)
120
    {
121
    }
122
123
    MediaCaptureType m_captureType;
124
};
125
126
namespace MediaCaptureNames {
127
128
const AtomicString& camera();
129
const AtomicString& camcorder();
130
const AtomicString& microphone();
131
const AtomicString& filesystem();
132
133
} // namespace WebCore::MediaCaptureNames
134
135
#endif
136
83
} // namespace WebCore
137
} // namespace WebCore
84
138
85
#endif // FileChooser_h
139
#endif // FileChooser_h
- a/Source/WebCore/platform/MIMETypeRegistry.cpp +24 lines
Lines 189-194 static HashSet<String>* supportedImageMIMETypesForEncoding; a/Source/WebCore/platform/MIMETypeRegistry.cpp_sec1
189
static HashSet<String>* supportedJavaScriptMIMETypes;
189
static HashSet<String>* supportedJavaScriptMIMETypes;
190
static HashSet<String>* supportedNonImageMIMETypes;
190
static HashSet<String>* supportedNonImageMIMETypes;
191
static HashSet<String>* supportedMediaMIMETypes;
191
static HashSet<String>* supportedMediaMIMETypes;
192
#if ENABLE(HTML_MEDIA_CAPTURE)
193
static HashSet<String>* supportedCaptureMIMETypes;
194
#endif
192
static HashSet<String>* unsupportedTextMIMETypes;
195
static HashSet<String>* unsupportedTextMIMETypes;
193
196
194
typedef HashMap<String, Vector<String>*, CaseFoldingHash> MediaMIMETypeMap;
197
typedef HashMap<String, Vector<String>*, CaseFoldingHash> MediaMIMETypeMap;
Lines 437-442 static void initializeSupportedMediaMIMETypes() a/Source/WebCore/platform/MIMETypeRegistry.cpp_sec2
437
#endif
440
#endif
438
}
441
}
439
442
443
#if ENABLE(HTML_MEDIA_CAPTURE)
444
static void initializeSupportedCaptureMIMETypes()
445
{
446
    supportedCaptureMIMETypes = new HashSet<String>;
447
    supportedCaptureMIMETypes->add("image/*");
448
    supportedCaptureMIMETypes->add("audio/*");
449
    supportedCaptureMIMETypes->add("video/*");
450
}
451
#endif
452
440
static void initializeUnsupportedTextMIMETypes()
453
static void initializeUnsupportedTextMIMETypes()
441
{
454
{
442
    static const char* types[] = {
455
    static const char* types[] = {
Lines 573-578 bool MIMETypeRegistry::isUnsupportedTextMIMEType(const String& mimeType) a/Source/WebCore/platform/MIMETypeRegistry.cpp_sec3
573
    return unsupportedTextMIMETypes->contains(mimeType);
586
    return unsupportedTextMIMETypes->contains(mimeType);
574
}
587
}
575
588
589
#if ENABLE(HTML_MEDIA_CAPTURE)
590
bool MIMETypeRegistry::isSupportedCaptureMIMEType(const String& mimeType)
591
{
592
    if (mimeType.isEmpty())
593
        return false;
594
    if (!supportedCaptureMIMETypes)
595
        initializeSupportedCaptureMIMETypes();
596
    return supportedCaptureMIMETypes->contains(mimeType);
597
}
598
#endif
599
576
bool MIMETypeRegistry::isJavaAppletMIMEType(const String& mimeType)
600
bool MIMETypeRegistry::isJavaAppletMIMEType(const String& mimeType)
577
{
601
{
578
    // Since this set is very limited and is likely to remain so we won't bother with the overhead
602
    // Since this set is very limited and is likely to remain so we won't bother with the overhead
- a/Source/WebCore/platform/MIMETypeRegistry.h +5 lines
Lines 80-85 public: a/Source/WebCore/platform/MIMETypeRegistry.h_sec1
80
    // browser (e.g. a Qt Plugin).
80
    // browser (e.g. a Qt Plugin).
81
    static bool isApplicationPluginMIMEType(const String& mimeType);
81
    static bool isApplicationPluginMIMEType(const String& mimeType);
82
82
83
#if ENABLE(HTML_MEDIA_CAPTURE)
84
    // Check to see if a mime type is suitable for being operated as html media capture.
85
    static bool isSupportedCaptureMIMEType(const String& mimeType);
86
#endif
87
83
    static HashSet<String>& getSupportedImageMIMETypes();
88
    static HashSet<String>& getSupportedImageMIMETypes();
84
    static HashSet<String>& getSupportedImageResourceMIMETypes();
89
    static HashSet<String>& getSupportedImageResourceMIMETypes();
85
    static HashSet<String>& getSupportedImageMIMETypesForEncoding();
90
    static HashSet<String>& getSupportedImageMIMETypesForEncoding();
- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp +7 lines
Lines 726-731 void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh a/Source/WebKit/chromium/src/ChromeClientImpl.cpp_sec1
726
    chooserCompletion->didChooseFile(WebVector<WebString>());
726
    chooserCompletion->didChooseFile(WebVector<WebString>());
727
}
727
}
728
728
729
#if ENABLE(HTML_MEDIA_CAPTURE)
730
void ChromeClientImpl::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
731
{
732
    notImplemented();
733
}
734
#endif
735
729
void ChromeClientImpl::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
736
void ChromeClientImpl::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
730
{
737
{
731
    if (!m_webView->client())
738
    if (!m_webView->client())
- a/Source/WebKit/chromium/src/ChromeClientImpl.h +3 lines
Lines 142-147 public: a/Source/WebKit/chromium/src/ChromeClientImpl.h_sec1
142
    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
142
    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
143
#endif
143
#endif
144
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
144
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
145
#if ENABLE(HTML_MEDIA_CAPTURE)
146
    virtual void runCapturePanel(WebCore::Frame*, PassRefPtr<WebCore::MediaCaptureChooser>);
147
#endif
145
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
148
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
146
#if ENABLE(DIRECTORY_UPLOAD)
149
#if ENABLE(DIRECTORY_UPLOAD)
147
    virtual void enumerateChosenDirectory(WebCore::FileChooser*);
150
    virtual void enumerateChosenDirectory(WebCore::FileChooser*);
- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp +7 lines
Lines 449-454 void ChromeClientEfl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFile a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp_sec1
449
        chooser->chooseFile(filenames[0]);
449
        chooser->chooseFile(filenames[0]);
450
}
450
}
451
451
452
#if ENABLE(HTML_MEDIA_CAPTURE)
453
void ChromeClientEfl::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
454
{
455
    notImplemented();
456
}
457
#endif
458
452
void ChromeClientEfl::formStateDidChange(const Node*)
459
void ChromeClientEfl::formStateDidChange(const Node*)
453
{
460
{
454
    notImplemented();
461
    notImplemented();
- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h +3 lines
Lines 143-148 public: a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h_sec1
143
#endif
143
#endif
144
144
145
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
145
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
146
#if ENABLE(HTML_MEDIA_CAPTURE)
147
    virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>);
148
#endif
146
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
149
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
147
    virtual void formStateDidChange(const Node*);
150
    virtual void formStateDidChange(const Node*);
148
151
- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +7 lines
Lines 843-848 void ChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser) a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp_sec1
843
    gtk_widget_destroy(dialog);
843
    gtk_widget_destroy(dialog);
844
}
844
}
845
845
846
#if ENABLE(HTML_MEDIA_CAPTURE)
847
void ChromeClient::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
848
{
849
    notImplemented();
850
}
851
#endif
852
846
void ChromeClient::loadIconForFiles(const Vector<WTF::String>& filenames, WebCore::FileIconLoader* loader)
853
void ChromeClient::loadIconForFiles(const Vector<WTF::String>& filenames, WebCore::FileIconLoader* loader)
847
{
854
{
848
    loader->notifyFinished(Icon::createIconForFiles(filenames));
855
    loader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h +3 lines
Lines 129-134 namespace WebKit { a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h_sec1
129
        virtual void showContextMenu() { }
129
        virtual void showContextMenu() { }
130
#endif
130
#endif
131
        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
131
        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
132
#if ENABLE(HTML_MEDIA_CAPTURE)
133
        virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>);
134
#endif
132
        virtual void loadIconForFiles(const Vector<WTF::String>&, FileIconLoader*);
135
        virtual void loadIconForFiles(const Vector<WTF::String>&, FileIconLoader*);
133
136
134
        virtual void formStateDidChange(const Node*) { }
137
        virtual void formStateDidChange(const Node*) { }
- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig -1 / +2 lines
Lines 86-91 ENABLE_FILE_SYSTEM = ; a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig_sec1
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
86
ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
87
ENABLE_GAMEPAD = ;
87
ENABLE_GAMEPAD = ;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
88
ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
89
ENABLE_HTML_MEDIA_CAPTURE = ;
89
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INDEXED_DATABASE = ;
90
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_COLOR = ;
91
ENABLE_INPUT_SPEECH = ;
92
ENABLE_INPUT_SPEECH = ;
Lines 126-129 ENABLE_WEB_TIMING = ; a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig_sec2
126
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_WORKERS = ENABLE_WORKERS;
127
ENABLE_XSLT = ENABLE_XSLT;
128
ENABLE_XSLT = ENABLE_XSLT;
128
129
129
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
130
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HTML_MEDIA_CAPTURE) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h +3 lines
Lines 121-126 public: a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h_sec1
121
#endif
121
#endif
122
122
123
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
123
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
124
#if ENABLE(HTML_MEDIA_CAPTURE)
125
    virtual void runCapturePanel(WebCore::Frame*, PassRefPtr<WebCore::MediaCaptureChooser>) OVERRIDE;
126
#endif
124
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*) OVERRIDE;
127
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*) OVERRIDE;
125
128
126
    virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
129
    virtual void setCursor(const WebCore::Cursor&) OVERRIDE;
- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm +7 lines
Lines 746-751 void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser) a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm_sec1
746
    END_BLOCK_OBJC_EXCEPTIONS;
746
    END_BLOCK_OBJC_EXCEPTIONS;
747
}
747
}
748
748
749
#if ENABLE(HTML_MEDIA_CAPTURE)
750
void WebChromeClient::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
751
{
752
    notImplemented();
753
}
754
#endif
755
749
void WebChromeClient::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* iconLoader)
756
void WebChromeClient::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* iconLoader)
750
{
757
{
751
    iconLoader->notifyFinished(Icon::createIconForFiles(filenames));
758
    iconLoader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +7 lines
Lines 588-593 void ChromeClientQt::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileC a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp_sec1
588
    }
588
    }
589
}
589
}
590
590
591
#if ENABLE(HTML_MEDIA_CAPTURE)
592
void ChromeClientQt::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
593
{
594
    notImplemented();
595
}
596
#endif
597
591
void ChromeClientQt::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
598
void ChromeClientQt::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
592
{
599
{
593
    loader->notifyFinished(Icon::createIconForFiles(filenames));
600
    loader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h +3 lines
Lines 167-172 public: a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h_sec1
167
    FullScreenVideoQt* fullScreenVideo();
167
    FullScreenVideoQt* fullScreenVideo();
168
#endif
168
#endif
169
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
169
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
170
#if ENABLE(HTML_MEDIA_CAPTURE)
171
     virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>);
172
#endif
170
     virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
173
     virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
171
174
172
    virtual void formStateDidChange(const Node*) { }
175
    virtual void formStateDidChange(const Node*) { }
- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp +7 lines
Lines 701-706 void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoose a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp_sec1
701
    // FIXME: Show some sort of error if too many files are selected and the buffer is too small.  For now, this will fail silently.
701
    // FIXME: Show some sort of error if too many files are selected and the buffer is too small.  For now, this will fail silently.
702
}
702
}
703
703
704
#if ENABLE(HTML_MEDIA_CAPTURE)
705
void WebChromeClient::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
706
{
707
    notImplemented();
708
}
709
#endif
710
704
void WebChromeClient::loadIconForFiles(const Vector<WTF::String>& filenames, WebCore::FileIconLoader* loader)
711
void WebChromeClient::loadIconForFiles(const Vector<WTF::String>& filenames, WebCore::FileIconLoader* loader)
705
{
712
{
706
    loader->notifyFinished(Icon::createIconForFiles(filenames));
713
    loader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.h +3 lines
Lines 127-132 public: a/Source/WebKit/win/WebCoreSupport/WebChromeClient.h_sec1
127
    virtual void populateVisitedLinks();
127
    virtual void populateVisitedLinks();
128
128
129
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
129
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
130
#if ENABLE(HTML_MEDIA_CAPTURE)
131
    virtual void runCapturePanel(WebCore::Frame*, PassRefPtr<WebCore::MediaCaptureChooser>);
132
#endif
130
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
133
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
131
134
132
    virtual void setCursor(const WebCore::Cursor&);
135
    virtual void setCursor(const WebCore::Cursor&);
- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp +7 lines
Lines 344-349 void ChromeClientWinCE::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoo a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp_sec1
344
    notImplemented();
344
    notImplemented();
345
}
345
}
346
346
347
#if ENABLE(HTML_MEDIA_CAPTURE)
348
void ChromeClientWinCE::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
349
{
350
    notImplemented();
351
}
352
#endif
353
347
void ChromeClientWinCE::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
354
void ChromeClientWinCE::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
348
{
355
{
349
    loader->notifyFinished(Icon::createIconForFiles(filenames));
356
    loader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h +3 lines
Lines 145-150 public: a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h_sec1
145
    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
145
    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
146
146
147
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
147
    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
148
#if ENABLE(HTML_MEDIA_CAPTURE)
149
    virtual void runCapturePanel(WebCore::Frame*, PassRefPtr<WebCore::MediaCaptureChooser>);
150
#endif
148
    // Asynchronous request to load an icon for specified filenames.
151
    // Asynchronous request to load an icon for specified filenames.
149
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
152
    virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
150
153
- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp +7 lines
Lines 454-459 void ChromeClientWx::runOpenPanel(Frame*, PassRefPtr<FileChooser>) a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp_sec1
454
    notImplemented();
454
    notImplemented();
455
}
455
}
456
456
457
#if ENABLE(HTML_MEDIA_CAPTURE)
458
void ChromeClientWx::runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>)
459
{
460
    notImplemented();
461
}
462
#endif
463
457
void ChromeClientWx::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
464
void ChromeClientWx::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* loader)
458
{
465
{
459
    loader->notifyFinished(Icon::createIconForFiles(filenames));
466
    loader->notifyFinished(Icon::createIconForFiles(filenames));
- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h +3 lines
Lines 132-137 public: a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h_sec1
132
#endif
132
#endif
133
133
134
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
134
    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
135
#if ENABLE(HTML_MEDIA_CAPTURE)
136
    virtual void runCapturePanel(Frame*, PassRefPtr<MediaCaptureChooser>);
137
#endif
135
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
138
    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*);
136
139
137
    virtual void formStateDidChange(const Node*) { }
140
    virtual void formStateDidChange(const Node*) { }
- a/Source/cmake/OptionsEfl.cmake +1 lines
Lines 75-80 WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON) a/Source/cmake/OptionsEfl.cmake_sec1
75
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
75
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
76
WEBKIT_FEATURE(ENABLE_FULLSCREEN_API "Enable Fullscreen API support" DEFAULT OFF)
76
WEBKIT_FEATURE(ENABLE_FULLSCREEN_API "Enable Fullscreen API support" DEFAULT OFF)
77
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
77
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
78
WEBKIT_FEATURE(ENABLE_HTML_MEDIA_CAPTURE "Enable HTML Media Capture" DEFAULT ON)
78
WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON)
79
WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON)
79
WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
80
WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
80
WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
81
WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
- a/Source/cmakeconfig.h.cmake +1 lines
Lines 19-24 a/Source/cmakeconfig.h.cmake_sec1
19
#cmakedefine01 ENABLE_FULLSCREEN_API
19
#cmakedefine01 ENABLE_FULLSCREEN_API
20
#cmakedefine01 ENABLE_GEOLOCATION
20
#cmakedefine01 ENABLE_GEOLOCATION
21
#cmakedefine01 ENABLE_GLIB_SUPPORT
21
#cmakedefine01 ENABLE_GLIB_SUPPORT
22
#cmakedefine01 ENABLE_HTML_MEDIA_CAPTURE
22
#cmakedefine01 ENABLE_ICONDATABASE
23
#cmakedefine01 ENABLE_ICONDATABASE
23
#cmakedefine01 ENABLE_INDEXED_DATABASE
24
#cmakedefine01 ENABLE_INDEXED_DATABASE
24
#cmakedefine01 ENABLE_INSPECTOR
25
#cmakedefine01 ENABLE_INSPECTOR
- a/Tools/ChangeLog +12 lines
Lines 1-3 a/Tools/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add option for HTML Media Capture.
9
10
        * Scripts/build-webkit:
11
        * qmake/mkspecs/features/features.prf:
12
1
2012-02-16  Carlos Garcia Campos  <cgarcia@igalia.com>
13
2012-02-16  Carlos Garcia Campos  <cgarcia@igalia.com>
2
14
3
        [GTK] Make install is broken when building without --enable-gtk-doc
15
        [GTK] Make install is broken when building without --enable-gtk-doc
- a/Tools/Scripts/build-webkit +4 lines
Lines 90-95 my ( a/Tools/Scripts/build-webkit_sec1
90
    $fullscreenAPISupport,
90
    $fullscreenAPISupport,
91
    $gamepadSupport,
91
    $gamepadSupport,
92
    $geolocationSupport,
92
    $geolocationSupport,
93
    $htmlMediaCaptureSupport,
93
    $iconDatabaseSupport,
94
    $iconDatabaseSupport,
94
    $imageResizerSupport,
95
    $imageResizerSupport,
95
    $indexedDatabaseSupport,
96
    $indexedDatabaseSupport,
Lines 215-220 my @features = ( a/Tools/Scripts/build-webkit_sec2
215
    { option => "geolocation", desc => "Toggle Geolocation support",
216
    { option => "geolocation", desc => "Toggle Geolocation support",
216
      define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
217
      define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
217
218
219
    { option => "html-media-capture", desc => "Toggle HTML Media Capture support",
220
      define => "ENABLE_HTML_MEDIA_CAPTURE", default => isEfl(), value => \$htmlMediaCaptureSupport },
221
218
    { option => "icon-database", desc => "Toggle Icon database support",
222
    { option => "icon-database", desc => "Toggle Icon database support",
219
      define => "ENABLE_ICONDATABASE", default => 1, value => \$iconDatabaseSupport },
223
      define => "ENABLE_ICONDATABASE", default => 1, value => \$iconDatabaseSupport },
220
224
- a/Tools/qmake/mkspecs/features/features.prf +1 lines
Lines 85-90 haveQt(4):unix:!mac:!embedded { a/Tools/qmake/mkspecs/features/features.prf_sec1
85
!contains(DEFINES, ENABLE_MEDIA_STREAM=.): DEFINES += ENABLE_MEDIA_STREAM=0
85
!contains(DEFINES, ENABLE_MEDIA_STREAM=.): DEFINES += ENABLE_MEDIA_STREAM=0
86
!contains(DEFINES, ENABLE_VIDEO_TRACK=.): DEFINES += ENABLE_VIDEO_TRACK=0
86
!contains(DEFINES, ENABLE_VIDEO_TRACK=.): DEFINES += ENABLE_VIDEO_TRACK=0
87
!contains(DEFINES, ENABLE_TOUCH_ICON_LOADING=.): DEFINES += ENABLE_TOUCH_ICON_LOADING=0
87
!contains(DEFINES, ENABLE_TOUCH_ICON_LOADING=.): DEFINES += ENABLE_TOUCH_ICON_LOADING=0
88
!contains(DEFINES, ENABLE_HTML_MEDIA_CAPTURE=.): DEFINES += ENABLE_HTML_MEDIA_CAPTURE=0
88
!contains(DEFINES, ENABLE_ANIMATION_API=.): DEFINES += ENABLE_ANIMATION_API=0
89
!contains(DEFINES, ENABLE_ANIMATION_API=.): DEFINES += ENABLE_ANIMATION_API=0
89
90
90
# Enabled in Source/JavaScriptCore/wtf/Platform.h if not set
91
# Enabled in Source/JavaScriptCore/wtf/Platform.h if not set
- a/ChangeLog +13 lines
Lines 1-3 a/ChangeLog_sec1
1
2012-02-16  Jongseok Yang  <js45.yang@samsung.com>
2
3
        Implement the interface for media capture panel to support HTML Media Capture
4
        https://bugs.webkit.org/show_bug.cgi?id=63062
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Add option for HTML Media Capture.
9
10
        * Source/cmake/OptionsEfl.cmake:
11
        * Source/cmakeconfig.h.cmake:
12
        * configure.ac:
13
1
2012-02-16  Simon Hausmann  <simon.hausmann@nokia.com>
14
2012-02-16  Simon Hausmann  <simon.hausmann@nokia.com>
2
15
3
        [Qt] Move event conversion functions from WebCore to WebKit
16
        [Qt] Move event conversion functions from WebCore to WebKit
- a/configure.ac +10 lines
Lines 1063-1068 AC_ARG_ENABLE(device_orientation, a/configure.ac_sec1
1063
              [],[enable_device_orientation="no"])
1063
              [],[enable_device_orientation="no"])
1064
AC_MSG_RESULT([$enable_device_orientation])
1064
AC_MSG_RESULT([$enable_device_orientation])
1065
1065
1066
# check whether to enable HTML Media Capture
1067
AC_MSG_CHECKING([whether to enable HTML Media Capture])
1068
AC_ARG_ENABLE(html_media_capture,
1069
              AC_HELP_STRING([--enable-html-media-capture],
1070
                             [enable support for HTML Media Capture [default=no]]),
1071
              [], [enable_html_media_capture="no"])
1072
AC_MSG_RESULT([$enable_html_media_capture])
1073
1066
G_IR_SCANNER=
1074
G_IR_SCANNER=
1067
G_IR_COMPILER=
1075
G_IR_COMPILER=
1068
G_IR_GENERATE=
1076
G_IR_GENERATE=
Lines 1341-1346 AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) a/configure.ac_sec2
1341
AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
1349
AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
1342
AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
1350
AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
1343
AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
1351
AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
1352
AM_CONDITIONAL([ENABLE_HTML_MEDIA_CAPTURE], [test "$enable_html_media_capture" = "yes"])
1344
AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
1353
AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
1345
AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
1354
AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
1346
AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
1355
AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
Lines 1436-1441 Features: a/configure.ac_sec3
1436
 Media source                                             : $enable_media_source
1445
 Media source                                             : $enable_media_source
1437
 Media statistics                                         : $enable_media_statistics
1446
 Media statistics                                         : $enable_media_statistics
1438
 MHTML support                                            : $enable_mhtml
1447
 MHTML support                                            : $enable_mhtml
1448
 HTML Media Capture                                       : $enable_html_media_capture
1439
 HTML5 channel messaging support                          : $enable_channel_messaging
1449
 HTML5 channel messaging support                          : $enable_channel_messaging
1440
 HTML5 meter element support                              : $enable_meter_tag
1450
 HTML5 meter element support                              : $enable_meter_tag
1441
 HTML5 microdata support                                  : $enable_microdata
1451
 HTML5 microdata support                                  : $enable_microdata

Return to Bug 63062