Changeset 228276 in webkit
- Timestamp:
- Feb 8, 2018 9:49:10 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r228274 r228276 1 2018-02-08 Chris Dumez <cdumez@apple.com> 2 3 Unreviewed, tiny partial rollout of r228260 as it caused some worker failures 4 5 * bindings/js/JSDOMGlobalObject.cpp: 6 (WebCore::toJSDOMGlobalObject): 7 * bindings/js/JSDOMGlobalObject.h: 8 * bindings/js/JSErrorHandler.cpp: 9 (WebCore::JSErrorHandler::handleEvent): 10 * bindings/js/JSEventListener.cpp: 11 (WebCore::toJSDOMGlobalObject): Deleted. 12 1 13 2018-02-08 Zalan Bujtas <zalan@apple.com> 2 14 -
trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
r228260 r228276 275 275 } 276 276 277 JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext& context, DOMWrapperWorld& world) 278 { 279 if (is<Document>(context)) 280 return toJSDOMWindow(downcast<Document>(context).frame(), world); 281 282 if (is<WorkerGlobalScope>(context)) 283 return downcast<WorkerGlobalScope>(context).script()->workerGlobalScopeWrapper(); 284 285 ASSERT_NOT_REACHED(); 286 return nullptr; 287 } 288 277 289 } // namespace WebCore -
trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h
r228260 r228276 127 127 WEBCORE_EXPORT JSDOMGlobalObject& callerGlobalObject(JSC::ExecState&); 128 128 129 JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext&, DOMWrapperWorld&); 130 129 131 } // namespace WebCore -
trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp
r228263 r228276 72 72 return; 73 73 74 auto* globalObject = toJSDOM Window(downcast<Document>(scriptExecutionContext).frame(), isolatedWorld());74 auto* globalObject = toJSDOMGlobalObject(scriptExecutionContext, isolatedWorld()); 75 75 if (!globalObject) 76 76 return; -
trunk/Source/WebCore/bindings/js/JSEventListener.cpp
r228260 r228276 27 27 #include "JSDOMConvertNullable.h" 28 28 #include "JSDOMConvertStrings.h" 29 #include "JSDOMGlobalObject.h" 29 30 #include "JSDocument.h" 30 31 #include "JSEvent.h" … … 96 97 } 97 98 98 static JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext& context, DOMWrapperWorld& world)99 {100 if (is<Document>(context))101 return toJSDOMWindow(downcast<Document>(context).frame(), world);102 103 if (is<WorkerGlobalScope>(context))104 return downcast<WorkerGlobalScope>(context).script()->workerGlobalScopeWrapper();105 106 ASSERT_NOT_REACHED();107 return nullptr;108 }109 110 99 void JSEventListener::handleEvent(ScriptExecutionContext& scriptExecutionContext, Event& event) 111 100 {
Note: See TracChangeset
for help on using the changeset viewer.