Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove OffscreenCanvasEnabled from DeprecatedGlobalSettings #8284

Merged
merged 1 commit into from
Jan 6, 2023
Merged

Remove OffscreenCanvasEnabled from DeprecatedGlobalSettings #8284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4112,7 +4112,6 @@ OffscreenCanvasEnabled:
status: testable
humanReadableName: "OffscreenCanvas"
humanReadableDescription: "Support for the OffscreenCanvas APIs"
webcoreBinding: DeprecatedGlobalSettings
condition: ENABLE(OFFSCREEN_CANVAS)
defaultValue:
WebKitLegacy:
Expand All @@ -4122,6 +4121,9 @@ OffscreenCanvasEnabled:
"PLATFORM(COCOA)": true
"ENABLE(EXPERIMENTAL_FEATURES)": true
default: false
WebCore:
"PLATFORM(COCOA)": true
default: false

OffscreenCanvasInWorkersEnabled:
type: bool
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/html/HTMLCanvasElement.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ typedef (

DOMString toDataURL(optional DOMString type, optional any quality);
undefined toBlob(BlobCallback callback, optional DOMString type, optional any quality);
[Conditional=OFFSCREEN_CANVAS, EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled, NewObject] OffscreenCanvas transferControlToOffscreen();
[Conditional=OFFSCREEN_CANVAS, EnabledBySetting=OffscreenCanvasEnabled, NewObject] OffscreenCanvas transferControlToOffscreen();

[Conditional=MEDIA_STREAM, NewObject] MediaStream captureStream(optional double frameRequestRate);
};
2 changes: 1 addition & 1 deletion Source/WebCore/html/OffscreenCanvas.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ enum OffscreenRenderingContextType

[
GenerateIsReachable=Impl,
EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled,
EnabledBySetting=OffscreenCanvasEnabled,
Conditional=OFFSCREEN_CANVAS,
ConditionalForWorker=OFFSCREEN_CANVAS_IN_WORKERS,
EnabledForContext,
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

[
CustomIsReachable,
EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled,
EnabledBySetting=OffscreenCanvasEnabled,
Conditional=OFFSCREEN_CANVAS,
ConditionalForWorker=OFFSCREEN_CANVAS_IN_WORKERS,
EnabledForContext,
Expand Down
8 changes: 0 additions & 8 deletions Source/WebCore/page/DeprecatedGlobalSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ class DeprecatedGlobalSettings {
static void setCustomPasteboardDataEnabled(bool isEnabled) { shared().m_isCustomPasteboardDataEnabled = isEnabled; }
static bool customPasteboardDataEnabled() { return shared().m_isCustomPasteboardDataEnabled; }

#if ENABLE(OFFSCREEN_CANVAS)
static void setOffscreenCanvasEnabled(bool isEnabled) { shared().m_isOffscreenCanvasEnabled = isEnabled; }
static bool offscreenCanvasEnabled() { return shared().m_isOffscreenCanvasEnabled; }
#endif

#if ENABLE(OFFSCREEN_CANVAS_IN_WORKERS)
static void setOffscreenCanvasInWorkersEnabled(bool isEnabled) { shared().m_isOffscreenCanvasInWorkersEnabled = isEnabled; }
static bool offscreenCanvasInWorkersEnabled() { return shared().m_isOffscreenCanvasInWorkersEnabled; }
Expand Down Expand Up @@ -289,9 +284,6 @@ class DeprecatedGlobalSettings {
bool m_isPaintTimingEnabled { false };
bool m_isMenuItemElementEnabled { false };
bool m_isCustomPasteboardDataEnabled { false };
#if ENABLE(OFFSCREEN_CANVAS)
bool m_isOffscreenCanvasEnabled { false };
#endif
#if ENABLE(OFFSCREEN_CANVAS_IN_WORKERS)
bool m_isOffscreenCanvasInWorkersEnabled { false };
#endif
Expand Down