Skip to content

Commit b95ea40

Browse files
rkirslingrkirsling
committed
Classes marked final should not use protected access specifier
https://bugs.webkit.org/show_bug.cgi?id=210775 Reviewed by Daniel Bates. Source/JavaScriptCore: * API/JSAPIValueWrapper.h: * API/JSCallbackConstructor.h: * API/JSCallbackObject.h: * b3/B3ExtractValue.h: * bytecode/UnlinkedFunctionExecutable.h: * inspector/JSGlobalObjectConsoleClient.h: * inspector/JSInjectedScriptHost.h: * inspector/JSJavaScriptCallFrame.h: * jsc.cpp: * runtime/AggregateError.h: * runtime/AggregateErrorPrototype.h: * runtime/ArrayConstructor.h: * runtime/ArrayPrototype.h: * runtime/AsyncFunctionPrototype.h: * runtime/AsyncGeneratorFunctionPrototype.h: * runtime/AtomicsObject.h: * runtime/BigIntConstructor.h: * runtime/BigIntObject.h: * runtime/BigIntPrototype.h: * runtime/BooleanConstructor.h: * runtime/BooleanPrototype.h: * runtime/ConsoleObject.h: * runtime/DateConstructor.h: * runtime/DatePrototype.h: * runtime/ErrorConstructor.h: * runtime/ErrorPrototype.h: * runtime/FileBasedFuzzerAgent.h: * runtime/FunctionPrototype.h: * runtime/FunctionRareData.h: * runtime/GeneratorFunctionPrototype.h: * runtime/GenericTypedArrayView.h: * runtime/InspectorInstrumentationObject.h: * runtime/IntlCollator.h: * runtime/IntlCollatorConstructor.h: * runtime/IntlCollatorPrototype.h: * runtime/IntlDateTimeFormat.h: * runtime/IntlDateTimeFormatConstructor.h: * runtime/IntlDateTimeFormatPrototype.h: * runtime/IntlNumberFormat.h: * runtime/IntlNumberFormatConstructor.h: * runtime/IntlNumberFormatPrototype.h: * runtime/IntlPluralRules.h: * runtime/IntlPluralRulesConstructor.h: * runtime/IntlPluralRulesPrototype.h: * runtime/IntlRelativeTimeFormatConstructor.h: * runtime/IntlRelativeTimeFormatPrototype.h: * runtime/JSArrayBuffer.h: * runtime/JSArrayBufferConstructor.h: * runtime/JSArrayBufferPrototype.h: * runtime/JSAsyncGenerator.h: * runtime/JSBoundFunction.h: * runtime/JSCustomGetterSetterFunction.h: * runtime/JSDataView.h: * runtime/JSDataViewPrototype.h: * runtime/JSGenerator.h: * runtime/JSGenericTypedArrayView.h: * runtime/JSGenericTypedArrayViewConstructor.h: * runtime/JSGenericTypedArrayViewPrototype.h: * runtime/JSGlobalLexicalEnvironment.h: * runtime/JSModuleLoader.h: * runtime/JSModuleNamespaceObject.h: * runtime/JSNativeStdFunction.h: * runtime/JSONObject.h: * runtime/JSObject.h: * runtime/JSTemplateObjectDescriptor.h: * runtime/JSTypedArrayViewConstructor.h: * runtime/JSTypedArrayViewPrototype.h: * runtime/MathObject.h: * runtime/NativeExecutable.h: * runtime/NumberConstructor.h: * runtime/NumberPrototype.h: * runtime/ObjectConstructor.h: * runtime/ObjectPrototype.h: * runtime/PredictionFileCreatingFuzzerAgent.h: * runtime/ReflectObject.h: * runtime/RegExp.h: * runtime/RegExpConstructor.h: * runtime/RegExpObject.h: * runtime/RegExpPrototype.h: * runtime/StringPrototype.h: * runtime/Structure.h: * runtime/Symbol.h: * runtime/SymbolConstructor.h: * runtime/SymbolObject.h: * runtime/SymbolPrototype.h: * runtime/VMTraps.cpp: * testRegExp.cpp: * wasm/WasmBBQPlan.h: * wasm/WasmLLIntPlan.h: * wasm/WasmWorklist.cpp: * wasm/js/JSWebAssembly.h: * wasm/js/JSWebAssemblyCompileError.h: * wasm/js/JSWebAssemblyInstance.h: * wasm/js/JSWebAssemblyLinkError.h: * wasm/js/JSWebAssemblyRuntimeError.h: * wasm/js/WebAssemblyCompileErrorConstructor.h: * wasm/js/WebAssemblyCompileErrorPrototype.h: * wasm/js/WebAssemblyGlobalConstructor.h: * wasm/js/WebAssemblyGlobalPrototype.h: * wasm/js/WebAssemblyInstanceConstructor.h: * wasm/js/WebAssemblyInstancePrototype.h: * wasm/js/WebAssemblyLinkErrorConstructor.h: * wasm/js/WebAssemblyLinkErrorPrototype.h: * wasm/js/WebAssemblyMemoryConstructor.h: * wasm/js/WebAssemblyMemoryPrototype.h: * wasm/js/WebAssemblyModuleConstructor.h: * wasm/js/WebAssemblyModulePrototype.h: * wasm/js/WebAssemblyRuntimeErrorConstructor.h: * wasm/js/WebAssemblyRuntimeErrorPrototype.h: * wasm/js/WebAssemblyTableConstructor.h: * wasm/js/WebAssemblyTablePrototype.h: * wasm/js/WebAssemblyWrapperFunction.h: Source/WebCore: * Modules/applepay/ApplePayPaymentMethodSelectedEvent.h: * Modules/applepay/ApplePayValidateMerchantEvent.h: * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.h: * Modules/webaudio/BiquadDSPKernel.h: * Modules/webaudio/WaveShaperDSPKernel.h: * Modules/websockets/WebSocketChannel.h: * Modules/websockets/WorkerThreadableWebSocketChannel.h: * Modules/webxr/WebXRSession.h: * Modules/webxr/WebXRSystem.h: * accessibility/AccessibilityARIAGridCell.h: * accessibility/AccessibleSetValueEvent.h: * animation/CSSAnimation.h: * bindings/js/ReadableStream.h: * bridge/objc/objc_runtime.h: * bridge/runtime_array.h: * css/CSSImageSetValue.h: * html/HTMLKeygenElement.cpp: * html/canvas/WebGLBuffer.h: * html/canvas/WebGLFramebuffer.h: * html/canvas/WebGLProgram.h: * html/canvas/WebGLQuery.h: * html/canvas/WebGLRenderbuffer.h: * html/canvas/WebGLSampler.h: * html/canvas/WebGLSync.h: * html/canvas/WebGLTransformFeedback.h: * html/canvas/WebGLUniformLocation.h: * html/shadow/TextControlInnerElements.h: * inspector/InspectorStyleSheet.h: * inspector/WebInjectedScriptManager.h: * loader/cache/CachedCSSStyleSheet.h: * page/Frame.h: * page/FrameView.h: * page/PageConsoleClient.h: * page/animation/KeyframeAnimation.h: * page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.h: * platform/audio/AudioBus.h: * platform/cocoa/PlaybackSessionModelMediaElement.h: * platform/graphics/BitmapImage.h: * platform/graphics/CrossfadeGeneratedImage.h: * platform/graphics/NamedImageGeneratedImage.h: * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h: * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: * platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.h: * platform/graphics/ca/win/PlatformCAAnimationWin.h: * platform/graphics/cg/ImageDecoderCG.h: * platform/graphics/iso/ISOOriginalFormatBox.h: * platform/graphics/iso/ISOProtectionSchemeInfoBox.h: * platform/graphics/iso/ISOSchemeInformationBox.h: * platform/graphics/iso/ISOSchemeTypeBox.h: * platform/graphics/iso/ISOTrackEncryptionBox.h: * platform/graphics/iso/ISOVTTCue.cpp: * platform/graphics/iso/ISOVTTCue.h: * platform/graphics/win/ImageDecoderDirect2D.h: * platform/mediastream/mac/AVCaptureDeviceManager.h: * platform/mock/mediasource/MockBox.h: * platform/mock/mediasource/MockSourceBufferPrivate.cpp: * rendering/RenderFullScreen.h: * rendering/RenderGrid.h: * rendering/RenderMultiColumnSet.h: * rendering/RenderRuby.h: * rendering/RenderScrollbarPart.h: * rendering/RenderScrollbarTheme.h: * rendering/RenderTableCell.h: * rendering/RenderTableSection.h: * rendering/RenderThemeIOS.h: * rendering/RenderView.h: * rendering/svg/RenderSVGResourceClipper.h: * svg/SVGTextPathElement.h: * workers/WorkerConsoleClient.h: * worklets/Worklet.h: Source/WebKit: * Shared/API/APIDictionary.h: * WebProcess/GPU/media/TextTrackPrivateRemote.h: * WebProcess/Plugins/Netscape/JSNPMethod.h: * WebProcess/Plugins/Netscape/JSNPObject.h: Source/WebKitLegacy: * WebCoreSupport/WebResourceLoadScheduler.h: Source/WebKitLegacy/win: * DefaultDownloadDelegate.h: * DefaultPolicyDelegate.h: * MemoryStream.h: * WebApplicationCache.h: * WebArchive.h: * WebBackForwardList.h: * WebCache.h: * WebCoreStatistics.h: * WebDataSource.h: * WebElementPropertyBag.h: * WebError.h: * WebFrame.h: * WebFramePolicyListener.h: * WebHTMLRepresentation.h: * WebHistoryItem.h: * WebJavaScriptCollector.h: * WebKitClassFactory.h: * WebKitStatistics.h: * WebMutableURLRequest.h: * WebNotification.h: * WebNotificationCenter.h: * WebPreferences.h: * WebResource.h: * WebURLAuthenticationChallenge.h: * WebURLCredential.h: * WebURLProtectionSpace.h: * WebURLResponse.h: Tools: * DumpRenderTree/win/DefaultPolicyDelegate.h: * DumpRenderTree/win/UIDelegate.h: Canonical link: https://commits.webkit.org/223667@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 4ba9499 commit b95ea40

