WebKit Bugzilla
Attachment 372396 Details for
Bug 198979
: Allow CMake to build WebCore on Mac
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198979-20190618155207.patch (text/plain), 7.01 KB, created by
Alex Christensen
on 2019-06-18 15:52:07 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2019-06-18 15:52:07 PDT
Size:
7.01 KB
patch
obsolete
>Index: Source/ThirdParty/ANGLE/ChangeLog >=================================================================== >--- Source/ThirdParty/ANGLE/ChangeLog (revision 246574) >+++ Source/ThirdParty/ANGLE/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-18 Alex Christensen <achristensen@webkit.org> >+ >+ Allow CMake to build WebCore on Mac >+ https://bugs.webkit.org/show_bug.cgi?id=198979 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * include/GLSLANG/ShaderLang.h: >+ > 2019-06-18 Kenneth Russell <kbr@chromium.org> > > Add preliminary ANGLE backend to WebCore >Index: Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h >=================================================================== >--- Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h (revision 246566) >+++ Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h (working copy) >@@ -8,7 +8,7 @@ > > #include <stddef.h> > >-#if defined(__APPLE__) >+#if defined(__APPLE__) && !defined(BUILDING_WITH_CMAKE) > #include "khrplatform.h" > #else > #include "../KHR/khrplatform.h" >Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 246566) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,16 @@ >+2019-06-18 Alex Christensen <achristensen@webkit.org> >+ >+ Allow CMake to build WebCore on Mac >+ https://bugs.webkit.org/show_bug.cgi?id=198979 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Modules/websockets/ThreadableWebSocketChannel.cpp: >+ (WebCore::ThreadableWebSocketChannel::validateURL): >+ * PlatformMac.cmake: >+ * platform/cocoa/VideoFullscreenModelVideoElement.mm: >+ * platform/ios/WebItemProviderPasteboard.h: >+ > 2019-06-18 Keith Miller <keith_miller@apple.com> > > Add support for WeakRef >Index: Source/WebCore/PlatformMac.cmake >=================================================================== >--- Source/WebCore/PlatformMac.cmake (revision 246566) >+++ Source/WebCore/PlatformMac.cmake (working copy) >@@ -163,6 +163,8 @@ list(APPEND WebCore_SOURCES > page/mac/TextIndicatorWindow.mm > page/mac/WheelEventDeltaFilterMac.mm > >+ page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp >+ > page/scrolling/mac/ScrollingCoordinatorMac.mm > page/scrolling/mac/ScrollingMomentumCalculatorMac.mm > page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm >Index: Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp >=================================================================== >--- Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp (revision 246566) >+++ Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp (working copy) >@@ -83,6 +83,8 @@ Optional<ThreadableWebSocketChannel::Val > validatedURL.areCookiesAllowed = !results.summary.blockedCookies; > } > } >+#else >+ UNUSED_PARAM(document); > #endif > return validatedURL; > } >Index: Source/WebCore/PAL/ChangeLog >=================================================================== >--- Source/WebCore/PAL/ChangeLog (revision 246566) >+++ Source/WebCore/PAL/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-06-18 Alex Christensen <achristensen@webkit.org> >+ >+ Allow CMake to build WebCore on Mac >+ https://bugs.webkit.org/show_bug.cgi?id=198979 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * pal/PlatformMac.cmake: >+ > 2019-06-18 Jiewen Tan <jiewen_tan@apple.com> > > Link to the new AppSSO private framework >Index: Source/WebCore/PAL/pal/PlatformMac.cmake >=================================================================== >--- Source/WebCore/PAL/pal/PlatformMac.cmake (revision 246566) >+++ Source/WebCore/PAL/pal/PlatformMac.cmake (working copy) >@@ -105,6 +105,7 @@ list(APPEND PAL_SOURCES > > cf/CoreMediaSoftLink.cpp > >+ cocoa/AVFoundationSoftLink.mm > cocoa/FileSizeFormatterCocoa.mm > cocoa/PassKitSoftLink.mm > >Index: Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm >=================================================================== >--- Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm (revision 246566) >+++ Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm (working copy) >@@ -29,19 +29,19 @@ > #import "VideoFullscreenModelVideoElement.h" > > #import "DOMWindow.h" >+#import "Event.h" >+#import "EventListener.h" >+#import "EventNames.h" >+#import "HTMLElement.h" >+#import "HTMLVideoElement.h" > #import "History.h" > #import "Logging.h" > #import "MediaControlsHost.h" >+#import "Page.h" > #import "PlaybackSessionModelMediaElement.h" >+#import "TextTrackList.h" >+#import "TimeRanges.h" > #import <QuartzCore/CoreAnimation.h> >-#import <WebCore/Event.h> >-#import <WebCore/EventListener.h> >-#import <WebCore/EventNames.h> >-#import <WebCore/HTMLElement.h> >-#import <WebCore/HTMLVideoElement.h> >-#import <WebCore/Page.h> >-#import <WebCore/TextTrackList.h> >-#import <WebCore/TimeRanges.h> > #import <wtf/NeverDestroyed.h> > #import <wtf/SoftLinking.h> > >Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.h >=================================================================== >--- Source/WebCore/platform/ios/WebItemProviderPasteboard.h (revision 246566) >+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.h (working copy) >@@ -23,9 +23,11 @@ > * THE POSSIBILITY OF SUCH DAMAGE. > */ > >+#if TARGET_OS_IPHONE >+ > #import <WebCore/AbstractPasteboard.h> > >-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 >+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 > > struct CGSize; > >@@ -112,4 +114,5 @@ WEBCORE_EXPORT @interface WebItemProvide > > NS_ASSUME_NONNULL_END > >-#endif // TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 >+#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 >+#endif // TARGET_OS_IPHONE >Index: Source/cmake/OptionsMac.cmake >=================================================================== >--- Source/cmake/OptionsMac.cmake (revision 246566) >+++ Source/cmake/OptionsMac.cmake (working copy) >@@ -20,11 +20,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON) > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON) > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF) >-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) >-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON) >-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON) >-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON) >-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON) >+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE OFF) >+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF) >+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF) >+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF) >+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF) > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON) > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF) > WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198979
:
372396
|
372610
|
373780
|
373803