Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mrobinson/webkit
...
head fork: mrobinson/webkit
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
74 Source/WebCore/CMakeLists.txt
@@ -186,41 +186,6 @@ set(WebCore_IDL_FILES
Modules/mediasource/SourceBuffer.idl
Modules/mediasource/SourceBufferList.idl
- Modules/mediastream/AllAudioCapabilities.idl
- Modules/mediastream/AllVideoCapabilities.idl
- Modules/mediastream/AudioStreamTrack.idl
- Modules/mediastream/CapabilityRange.idl
- Modules/mediastream/HTMLMediaElementMediaStream.idl
- Modules/mediastream/MediaSourceStates.idl
- Modules/mediastream/MediaStream.idl
- Modules/mediastream/MediaStreamCapabilities.idl
- Modules/mediastream/MediaStreamEvent.idl
- Modules/mediastream/MediaStreamTrack.idl
- Modules/mediastream/MediaStreamTrackEvent.idl
- Modules/mediastream/MediaStreamTrackSourcesCallback.idl
- Modules/mediastream/MediaTrackConstraint.idl
- Modules/mediastream/MediaTrackConstraintSet.idl
- Modules/mediastream/MediaTrackConstraints.idl
- Modules/mediastream/NavigatorMediaStream.idl
- Modules/mediastream/NavigatorUserMediaError.idl
- Modules/mediastream/NavigatorUserMediaErrorCallback.idl
- Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
- Modules/mediastream/RTCDTMFSender.idl
- Modules/mediastream/RTCDTMFToneChangeEvent.idl
- Modules/mediastream/RTCDataChannel.idl
- Modules/mediastream/RTCDataChannelEvent.idl
- Modules/mediastream/RTCErrorCallback.idl
- Modules/mediastream/RTCIceCandidate.idl
- Modules/mediastream/RTCIceCandidateEvent.idl
- Modules/mediastream/RTCPeerConnection.idl
- Modules/mediastream/RTCSessionDescription.idl
- Modules/mediastream/RTCSessionDescriptionCallback.idl
- Modules/mediastream/RTCStatsCallback.idl
- Modules/mediastream/RTCStatsReport.idl
- Modules/mediastream/RTCStatsResponse.idl
- Modules/mediastream/SourceInfo.idl
- Modules/mediastream/VideoStreamTrack.idl
-
Modules/navigatorcontentutils/NavigatorContentUtils.idl
Modules/networkinfo/NavigatorNetworkInfoConnection.idl
@@ -589,6 +554,45 @@ set(WebCore_IDL_FILES
xml/XSLTProcessor.idl
)
+if (NOT PORT STREQUAL "GTK")
+ list(APPEND WebCore_IDL_FILES
+ Modules/mediastream/AllAudioCapabilities.idl
+ Modules/mediastream/AllVideoCapabilities.idl
+ Modules/mediastream/AudioStreamTrack.idl
+ Modules/mediastream/CapabilityRange.idl
+ Modules/mediastream/HTMLMediaElementMediaStream.idl
+ Modules/mediastream/MediaSourceStates.idl
+ Modules/mediastream/MediaStream.idl
+ Modules/mediastream/MediaStreamCapabilities.idl
+ Modules/mediastream/MediaStreamEvent.idl
+ Modules/mediastream/MediaStreamTrack.idl
+ Modules/mediastream/MediaStreamTrackEvent.idl
+ Modules/mediastream/MediaStreamTrackSourcesCallback.idl
+ Modules/mediastream/MediaTrackConstraint.idl
+ Modules/mediastream/MediaTrackConstraintSet.idl
+ Modules/mediastream/MediaTrackConstraints.idl
+ Modules/mediastream/NavigatorMediaStream.idl
+ Modules/mediastream/NavigatorUserMediaError.idl
+ Modules/mediastream/NavigatorUserMediaErrorCallback.idl
+ Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
+ Modules/mediastream/RTCDTMFSender.idl
+ Modules/mediastream/RTCDTMFToneChangeEvent.idl
+ Modules/mediastream/RTCDataChannel.idl
+ Modules/mediastream/RTCDataChannelEvent.idl
+ Modules/mediastream/RTCErrorCallback.idl
+ Modules/mediastream/RTCIceCandidate.idl
+ Modules/mediastream/RTCIceCandidateEvent.idl
+ Modules/mediastream/RTCPeerConnection.idl
+ Modules/mediastream/RTCSessionDescription.idl
+ Modules/mediastream/RTCSessionDescriptionCallback.idl
+ Modules/mediastream/RTCStatsCallback.idl
+ Modules/mediastream/RTCStatsReport.idl
+ Modules/mediastream/RTCStatsResponse.idl
+ Modules/mediastream/SourceInfo.idl
+ Modules/mediastream/VideoStreamTrack.idl
+ )
+endif ()
+
# FIXME: The BlackBerry port doesn't support generating DOM bindings from the SVG IDL files.
# For now, we explicitly demarcate the SVG IDL files so that the BlackBerry port can skip them
# during DOM binding generation. See <https://bugs.webkit.org/show_bug.cgi?id=72773>.
View
247 Source/WebCore/PlatformGTK.cmake
@@ -43,6 +43,8 @@ list(APPEND WebCore_SOURCES
editing/atk/FrameSelectionAtk.cpp
+ html/shadow/MediaControlsGtk.cpp
+
loader/soup/CachedRawResourceSoup.cpp
loader/soup/SubresourceLoaderSoup.cpp
@@ -391,47 +393,52 @@ if (ENABLE_WEBKIT2)
)
list(APPEND GObjectDOMBindings_IDL_FILES
- dom/Attr.idl
- page/BarProp.idl
- Modules/battery/BatteryManager.idl
- fileapi/Blob.idl
- dom/CDATASection.idl
- dom/CharacterData.idl
- dom/Comment.idl
- page/Console.idl
css/CSSRule.idl
css/CSSRuleList.idl
css/CSSStyleDeclaration.idl
css/CSSStyleSheet.idl
css/CSSValue.idl
- Modules/webdatabase/Database.idl
- dom/Document.idl
+ css/DOMWindowCSS.idl
+ css/MediaList.idl
+ css/MediaQueryList.idl
+ css/StyleMedia.idl
+ css/StyleSheet.idl
+ css/StyleSheetList.idl
+ dom/Attr.idl
+ dom/CDATASection.idl
+ dom/CharacterData.idl
+ dom/Comment.idl
dom/DocumentFragment.idl
+ dom/Document.idl
dom/DocumentType.idl
- loader/appcache/DOMApplicationCache.idl
dom/DOMImplementation.idl
- plugins/DOMMimeTypeArray.idl
- plugins/DOMMimeType.idl
dom/DOMNamedFlowCollection.idl
- plugins/DOMPluginArray.idl
- plugins/DOMPlugin.idl
- page/DOMSecurityPolicy.idl
- page/DOMSelection.idl
dom/DOMStringList.idl
dom/DOMStringMap.idl
- html/DOMSettableTokenList.idl
- html/DOMTokenList.idl
- page/DOMWindow.idl
- css/DOMWindowCSS.idl
dom/Element.idl
dom/EntityReference.idl
dom/Event.idl
+ dom/KeyboardEvent.idl
+ dom/MessagePort.idl
+ dom/MouseEvent.idl
+ dom/NamedNodeMap.idl
+ dom/NodeFilter.idl
+ dom/Node.idl
+ dom/NodeIterator.idl
+ dom/NodeList.idl
+ dom/ProcessingInstruction.idl
+ dom/Range.idl
+ dom/ShadowRoot.idl
+ dom/Text.idl
+ dom/TreeWalker.idl
+ dom/UIEvent.idl
+ dom/WebKitNamedFlow.idl
+ dom/WheelEvent.idl
+ fileapi/Blob.idl
fileapi/File.idl
fileapi/FileList.idl
- Modules/gamepad/Gamepad.idl
- Modules/gamepad/GamepadList.idl
- Modules/geolocation/Geolocation.idl
- page/History.idl
+ html/DOMSettableTokenList.idl
+ html/DOMTokenList.idl
html/HTMLAnchorElement.idl
html/HTMLAppletElement.idl
html/HTMLAreaElement.idl
@@ -493,90 +500,92 @@ if (ENABLE_WEBKIT2)
html/HTMLTextAreaElement.idl
html/HTMLTitleElement.idl
html/HTMLUListElement.idl
- dom/KeyboardEvent.idl
- page/Location.idl
+ html/MediaController.idl
html/MediaError.idl
- css/MediaList.idl
- css/MediaQueryList.idl
- dom/MessagePort.idl
- dom/MouseEvent.idl
- dom/NamedNodeMap.idl
+ html/TimeRanges.idl
+ html/ValidityState.idl
+ loader/appcache/DOMApplicationCache.idl
+ Modules/battery/BatteryManager.idl
+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadList.idl
+ Modules/geolocation/Geolocation.idl
+ Modules/quota/StorageInfo.idl
+ Modules/quota/StorageQuota.idl
+ Modules/webdatabase/Database.idl
+ page/BarProp.idl
+ page/Console.idl
+ page/DOMSecurityPolicy.idl
+ page/DOMSelection.idl
+ page/DOMWindow.idl
+ page/History.idl
+ page/Location.idl
page/Navigator.idl
- dom/Node.idl
- dom/NodeFilter.idl
- dom/NodeIterator.idl
- dom/NodeList.idl
- page/Performance.idl
page/PerformanceEntry.idl
page/PerformanceEntryList.idl
+ page/Performance.idl
page/PerformanceNavigation.idl
page/PerformanceTiming.idl
- dom/ProcessingInstruction.idl
- dom/Range.idl
page/Screen.idl
- dom/ShadowRoot.idl
- storage/Storage.idl
- Modules/quota/StorageInfo.idl
- Modules/quota/StorageQuota.idl
- css/StyleMedia.idl
- css/StyleSheet.idl
- css/StyleSheetList.idl
- dom/Text.idl
- html/TimeRanges.idl
- dom/TreeWalker.idl
- dom/UIEvent.idl
- html/ValidityState.idl
page/WebKitPoint.idl
- dom/WebKitNamedFlow.idl
+ plugins/DOMMimeTypeArray.idl
+ plugins/DOMMimeType.idl
+ plugins/DOMPluginArray.idl
+ plugins/DOMPlugin.idl
+ storage/Storage.idl
xml/XPathExpression.idl
xml/XPathNSResolver.idl
xml/XPathResult.idl
)
set(GDOM_CLASS_LIST
- EventTarget
- Object
- Attr
- BarProp
BatteryManager
- Blob
- CDATASection
- CharacterData
- Comment
- Console
CSSRule
CSSRuleList
CSSStyleDeclaration
CSSStyleSheet
CSSValue
- Database
+ MediaController
+ MediaList
+ MediaQueryList
+ StyleMedia
+ StyleSheet
+ StyleSheetList
+ Attr
+ CDATASection
+ CharacterData
+ Comment
Document
DocumentFragment
DocumentType
- DOMApplicationCache
DOMImplementation
- DOMMimeTypeArray
- DOMMimeType
DOMNamedFlowCollection
- DOMPluginArray
- DOMPlugin
+ DOMSettableTokenList
DOMSecurityPolicy
- DOMSelection
DOMStringList
DOMStringMap
- DOMSettableTokenList
DOMTokenList
- DOMWindow
- DOMWindowCSS
Element
EntityReference
Event
+ KeyboardEvent
+ MessagePort
+ MouseEvent
+ NamedNodeMap
+ Node
+ NodeFilter
+ NodeIterator
+ NodeList
+ ProcessingInstruction
+ Range
+ Text
+ TreeWalker
+ UIEvent
+ Blob
File
FileList
Gamepad
GamepadList
Geolocation
- History
HTMLAnchorElement
HTMLAppletElement
HTMLAreaElement
@@ -587,11 +596,11 @@ if (ENABLE_WEBKIT2)
HTMLButtonElement
HTMLCanvasElement
HTMLCollection
- HTMLDetailsElement
HTMLDirectoryElement
HTMLDivElement
HTMLDListElement
HTMLDocument
+ HTMLDetailsElement
HTMLElement
HTMLEmbedElement
HTMLFieldSetElement
@@ -629,58 +638,82 @@ if (ENABLE_WEBKIT2)
HTMLScriptElement
HTMLSelectElement
HTMLStyleElement
+ HTMLTableElement
HTMLTableCaptionElement
- HTMLTableCellElement
HTMLTableColElement
- HTMLTableElement
- HTMLTableRowElement
HTMLTableSectionElement
+ HTMLTableCellElement
HTMLTextAreaElement
HTMLTitleElement
+ HTMLTableRowElement
HTMLUListElement
- KeyboardEvent
- Location
MediaError
- MediaList
- MediaQueryList
- MessagePort
- MouseEvent
- NamedNodeMap
+ TimeRanges
+ ValidityState
+ DOMApplicationCache
+ BarProp
+ Console
+ Custom
+ Deprecated
+ DOMWindowCSS
+ DOMWindow
+ DOMSelection
+ EventTarget
+ History
+ Location
+ Object
Navigator
- Node
- NodeFilter
- NodeIterator
- NodeList
- Performance
- PerformanceEntry
- PerformanceEntryList
- PerformanceNavigation
- PerformanceTiming
- ProcessingInstruction
- Range
Screen
ShadowRoot
+ WebKitPoint
+ WebKitNamedFlow
+ DOMMimeType
+ DOMMimeTypeArray
+ DOMPlugin
+ DOMPluginArray
+ Database
Storage
StorageInfo
StorageQuota
- StyleMedia
- StyleSheet
- StyleSheetList
- Text
- TimeRanges
- TreeWalker
- UIEvent
- ValidityState
- WebKitPoint
- WebKitNamedFlow
XPathExpression
XPathNSResolver
XPathResult
- XPathResult
+ Performance
+ PerformanceEntry
+ PerformanceEntryList
+ PerformanceNavigation
+ PerformanceTiming
+ WheelEvent
)
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
-
+ list(APPEND GObjectDOMBindings_IDL_FILES
+ html/HTMLAudioElement.idl
+ html/HTMLVideoElement.idl
+ html/track/AudioTrack.idl
+ html/track/AudioTrackList.idl
+ html/track/TextTrack.idl
+ html/track/TextTrackList.idl
+ html/track/TextTrackCue.idl
+ html/track/TextTrackCueList.idl
+ html/track/TrackEvent.idl
+ html/track/VideoTrack.idl
+ html/track/VideoTrackList.idl
+ )
+
+ list(APPEND GDOM_CLASS_LIST
+ HTMLAudioElement
+ HTMLVideoElement
+ AudioTrack
+ AudioTrackList
+ TextTrack
+ TextTrackList
+ TextTrackCue
+ TextTrackCueList
+ TrackEvent
+ VideoTrack
+ VideoTrackList
+ )
endif ()
set(GOBJECT_DOM_BINDINGS_FEATURES_DEFINES "LANGUAGE_GOBJECT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
@@ -721,6 +754,8 @@ if (ENABLE_WEBKIT2)
add_library(GObjectDOMBindings STATIC ${GObjectDOMBindings_SOURCES})
+ WEBKIT_SET_EXTRA_COMPILER_FLAGS(GObjectDOMBindings)
+
add_dependencies(GObjectDOMBindings
WebCore
fake-installed-webkitdom-headers
View
3  Source/WebKit2/CMakeLists.txt
@@ -290,6 +290,7 @@ set(WebKit2_SOURCES
UIProcess/APINavigationData.cpp
UIProcess/BackingStore.cpp
UIProcess/DrawingAreaProxy.cpp
+ UIProcess/DrawingAreaProxyImpl.cpp
UIProcess/FindIndicator.cpp
UIProcess/FrameLoadState.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
@@ -548,6 +549,7 @@ set(WebKit2_SOURCES
WebProcess/WebPage/DecoderAdapter.cpp
WebProcess/WebPage/DrawingArea.cpp
+ WebProcess/WebPage/DrawingAreaImpl.cpp
WebProcess/WebPage/EncoderAdapter.cpp
WebProcess/WebPage/EventDispatcher.cpp
WebProcess/WebPage/FindController.cpp
@@ -702,6 +704,7 @@ add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
add_dependencies(WebKit2 WebCore)
add_dependencies(WebKit2 ${WEBKIT2_EXTRA_DEPENDENCIES})
+add_dependencies(WebKit2 GObjectDOMBindings)
target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "")
View
22 Source/WebKit2/PlatformGTK.cmake
@@ -1,3 +1,4 @@
+set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
@@ -32,8 +33,6 @@ list(APPEND WebKit2_SOURCES
Shared/API/c/cairo/WKImageCairo.cpp
- Shared/API/c/gtk/WKGraphicsContextGtk.cpp
-
Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp
Shared/Downloads/soup/DownloadSoup.cpp
@@ -246,7 +245,6 @@ list(APPEND WebKit2_SOURCES
UIProcess/gtk/WebContextGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebFullScreenClientGtk.cpp
- UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
UIProcess/gtk/WebInspectorClientGtk.cpp
UIProcess/gtk/WebInspectorProxyGtk.cpp
UIProcess/gtk/WebPageProxyGtk.cpp
@@ -261,6 +259,11 @@ list(APPEND WebKit2_SOURCES
WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
+
WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
@@ -334,9 +337,20 @@ set(WebKit2_INSTALLED_HEADERS
${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFramePrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorldPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
+
)
list(APPEND WebKit2_MESSAGES_IN_FILES
@@ -474,6 +488,7 @@ include_directories(
"${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
"${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/InjectedBundle"
+ "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}/include"
)
@@ -481,3 +496,4 @@ add_library(webkit2gtkinjectedbundle MODULE
"${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
)
add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
+list(APPEND WebKit2_LIBRARIES GObjectDOMBindings)
View
4 Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp
@@ -30,7 +30,7 @@
namespace WebKit {
-WebGtkExtensionManager& WebGtkExtensionManager::shared()
+WK_EXPORT WebGtkExtensionManager& WebGtkExtensionManager::shared()
{
DEFINE_STATIC_LOCAL(WebGtkExtensionManager, extensionManager, ());
return extensionManager;
@@ -49,7 +49,7 @@ void WebGtkExtensionManager::scanModules(const String& webExtensionsDirectory, V
}
}
-void WebGtkExtensionManager::initialize(WKBundleRef bundle, WKTypeRef userData)
+WK_EXPORT void WebGtkExtensionManager::initialize(WKBundleRef bundle, WKTypeRef userData)
{
m_extension = adoptGRef(webkitWebExtensionCreate(toImpl(bundle)));
View
4 Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h
@@ -38,9 +38,9 @@ class WebGtkExtensionManager {
WTF_MAKE_NONCOPYABLE(WebGtkExtensionManager);
public:
- static WebGtkExtensionManager& shared();
+ WK_EXPORT static WebGtkExtensionManager& shared();
- void initialize(WKBundleRef, WKTypeRef);
+ WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
private:
WebGtkExtensionManager();
View
2  Source/cmake/OptionsGTK.cmake
@@ -31,7 +31,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
View
12 Tools/MiniBrowser/gtk/CMakeLists.txt
@@ -5,14 +5,16 @@ file(MAKE_DIRECTORY ${DERIVED_SOURCES_MINIBROWSER_DIR})
set(MiniBrowser_SOURCES
${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
- ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
+ ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
${MINIBROWSER_DIR}/BrowserDownloadsBar.c
- ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
+ ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
+ ${MINIBROWSER_DIR}/BrowserSearchBar.c
+ ${MINIBROWSER_DIR}/BrowserSearchBar.h
${MINIBROWSER_DIR}/BrowserSettingsDialog.c
- ${MINIBROWSER_DIR}/BrowserWindow.h
+ ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
${MINIBROWSER_DIR}/BrowserWindow.c
+ ${MINIBROWSER_DIR}/BrowserWindow.h
${MINIBROWSER_DIR}/main.c
)
@@ -36,7 +38,7 @@ set(MiniBrowser_LIBRARIES
add_custom_command(
OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- ${DERIVED_SOURCES_MINIBROWSER_DIR}/Browsermarshal.h
+ ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h

No commit comments for this range

Something went wrong with that request. Please try again.