222 files changed

Lines changed: 659 additions & 643 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/JSAPIValueWrapper.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,14 @@ class JSAPIValueWrapper final : public JSCell {
5757
return wrapper;
5858
}
5959

60-
protected:
60+
private:
6161
void finishCreation(VM& vm, JSValue value)
6262
{
6363
Base::finishCreation(vm);
6464
m_value.set(vm, this, value);
6565
ASSERT(!value.isCell());
6666
}
6767

68-
private:
6968
JSAPIValueWrapper(VM& vm)
7069
: JSCell(vm, vm.apiWrapperStructure.get())
7170
{

‎Source/JavaScriptCore/API/JSCallbackConstructor.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,10 @@ class JSCallbackConstructor final : public JSNonFinalObject {
6262
return Structure::create(vm, globalObject, proto, TypeInfo(ObjectType, StructureFlags), info());
6363
}
6464

65-
protected:
65+
private:
6666
JSCallbackConstructor(JSGlobalObject*, Structure*, JSClassRef, JSObjectCallAsConstructorCallback);
6767
void finishCreation(JSGlobalObject*, JSClassRef);
6868

69-
private:
7069
friend struct APICallbackFunction;
7170

7271
static ConstructType getConstructData(JSCell*, ConstructData&);

‎Source/JavaScriptCore/API/JSCallbackObject.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,6 @@ struct JSCallbackObjectData {
123123

124124
template <class Parent>
125125
class JSCallbackObject final : public Parent {
126-
protected:
127-
JSCallbackObject(JSGlobalObject*, Structure*, JSClassRef, void* data);
128-
JSCallbackObject(VM&, JSClassRef, Structure*);
129-
130-
void finishCreation(JSGlobalObject*);
131-
void finishCreation(VM&);
132-
133126
public:
134127
using Base = Parent;
135128
static constexpr unsigned StructureFlags = Base::StructureFlags | ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesGetPropertyNames | OverridesGetCallData;
@@ -190,6 +183,12 @@ class JSCallbackObject final : public Parent {
190183
using Parent::methodTable;
191184

192185
private:
186+
JSCallbackObject(JSGlobalObject*, Structure*, JSClassRef, void* data);
187+
JSCallbackObject(VM&, JSClassRef, Structure*);
188+
189+
void finishCreation(JSGlobalObject*);
190+
void finishCreation(VM&);
191+
193192
static IsoSubspace* subspaceForImpl(VM&, SubspaceAccess);
194193
static String className(const JSObject*, VM&);
195194
static String toStringName(const JSObject*, JSGlobalObject*);

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,123 @@
1+
2020-04-20 Ross Kirsling <ross.kirsling@sony.com>
2+
3+
Classes marked final should not use protected access specifier
4+
https://bugs.webkit.org/show_bug.cgi?id=210775
5+
6+
Reviewed by Daniel Bates.
7+
8+
* API/JSAPIValueWrapper.h:
9+
* API/JSCallbackConstructor.h:
10+
* API/JSCallbackObject.h:
11+
* b3/B3ExtractValue.h:
12+
* bytecode/UnlinkedFunctionExecutable.h:
13+
* inspector/JSGlobalObjectConsoleClient.h:
14+
* inspector/JSInjectedScriptHost.h:
15+
* inspector/JSJavaScriptCallFrame.h:
16+
* jsc.cpp:
17+
* runtime/AggregateError.h:
18+
* runtime/AggregateErrorPrototype.h:
19+
* runtime/ArrayConstructor.h:
20+
* runtime/ArrayPrototype.h:
21+
* runtime/AsyncFunctionPrototype.h:
22+
* runtime/AsyncGeneratorFunctionPrototype.h:
23+
* runtime/AtomicsObject.h:
24+
* runtime/BigIntConstructor.h:
25+
* runtime/BigIntObject.h:
26+
* runtime/BigIntPrototype.h:
27+
* runtime/BooleanConstructor.h:
28+
* runtime/BooleanPrototype.h:
29+
* runtime/ConsoleObject.h:
30+
* runtime/DateConstructor.h:
31+
* runtime/DatePrototype.h:
32+
* runtime/ErrorConstructor.h:
33+
* runtime/ErrorPrototype.h:
34+
* runtime/FileBasedFuzzerAgent.h:
35+
* runtime/FunctionPrototype.h:
36+
* runtime/FunctionRareData.h:
37+
* runtime/GeneratorFunctionPrototype.h:
38+
* runtime/GenericTypedArrayView.h:
39+
* runtime/InspectorInstrumentationObject.h:
40+
* runtime/IntlCollator.h:
41+
* runtime/IntlCollatorConstructor.h:
42+
* runtime/IntlCollatorPrototype.h:
43+
* runtime/IntlDateTimeFormat.h:
44+
* runtime/IntlDateTimeFormatConstructor.h:
45+
* runtime/IntlDateTimeFormatPrototype.h:
46+
* runtime/IntlNumberFormat.h:
47+
* runtime/IntlNumberFormatConstructor.h:
48+
* runtime/IntlNumberFormatPrototype.h:
49+
* runtime/IntlPluralRules.h:
50+
* runtime/IntlPluralRulesConstructor.h:
51+
* runtime/IntlPluralRulesPrototype.h:
52+
* runtime/IntlRelativeTimeFormatConstructor.h:
53+
* runtime/IntlRelativeTimeFormatPrototype.h:
54+
* runtime/JSArrayBuffer.h:
55+
* runtime/JSArrayBufferConstructor.h:
56+
* runtime/JSArrayBufferPrototype.h:
57+
* runtime/JSAsyncGenerator.h:
58+
* runtime/JSBoundFunction.h:
59+
* runtime/JSCustomGetterSetterFunction.h:
60+
* runtime/JSDataView.h:
61+
* runtime/JSDataViewPrototype.h:
62+
* runtime/JSGenerator.h:
63+
* runtime/JSGenericTypedArrayView.h:
64+
* runtime/JSGenericTypedArrayViewConstructor.h:
65+
* runtime/JSGenericTypedArrayViewPrototype.h:
66+
* runtime/JSGlobalLexicalEnvironment.h:
67+
* runtime/JSModuleLoader.h:
68+
* runtime/JSModuleNamespaceObject.h:
69+
* runtime/JSNativeStdFunction.h:
70+
* runtime/JSONObject.h:
71+
* runtime/JSObject.h:
72+
* runtime/JSTemplateObjectDescriptor.h:
73+
* runtime/JSTypedArrayViewConstructor.h:
74+
* runtime/JSTypedArrayViewPrototype.h:
75+
* runtime/MathObject.h:
76+
* runtime/NativeExecutable.h:
77+
* runtime/NumberConstructor.h:
78+
* runtime/NumberPrototype.h:
79+
* runtime/ObjectConstructor.h:
80+
* runtime/ObjectPrototype.h:
81+
* runtime/PredictionFileCreatingFuzzerAgent.h:
82+
* runtime/ReflectObject.h:
83+
* runtime/RegExp.h:
84+
* runtime/RegExpConstructor.h:
85+
* runtime/RegExpObject.h:
86+
* runtime/RegExpPrototype.h:
87+
* runtime/StringPrototype.h:
88+
* runtime/Structure.h:
89+
* runtime/Symbol.h:
90+
* runtime/SymbolConstructor.h:
91+
* runtime/SymbolObject.h:
92+
* runtime/SymbolPrototype.h:
93+
* runtime/VMTraps.cpp:
94+
* testRegExp.cpp:
95+
* wasm/WasmBBQPlan.h:
96+
* wasm/WasmLLIntPlan.h:
97+
* wasm/WasmWorklist.cpp:
98+
* wasm/js/JSWebAssembly.h:
99+
* wasm/js/JSWebAssemblyCompileError.h:
100+
* wasm/js/JSWebAssemblyInstance.h:
101+
* wasm/js/JSWebAssemblyLinkError.h:
102+
* wasm/js/JSWebAssemblyRuntimeError.h:
103+
* wasm/js/WebAssemblyCompileErrorConstructor.h:
104+
* wasm/js/WebAssemblyCompileErrorPrototype.h:
105+
* wasm/js/WebAssemblyGlobalConstructor.h:
106+
* wasm/js/WebAssemblyGlobalPrototype.h:
107+
* wasm/js/WebAssemblyInstanceConstructor.h:
108+
* wasm/js/WebAssemblyInstancePrototype.h:
109+
* wasm/js/WebAssemblyLinkErrorConstructor.h:
110+
* wasm/js/WebAssemblyLinkErrorPrototype.h:
111+
* wasm/js/WebAssemblyMemoryConstructor.h:
112+
* wasm/js/WebAssemblyMemoryPrototype.h:
113+
* wasm/js/WebAssemblyModuleConstructor.h:
114+
* wasm/js/WebAssemblyModulePrototype.h:
115+
* wasm/js/WebAssemblyRuntimeErrorConstructor.h:
116+
* wasm/js/WebAssemblyRuntimeErrorPrototype.h:
117+
* wasm/js/WebAssemblyTableConstructor.h:
118+
* wasm/js/WebAssemblyTablePrototype.h:
119+
* wasm/js/WebAssemblyWrapperFunction.h:
120+
1121
2020-04-20 Peng Liu <peng.liu6@apple.com>
2122

3123
Fix build failures when video fullscreen and picture-in-picture is disabled

‎Source/JavaScriptCore/b3/B3ExtractValue.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class JS_EXPORT_PRIVATE ExtractValue final : public Value {
4242
B3_SPECIALIZE_VALUE_FOR_FIXED_CHILDREN(1)
4343
B3_SPECIALIZE_VALUE_FOR_FINAL_SIZE_FIXED_CHILDREN
4444

45-
protected:
45+
private:
4646
void dumpMeta(CommaPrinter&, PrintStream&) const override;
4747

4848
static Opcode opcodeFromConstructor(Origin, Type, Value*, int32_t) { return Extract; }
@@ -53,7 +53,6 @@ class JS_EXPORT_PRIVATE ExtractValue final : public Value {
5353
{
5454
}
5555

56-
private:
5756
friend class Procedure;
5857
friend class Value;
5958

‎Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ class UnlinkedFunctionExecutable final : public JSCell {
232232
UnlinkedFunctionExecutable(VM&, Structure*, const SourceCode&, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, JSParserScriptMode, Optional<CompactVariableMap::Handle>, JSC::DerivedContextType, JSC::NeedsClassFieldInitializer, bool isBuiltinDefaultClassConstructor);
233233
UnlinkedFunctionExecutable(Decoder&, const CachedFunctionExecutable&);
234234

235+
static void visitChildren(JSCell*, SlotVisitor&);
236+
235237
void decodeCachedCodeBlocks(VM&);
236238

237239
bool codeBlockEdgeMayBeWeak() const
@@ -294,9 +296,6 @@ class UnlinkedFunctionExecutable final : public JSCell {
294296

295297
std::unique_ptr<RareData> m_rareData;
296298

297-
protected:
298-
static void visitChildren(JSCell*, SlotVisitor&);
299-
300299
public:
301300
static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
302301
{

‎Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class JSGlobalObjectConsoleClient final : public JSC::ConsoleClient {
4747
void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_debuggerAgent = agent; }
4848
void setInspectorScriptProfilerAgent(InspectorScriptProfilerAgent* agent) { m_scriptProfilerAgent = agent; }
4949

50-
protected:
50+
private:
5151
void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::JSGlobalObject*, Ref<ScriptArguments>&&) override;
5252
void count(JSC::JSGlobalObject*, const String& label) override;
5353
void countReset(JSC::JSGlobalObject*, const String& label) override;
@@ -62,7 +62,6 @@ class JSGlobalObjectConsoleClient final : public JSC::ConsoleClient {
6262
void recordEnd(JSC::JSGlobalObject*, Ref<ScriptArguments>&&) override;
6363
void screenshot(JSC::JSGlobalObject*, Ref<ScriptArguments>&&) override;
6464

65-
private:
6665
void warnUnimplemented(const String& method);
6766
void internalAddMessage(MessageType, MessageLevel, JSC::JSGlobalObject*, Ref<ScriptArguments>&&);
6867

‎Source/JavaScriptCore/inspector/JSInjectedScriptHost.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@ class JSInjectedScriptHost final : public JSC::JSNonFinalObject {
8383
JSC::JSValue queryInstances(JSC::JSGlobalObject*, JSC::CallFrame*);
8484
JSC::JSValue queryHolders(JSC::JSGlobalObject*, JSC::CallFrame*);
8585

86-
protected:
87-
void finishCreation(JSC::VM&);
88-
8986
private:
9087
JSInjectedScriptHost(JSC::VM&, JSC::Structure*, Ref<InjectedScriptHost>&&);
88+
void finishCreation(JSC::VM&);
9189

9290
Ref<InjectedScriptHost> m_wrapped;
9391
};

‎Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,10 @@ class JSJavaScriptCallFrame final : public JSC::JSNonFinalObject {
8686
static constexpr unsigned short GLOBAL_LEXICAL_ENVIRONMENT_SCOPE = 5;
8787
static constexpr unsigned short NESTED_LEXICAL_SCOPE = 6;
8888

89-
protected:
90-
void finishCreation(JSC::VM&);
91-
9289
private:
9390
JSJavaScriptCallFrame(JSC::VM&, JSC::Structure*, Ref<JavaScriptCallFrame>&&);
9491
~JSJavaScriptCallFrame();
92+
void finishCreation(JSC::VM&);
9593

9694
JavaScriptCallFrame* m_impl;
9795
};

‎Source/JavaScriptCore/jsc.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,8 @@ static inline String stringFromUTF(const Vector& utf8)
460460
}
461461

462462
class GlobalObject final : public JSGlobalObject {
463-
private:
464-
GlobalObject(VM&, Structure*);
465-
466463
public:
467-
typedef JSGlobalObject Base;
464+
using Base = JSGlobalObject;
468465

469466
static GlobalObject* create(VM& vm, Structure* structure, const Vector<String>& arguments)
470467
{
@@ -483,7 +480,9 @@ class GlobalObject final : public JSGlobalObject {
483480

484481
static RuntimeFlags javaScriptRuntimeFlags(const JSGlobalObject*) { return RuntimeFlags::createAllEnabled(); }
485482

486-
protected:
483+
private:
484+
GlobalObject(VM&, Structure*);
485+
487486
void finishCreation(VM& vm, const Vector<String>& arguments)
488487
{
489488
Base::finishCreation(vm);

0 commit comments

Comments
 (0)