Changeset 228276 in webkit


Ignore:
Timestamp:
Feb 8, 2018 9:49:10 AM (6 years ago)
Author:
Chris Dumez
Message:

Unreviewed, tiny partial rollout of r228260 as it caused some worker failures

  • bindings/js/JSDOMGlobalObject.cpp:

(WebCore::toJSDOMGlobalObject):

  • bindings/js/JSDOMGlobalObject.h:
  • bindings/js/JSErrorHandler.cpp:

(WebCore::JSErrorHandler::handleEvent):

  • bindings/js/JSEventListener.cpp:

(WebCore::toJSDOMGlobalObject): Deleted.

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r228274 r228276  
     12018-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
    1132018-02-08  Zalan Bujtas  <zalan@apple.com>
    214
  • trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp

    r228260 r228276  
    275275}
    276276
     277JSDOMGlobalObject* 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
    277289} // namespace WebCore
  • trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h

    r228260 r228276  
    127127WEBCORE_EXPORT JSDOMGlobalObject& callerGlobalObject(JSC::ExecState&);
    128128
     129JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext&, DOMWrapperWorld&);
     130
    129131} // namespace WebCore
  • trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp

    r228263 r228276  
    7272        return;
    7373
    74     auto* globalObject = toJSDOMWindow(downcast<Document>(scriptExecutionContext).frame(), isolatedWorld());
     74    auto* globalObject = toJSDOMGlobalObject(scriptExecutionContext, isolatedWorld());
    7575    if (!globalObject)
    7676        return;
  • trunk/Source/WebCore/bindings/js/JSEventListener.cpp

    r228260 r228276  
    2727#include "JSDOMConvertNullable.h"
    2828#include "JSDOMConvertStrings.h"
     29#include "JSDOMGlobalObject.h"
    2930#include "JSDocument.h"
    3031#include "JSEvent.h"
     
    9697}
    9798
    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 
    11099void JSEventListener::handleEvent(ScriptExecutionContext& scriptExecutionContext, Event& event)
    111100{
Note: See TracChangeset for help on using the changeset viewer.