Diff
Modified: trunk/ChangeLog (182031 => 182032)
--- trunk/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,12 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * Source/cmake/OptionsMac.cmake:
+
2015-03-24 Csaba Osztrogonác <[email protected]>
[EFL] Add OpenWebRTC in jhbuild
Modified: trunk/Source/WTF/ChangeLog (182031 => 182032)
--- trunk/Source/WTF/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WTF/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,12 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * wtf/PlatformMac.cmake:
+
2015-03-25 Filip Pizlo <[email protected]>
Unreviewed, we have edited this file in 2015.
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (182031 => 182032)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,4 +1,13 @@
list(APPEND WTF_SOURCES
+ AutodrainedPoolMac.mm
+ RunLoopTimerCF.cpp
+ SchedulePairCF.cpp
+ SchedulePairMac.mm
+
+ cf/RunLoopCF.cpp
+
+ cocoa/WorkQueueCocoa.cpp
+
mac/DeprecatedSymbolsUsedBySafari.mm
mac/MainThreadMac.mm
Modified: trunk/Source/WebCore/CMakeLists.txt (182031 => 182032)
--- trunk/Source/WebCore/CMakeLists.txt 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1998,6 +1998,7 @@
platform/ContextMenu.cpp
platform/ContextMenuItem.cpp
platform/CrossThreadCopier.cpp
+ platform/Cursor.cpp
platform/DateComponents.cpp
platform/Decimal.cpp
platform/DisplaySleepDisabler.cpp
@@ -3146,6 +3147,7 @@
set(WebCoreTestSupport_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/mock"
"${WEBCORE_DIR}/testing"
+ "${DERIVED_SOURCES_WEBCORE_DIR}"
)
set(WebCoreTestSupport_IDL_INCLUDES
Modified: trunk/Source/WebCore/ChangeLog (182031 => 182032)
--- trunk/Source/WebCore/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,16 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * platform/graphics/mac/IconMac.mm:
+
2015-03-26 Jer Noble <[email protected]>
[iOS] Accessibility crashing because MediaPlayer is laying out UI off the main thread
Modified: trunk/Source/WebCore/PlatformEfl.cmake (182031 => 182032)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -66,7 +66,6 @@
platform/ContextMenuItemNone.cpp
platform/ContextMenuNone.cpp
- platform/Cursor.cpp
platform/audio/efl/AudioBusEfl.cpp
Modified: trunk/Source/WebCore/PlatformGTK.cmake (182031 => 182032)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -49,7 +49,6 @@
loader/soup/CachedRawResourceSoup.cpp
loader/soup/SubresourceLoaderSoup.cpp
- platform/Cursor.cpp
platform/PlatformStrategies.cpp
platform/audio/gtk/AudioBusGtk.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (182031 => 182032)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -8,6 +8,7 @@
"${WEBCORE_DIR}/loader/mac"
"${WEBCORE_DIR}/page/cocoa"
"${WEBCORE_DIR}/page/mac"
+ "${WEBCORE_DIR}/platform/audio/mac"
"${WEBCORE_DIR}/platform/cf"
"${WEBCORE_DIR}/platform/cocoa"
"${WEBCORE_DIR}/platform/graphics/avfoundation"
@@ -18,6 +19,7 @@
"${WEBCORE_DIR}/platform/graphics/cocoa"
"${WEBCORE_DIR}/platform/graphics/cg"
"${WEBCORE_DIR}/platform/graphics/opentype"
+ "${WEBCORE_DIR}/platform/graphics/opengl"
"${WEBCORE_DIR}/platform/graphics/mac"
"${WEBCORE_DIR}/platform/mac"
"${WEBCORE_DIR}/platform/network/cocoa"
@@ -41,6 +43,14 @@
accessibility/mac/WebAccessibilityObjectWrapperBase.mm
accessibility/mac/WebAccessibilityObjectWrapperMac.mm
+ crypto/CommonCryptoUtilities.cpp
+ crypto/CryptoAlgorithm.cpp
+ crypto/CryptoAlgorithmDescriptionBuilder.cpp
+ crypto/CryptoAlgorithmRegistry.cpp
+ crypto/CryptoKey.cpp
+ crypto/CryptoKeyPair.cpp
+ crypto/SubtleCrypto.cpp
+
loader/archive/cf/LegacyWebArchive.cpp
loader/archive/cf/LegacyWebArchiveMac.mm
@@ -56,16 +66,41 @@
page/mac/SettingsMac.mm
page/mac/UserAgentMac.mm
+ platform/LocalizedStrings.cpp
+
+ platform/audio/mac/AudioBusMac.mm
+ platform/audio/mac/AudioDestinationMac.cpp
+ platform/audio/mac/AudioFileReaderMac.cpp
+ platform/audio/mac/AudioHardwareListenerMac.cpp
+ platform/audio/mac/AudioSessionMac.cpp
+ platform/audio/mac/CARingBuffer.cpp
+ platform/audio/mac/FFTFrameMac.cpp
+ platform/audio/mac/MediaSessionManagerMac.cpp
+
+ platform/cf/CFURLExtras.cpp
+ platform/cf/CoreMediaSoftLink.cpp
+ platform/cf/FileSystemCF.cpp
+ platform/cf/MediaAccessibilitySoftLink.cpp
+ platform/cf/RunLoopObserver.cpp
+ platform/cf/SharedBufferCF.cpp
+ platform/cf/SharedTimerCF.mm
+ platform/cf/URLCF.cpp
+
platform/cocoa/DisplaySleepDisablerCocoa.cpp
platform/cocoa/KeyEventCocoa.mm
platform/cocoa/MemoryPressureHandlerCocoa.mm
platform/cocoa/SystemVersion.mm
platform/cocoa/TelephoneNumberDetectorCocoa.cpp
+ platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
+ platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
+ platform/graphics/avfoundation/MediaPlaybackTargetMac.mm
platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
+ platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
+ platform/graphics/avfoundation/MediaTimeAVFoundation.cpp
platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
@@ -96,6 +131,59 @@
platform/graphics/ca/mac/PlatformCALayerMac.mm
platform/graphics/ca/mac/WebTiledBackingLayer.mm
+ platform/graphics/cg/BitmapImageCG.cpp
+ platform/graphics/cg/ColorCG.cpp
+ platform/graphics/cg/FloatPointCG.cpp
+ platform/graphics/cg/FloatRectCG.cpp
+ platform/graphics/cg/FloatSizeCG.cpp
+ platform/graphics/cg/GradientCG.cpp
+ platform/graphics/cg/GraphicsContext3DCG.cpp
+ platform/graphics/cg/GraphicsContextCG.cpp
+ platform/graphics/cg/IOSurfacePool.cpp
+ platform/graphics/cg/ImageBufferCG.cpp
+ platform/graphics/cg/ImageBufferDataCG.cpp
+ platform/graphics/cg/ImageCG.cpp
+ platform/graphics/cg/ImageSourceCG.cpp
+ platform/graphics/cg/ImageSourceCGMac.mm
+ platform/graphics/cg/ImageSourceCGWin.cpp
+ platform/graphics/cg/IntPointCG.cpp
+ platform/graphics/cg/IntRectCG.cpp
+ platform/graphics/cg/IntSizeCG.cpp
+ platform/graphics/cg/PDFDocumentImage.cpp
+ platform/graphics/cg/PathCG.cpp
+ platform/graphics/cg/PatternCG.cpp
+ platform/graphics/cg/SubimageCacheWithTimer.cpp
+ platform/graphics/cg/TransformationMatrixCG.cpp
+
+ platform/graphics/mac/ColorMac.mm
+ platform/graphics/mac/ComplexTextController.cpp
+ platform/graphics/mac/ComplexTextControllerCoreText.mm
+ platform/graphics/mac/DisplayRefreshMonitorMac.cpp
+ platform/graphics/mac/FloatPointMac.mm
+ platform/graphics/mac/FloatRectMac.mm
+ platform/graphics/mac/FloatSizeMac.mm
+ platform/graphics/mac/FontCacheMac.mm
+ platform/graphics/mac/FontCustomPlatformData.cpp
+ platform/graphics/mac/GlyphPageMac.cpp
+ platform/graphics/mac/GraphicsContext3DMac.mm
+ platform/graphics/mac/GraphicsContextMac.mm
+ platform/graphics/mac/IconMac.mm
+ platform/graphics/mac/ImageMac.mm
+ platform/graphics/mac/IntPointMac.mm
+ platform/graphics/mac/IntRectMac.mm
+ platform/graphics/mac/IntSizeMac.mm
+ platform/graphics/mac/MediaTimeQTKit.mm
+ platform/graphics/mac/PDFDocumentImageMac.mm
+ platform/graphics/mac/SimpleFontDataCoreText.cpp
+ platform/graphics/mac/WebGLLayer.mm
+ platform/graphics/mac/WebLayer.mm
+
+ platform/graphics/opengl/Extensions3DOpenGL.cpp
+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+ platform/graphics/opengl/TemporaryOpenGLSetting.cpp
+
platform/graphics/opentype/OpenTypeMathData.cpp
platform/mac/BlockExceptions.mm
@@ -191,6 +279,9 @@
platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
platform/network/mac/WebCoreURLResponse.mm
+ platform/posix/FileSystemPOSIX.cpp
+ platform/posix/SharedBufferPOSIX.cpp
+
platform/text/cf/HyphenationCF.cpp
platform/text/mac/LocaleMac.mm
@@ -214,6 +305,7 @@
editing
editing/cocoa
editing/mac
+ fileapi
history
html
html/forms
@@ -221,6 +313,7 @@
html/shadow
inspector
loader
+
loader/appcache
loader/archive
loader/archive/cf
@@ -233,6 +326,7 @@
platform
plugins
rendering
+ replay
storage
style
svg
@@ -242,6 +336,7 @@
page/scrolling
platform/animation
+ platform/audio
platform/graphics
platform/mac
platform/mock
@@ -250,6 +345,7 @@
platform/text
platform/graphics/ca
+ platform/graphics/cg
platform/graphics/filters
platform/graphics/mac
platform/graphics/transforms
Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (182031 => 182032)
--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2015-03-26 22:53:46 UTC (rev 182032)
@@ -18,11 +18,11 @@
*
*/
-#if !PLATFORM(IOS)
-
#import "config.h"
#import "Icon.h"
+#if !PLATFORM(IOS)
+
#import "GraphicsContext.h"
#import "IntRect.h"
#import "LocalCurrentGraphicsContext.h"
Modified: trunk/Source/WebKit/ChangeLog (182031 => 182032)
--- trunk/Source/WebKit/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,12 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+
2015-03-20 Alex Christensen <[email protected]>
Progress towards CMake on Mac.
Modified: trunk/Source/WebKit/PlatformMac.cmake (182031 => 182032)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,36 @@
+find_library(ACCELERATE_LIBRARY accelerate)
+find_library(AUDIOUNIT_LIBRARY AudioUnit)
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(DISKARBITRATION_LIBRARY DiskArbitration)
+find_library(IOKIT_LIBRARY IOKit)
+find_library(OPENGL_LIBRARY OpenGL)
+find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SQLITE3_LIBRARY sqlite3)
+find_library(XML2_LIBRARY XML2)
+find_package(ZLIB REQUIRED)
+
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+endif ()
+link_directories(../../WebKitLibraries)
+
+list(APPEND WebKit_LIBRARIES
+ ${ACCELERATE_LIBRARY}
+ ${AUDIOUNIT_LIBRARY}
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${DISKARBITRATION_LIBRARY}
+ ${IOKIT_LIBRARY}
+ ${OPENGL_LIBRARY}
+ ${QUARTZCORE_LIBRARY}
+ ${SQLITE3_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ ${XML2_LIBRARY}
+)
+
list(APPEND WebKit_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/dfg"
"${WEBCORE_DIR}/accessibility/mac"
Modified: trunk/Source/WebKit/mac/ChangeLog (182031 => 182032)
--- trunk/Source/WebKit/mac/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,12 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2015-03-26 Ryosuke Niwa <[email protected]>
Cursor doesn't change back to pointer when leaving Mail
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (182031 => 182032)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-26 22:53:46 UTC (rev 182032)
@@ -239,7 +239,9 @@
virtual void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
#endif
+#if ENABLE(CONTENT_FILTERING)
void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
+#endif
RetainPtr<WebFrame> m_webFrame;
Modified: trunk/Source/WebKit2/CMakeLists.txt (182031 => 182032)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-03-26 22:53:46 UTC (rev 182032)
@@ -154,17 +154,7 @@
)
endif ()
-set(WebKit2_SOURCES
- DatabaseProcess/DatabaseToWebProcessConnection.cpp
- DatabaseProcess/DatabaseProcess.cpp
- DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
- DatabaseProcess/IndexedDB/IDBSerialization.cpp
- DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
- DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
- DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
- DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
- DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
-
+set(NetworkProcess_SOURCES
NetworkProcess/NetworkConnectionToWebProcess.cpp
NetworkProcess/NetworkProcess.cpp
NetworkProcess/NetworkProcessPlatformStrategies.cpp
@@ -178,7 +168,19 @@
NetworkProcess/cache/NetworkCacheEncoder.cpp
NetworkProcess/cache/NetworkCacheDecoder.cpp
NetworkProcess/cache/NetworkCacheKey.cpp
+)
+set(WebKit2_SOURCES
+ DatabaseProcess/DatabaseToWebProcessConnection.cpp
+ DatabaseProcess/DatabaseProcess.cpp
+ DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
+ DatabaseProcess/IndexedDB/IDBSerialization.cpp
+ DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
+ DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
+ DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
+ DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
+ DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
+
Platform/Logging.cpp
Platform/Module.cpp
@@ -319,9 +321,6 @@
Shared/WebsiteData/WebsiteData.cpp
- UIProcess/API/APINavigationData.cpp
- UIProcess/API/APIProcessPoolConfiguration.cpp
- UIProcess/API/APISession.cpp
UIProcess/BackingStore.cpp
UIProcess/DrawingAreaProxy.cpp
UIProcess/FrameLoadState.cpp
@@ -389,6 +388,9 @@
UIProcess/API/APIFrameInfo.cpp
UIProcess/API/APINavigation.cpp
+ UIProcess/API/APINavigationData.cpp
+ UIProcess/API/APIProcessPoolConfiguration.cpp
+ UIProcess/API/APISession.cpp
UIProcess/API/APISessionState.cpp
UIProcess/API/APIWebsiteDataStore.cpp
UIProcess/API/APIUserContentExtension.cpp
@@ -620,6 +622,8 @@
WebProcess/WebPage/WebPageOverlay.cpp
WebProcess/WebPage/VisitedLinkTableController.cpp
WebProcess/WebPage/WebUndoStep.cpp
+
+ ${NetworkProcess_SOURCES}
)
set(WebKit2_MESSAGES_IN_FILES
Modified: trunk/Source/WebKit2/ChangeLog (182031 => 182032)
--- trunk/Source/WebKit2/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
@@ -1,3 +1,14 @@
+2015-03-26 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+
2015-03-26 Chris Dumez <[email protected]>
[WK2][Cocoa] Add private API to override the network disk cache size
Modified: trunk/Source/WebKit2/PlatformMac.cmake (182031 => 182032)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -13,6 +13,7 @@
"${WEBKIT2_DIR}/Platform/mac"
"${WEBKIT2_DIR}/Platform/IPC/mac"
"${WEBKIT2_DIR}/Shared/API/Cocoa"
+ "${WEBKIT2_DIR}/Shared/API/c/cf"
"${WEBKIT2_DIR}/Shared/cf"
"${WEBKIT2_DIR}/Shared/mac"
"${WEBKIT2_DIR}/Shared/Plugins/mac"
@@ -42,9 +43,12 @@
)
set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+ Shared/API/c
+ Shared/API/c/mac
UIProcess/API/C
- Shared/API/c
UIProcess/Cocoa
+ WebProcess/InjectedBundle/API/c
+ WebProcess/WebPage
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (182031 => 182032)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-26 22:53:46 UTC (rev 182032)
@@ -72,10 +72,12 @@
}
}
+#if ENABLE(CONTENT_FILTERING)
void WebPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
{
if (WebFrameProxy* frame = m_process->webFrame(frameID))
frame->contentFilterDidBlockLoad(unblockHandler);
}
+#endif
}
Modified: trunk/Source/cmake/OptionsMac.cmake (182031 => 182032)
--- trunk/Source/cmake/OptionsMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
@@ -214,6 +214,13 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE ON)
+
WEBKIT_OPTION_END()
set(ENABLE_WEBKIT ON)
