Skip to content

Commit df78fef

Browse files
ryanhaddadryanhaddad
committed
Unreviewed, reverting r270064.
Broke the macCatayst build Reverted changeset: "Link against the ANGLE Shared Library" https://bugs.webkit.org/show_bug.cgi?id=218539 https://trac.webkit.org/changeset/270064 Canonical link: https://commits.webkit.org/231830@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270121 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent c0ec9ed commit df78fef

7 files changed

Lines changed: 22 additions & 28 deletions

File tree

‎Source/WebCore/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2020-11-20 Ryan Haddad <ryanhaddad@apple.com>
2+
3+
Unreviewed, reverting r270064.
4+
5+
Broke the macCatayst build
6+
7+
Reverted changeset:
8+
9+
"Link against the ANGLE Shared Library"
10+
https://bugs.webkit.org/show_bug.cgi?id=218539
11+
https://trac.webkit.org/changeset/270064
12+
113
2020-11-20 Don Olmstead <don.olmstead@sony.com>
214

315
Remove quota module

‎Source/WebCore/Configurations/WebCore.xcconfig‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
4040

4141
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
4242

43-
WK_FRAMEWORKS_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
44-
WK_FRAMEWORKS_LIBRARY_DIR[sdk=macosx*] = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
45-
WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
46-
WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
43+
WK_LIBWEBRTC_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
44+
WK_LIBWEBRTC_LIBRARY_DIR[sdk=macosx*] = $(WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
45+
WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
46+
WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
4747

48-
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_FRAMEWORKS_LIBRARY_DIR)";
48+
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
4949

5050
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
5151
ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/ $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/;
@@ -69,8 +69,6 @@ PRODUCT_NAME = WebCore;
6969
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
7070
UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
7171

72-
WK_ANGLE_LDFLAGS = -weak-lANGLE-shared;
73-
7472
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
7573
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
7674
WK_APPKIT_LDFLAGS_maccatalyst = -framework AppKit;
@@ -124,7 +122,7 @@ WK_URL_FORMATTING_LDFLAGS = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING
124122
WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting;
125123

126124
// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
127-
OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
125+
OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
128126

129127
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
130128
OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;

‎Source/WebCore/Configurations/WebCoreTestSupport.xcconfig‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ LIBWEBRTC_LDFLAGS = $(LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
5252
LIBWEBRTC_LDFLAGS_ = ;
5353
LIBWEBRTC_LDFLAGS_ENABLE_WEB_RTC = -weak-lwebrtc;
5454

55-
ANGLE_LDFLAGS = -weak-lANGLE-shared;
56-
5755
PRODUCT_NAME = WebCoreTestSupport;
5856
EXECUTABLE_PREFIX = lib;
5957
EXPORTED_SYMBOLS_FILE = ;
6058
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
61-
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_LDFLAGS);
62-
OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS);
59+
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
60+
OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(LIBWEBRTC_LDFLAGS);
6361

64-
OTHER_LDFLAGS[sdk=iphone*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -framework CoreText $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS);
62+
OTHER_LDFLAGS[sdk=iphone*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -framework CoreText $(LIBWEBRTC_LDFLAGS);
6563
SECT_ORDER_FLAGS = ;
6664

6765
ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))

‎Source/WebCore/Sources.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,7 @@ platform/encryptedmedia/CDMProxy.cpp
18931893
platform/gamepad/EmptyGamepadProvider.cpp
18941894
platform/gamepad/GamepadConstants.cpp
18951895
platform/gamepad/GamepadProvider.cpp
1896+
platform/graphics/ANGLEWebKitBridge.cpp
18961897
platform/graphics/BitmapImage.cpp
18971898
platform/graphics/Color.cpp
18981899
platform/graphics/ColorBlending.cpp

‎Source/WebCore/SourcesGTK.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ platform/gamepad/manette/ManetteGamepadProvider.cpp
7272

7373
platform/generic/ScrollAnimatorGeneric.cpp
7474

75-
platform/graphics/ANGLEWebKitBridge.cpp
7675
platform/graphics/GLContext.cpp @no-unify
7776
platform/graphics/PlatformDisplay.cpp @no-unify
7877

‎Source/WebCore/SourcesWPE.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ platform/adwaita/ThemeAdwaita.cpp
6565

6666
platform/generic/ScrollAnimatorGeneric.cpp
6767

68-
platform/graphics/ANGLEWebKitBridge.cpp
6968
platform/graphics/GLContext.cpp
7069
platform/graphics/PlatformDisplay.cpp
7170

‎Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#import "WebGLLayer.h"
4040
#import <CoreGraphics/CGBitmapContext.h>
4141
#import <wtf/BlockObjCExceptions.h>
42-
#import <wtf/darwin/WeakLinking.h>
4342
#import <wtf/text/CString.h>
4443

4544
#if PLATFORM(MAC)
@@ -51,8 +50,6 @@
5150
#include "GraphicsContextGLCV.h"
5251
#endif
5352

54-
WTF_WEAK_LINK_FORCE_IMPORT(EGL_Initialize);
55-
5653
namespace WebCore {
5754

5855
#if ASSERT_ENABLED
@@ -125,19 +122,9 @@ static bool needsEAGLOnMac()
125122
}
126123
#endif
127124

128-
static bool isANGLEAvailable()
129-
{
130-
return !!EGL_Initialize;
131-
}
132125

133126
RefPtr<GraphicsContextGLOpenGL> GraphicsContextGLOpenGL::create(GraphicsContextGLAttributes attrs, HostWindow* hostWindow, GraphicsContextGL::Destination destination)
134127
{
135-
// If ANGLE is not loaded, we can fail immediately.
136-
if (!isANGLEAvailable()) {
137-
LOG(WebGL, "ANGLE shared library was not loaded. Can't make GraphicsContextGL.");
138-
return nullptr;
139-
}
140-
141128
// This implementation doesn't currently support rendering directly to the HostWindow.
142129
if (destination == Destination::DirectlyToHostWindow)
143130
return nullptr;

0 commit comments

Comments
 (0)