Skip to content

Commit

Permalink
Remove WebGLBlockList
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=259123
rdar://112102082

Reviewed by Myles C. Maxfield.

It is unused.

* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/platform/mac/BlocklistUpdater.h:
(WebCore::BlocklistUpdater::pluginBlocklist):
(WebCore::BlocklistUpdater::webGLBlocklist): Deleted.
* Source/WebCore/platform/mac/BlocklistUpdater.mm:
(WebCore::BlocklistUpdater::reloadIfNecessary):
* Source/WebCore/platform/mac/WebGLBlocklist.h: Removed.
* Source/WebCore/platform/mac/WebGLBlocklist.mm: Removed.
* Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.h:
* Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextShouldBlockWebGL): Deleted.
(WKContextShouldSuggestBlockWebGL): Deleted.
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm:

Canonical link: https://commits.webkit.org/265970@main
  • Loading branch information
achristensen07 committed Jul 11, 2023
1 parent 0ae65c4 commit 7ed3148
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 364 deletions.
1 change: 0 additions & 1 deletion Source/WebCore/SourcesCocoa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,6 @@ platform/mac/WebCoreFullScreenWindow.mm
platform/mac/WebCoreNSFontManagerExtras.mm
platform/mac/WebCoreNSURLExtras.mm
platform/mac/WebCoreObjCExtras.mm
platform/mac/WebGLBlocklist.mm
platform/mac/WebNSAttributedStringExtras.mm
platform/mac/WebPlaybackControlsManager.mm
platform/mac/WidgetMac.mm
Expand Down
6 changes: 0 additions & 6 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,6 @@
1AF7AFC81A48A8BC00C8E4E7 /* SecurityOriginPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF7AFC61A48A8BC00C8E4E7 /* SecurityOriginPolicy.h */; };
1AF89A421518FDEA00E547B5 /* TiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF89A411518FDEA00E547B5 /* TiledBacking.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE11980CBFFCC4003017FA /* JSSQLResultSetRowList.h */; };
1AFFC4581D5E865500267A66 /* WebGLBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC4511D5E7EC700267A66 /* WebGLBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AFFC4591D5E866100267A66 /* PluginBlocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC44F1D5E7EC700267A66 /* PluginBlocklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
1B124D8D1D380B7000ECDFB0 /* MediaSampleAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */; settings = {ATTRIBUTES = (Private, ); }; };
1BF9DB3C1D3973AD0026AEB7 /* MediaSample.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EC7181ED60100EE4C41 /* MediaSample.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -7709,8 +7708,6 @@
1AFFC44E1D5E7EC700267A66 /* BlocklistUpdater.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BlocklistUpdater.mm; sourceTree = "<group>"; };
1AFFC44F1D5E7EC700267A66 /* PluginBlocklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginBlocklist.h; sourceTree = "<group>"; };
1AFFC4501D5E7EC700267A66 /* PluginBlocklist.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginBlocklist.mm; sourceTree = "<group>"; };
1AFFC4511D5E7EC700267A66 /* WebGLBlocklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLBlocklist.h; sourceTree = "<group>"; };
1AFFC4521D5E7EC700267A66 /* WebGLBlocklist.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGLBlocklist.mm; sourceTree = "<group>"; };
1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSampleAVFObjC.h; sourceTree = "<group>"; };
1B124D8E1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSampleAVFObjC.mm; sourceTree = "<group>"; };
1BE5BFC11D515715001666D9 /* MediaConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaConstraints.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -26465,8 +26462,6 @@
B50F5B800E96CD9900AD71A6 /* WebCoreObjCExtras.mm */,
BE855F7F0701E83500239769 /* WebCoreView.h */,
BE8560510701F91100239769 /* WebCoreView.m */,
1AFFC4511D5E7EC700267A66 /* WebGLBlocklist.h */,
1AFFC4521D5E7EC700267A66 /* WebGLBlocklist.mm */,
E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */,
E1A3162C134BC32D007C9A4F /* WebNSAttributedStringExtras.mm */,
CD5896E01CD2B15100B3BCC8 /* WebPlaybackControlsManager.h */,
Expand Down Expand Up @@ -41521,7 +41516,6 @@
D3F3D36E1A69B7E00059FC2B /* WebGL2RenderingContext.h in Headers */,
A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */,
6E47E66110B7944B00B186C8 /* WebGLAny.h in Headers */,
1AFFC4581D5E865500267A66 /* WebGLBlocklist.h in Headers */,
49C7B9C91042D32F0009D447 /* WebGLBuffer.h in Headers */,
8A1330F02981C67500A47DCB /* WebGLClipCullDistance.h in Headers */,
D08B00E420A282590004BC0A /* WebGLCompressedTextureASTC.h in Headers */,
Expand Down
3 changes: 0 additions & 3 deletions Source/WebCore/platform/mac/BlocklistUpdater.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,19 @@
namespace WebCore {

class PluginBlocklist;
class WebGLBlocklist;

class BlocklistUpdater {
public:
static void reloadIfNecessary();

static WorkQueue& queue();
static PluginBlocklist* pluginBlocklist() { return s_pluginBlocklist; }
static WebGLBlocklist* webGLBlocklist() { return s_webGLBlocklist; };

private:

static NSDictionary *readBlocklistData();

static PluginBlocklist* s_pluginBlocklist;
static WebGLBlocklist* s_webGLBlocklist;
};

}
Expand Down
8 changes: 0 additions & 8 deletions Source/WebCore/platform/mac/BlocklistUpdater.mm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#if PLATFORM(MAC)

#import "PluginBlocklist.h"
#import "WebGLBlocklist.h"
#import <sys/stat.h>
#import <sys/time.h>
#import <wtf/cocoa/TypeCastsCocoa.h>
Expand All @@ -52,7 +51,6 @@
namespace WebCore {

PluginBlocklist* BlocklistUpdater::s_pluginBlocklist = nullptr;
WebGLBlocklist* BlocklistUpdater::s_webGLBlocklist = nullptr;

WorkQueue& BlocklistUpdater::queue()
{
Expand Down Expand Up @@ -99,13 +97,7 @@
s_pluginBlocklist = 0;
}

if (s_webGLBlocklist) {
delete s_webGLBlocklist;
s_webGLBlocklist = 0;
}

s_pluginBlocklist = PluginBlocklist::create(propertyList).release();
s_webGLBlocklist = WebGLBlocklist::create(propertyList).release();

blocklistUpdateTime = statBuf.st_mtimespec.tv_sec;
}
Expand Down
69 changes: 0 additions & 69 deletions Source/WebCore/platform/mac/WebGLBlocklist.h

This file was deleted.

Loading

0 comments on commit 7ed3148

Please sign in to comment.