Changeset 158365 in webkit


Ignore:
Timestamp:
Oct 31, 2013 10:26:35 AM (11 years ago)
Author:
weinig@apple.com
Message:

Pass ScriptExecutionContext by reference to from the bindings constructors
​https://bugs.webkit.org/show_bug.cgi?id=123575

Reviewed by Andreas Kling.

Since we null check the ScriptExecutionContext before creating the c++ class,
we should be passing by reference.

Location:
trunk/Source/WebCore
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r158364 r158365  
     12013-10-31  Sam Weinig  <sam@webkit.org>
     2
     3        Pass ScriptExecutionContext by reference to from the bindings constructors
     4        https://bugs.webkit.org/show_bug.cgi?id=123575
     5
     6        Reviewed by Andreas Kling.
     7
     8        Since we null check the ScriptExecutionContext before creating the c++ class,
     9        we should be passing by reference.
     10
    1112013-10-31  Zhuang Zhigang  <zhuangzg@cn.fujitsu.com>
    212

  • trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp

    r158311 r158365  
    4848namespace WebCore {
    4949
    50 PassRefPtr<MediaSource> MediaSource::create(ScriptExecutionContext* context)
     50PassRefPtr<MediaSource> MediaSource::create(ScriptExecutionContext& context)
    5151{
    5252    RefPtr<MediaSource> mediaSource(adoptRef(new MediaSource(context)));
    … …  
    5555}
    5656
    57 MediaSource::MediaSource(ScriptExecutionContext* context)
     57MediaSource::MediaSource(ScriptExecutionContext& context)
    5858    : MediaSourceBase(context)
    5959{

  • trunk/Source/WebCore/Modules/mediasource/MediaSource.h

    r157653 r158365  
    4444class MediaSource : public MediaSourceBase, public ScriptWrappable {
    4545public:
    46     static PassRefPtr<MediaSource> create(ScriptExecutionContext*);
     46    static PassRefPtr<MediaSource> create(ScriptExecutionContext&);
    4747    virtual ~MediaSource();
    4848
    … …  
    6161
    6262private:
    63     explicit MediaSource(ScriptExecutionContext*);
     63    explicit MediaSource(ScriptExecutionContext&);
    6464
    6565    // MediaSourceBase interface

  • trunk/Source/WebCore/Modules/mediasource/MediaSourceBase.cpp

    r158270 r158365  
    4646namespace WebCore {
    4747
    48 MediaSourceBase::MediaSourceBase(ScriptExecutionContext* context)
    49     : ActiveDOMObject(context)
     48MediaSourceBase::MediaSourceBase(ScriptExecutionContext& context)
     49    : ActiveDOMObject(&context)
    5050    , m_readyState(closedKeyword())
    5151    , m_asyncEventQueue(*this)

  • trunk/Source/WebCore/Modules/mediasource/MediaSourceBase.h

    r158270 r158365  
    9393
    9494protected:
    95     explicit MediaSourceBase(ScriptExecutionContext*);
     95    explicit MediaSourceBase(ScriptExecutionContext&);
    9696
    9797    virtual void onReadyStateChange(const AtomicString& oldState, const AtomicString& newState) = 0;

  • trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.cpp

    r158220 r158365  
    3636namespace WebCore {
    3737
    38 RefPtr<AudioStreamTrack> AudioStreamTrack::create(ScriptExecutionContext* context, const Dictionary& audioConstraints)
     38RefPtr<AudioStreamTrack> AudioStreamTrack::create(ScriptExecutionContext& context, const Dictionary& audioConstraints)
    3939{
    4040    return adoptRef(new AudioStreamTrack(context, *MediaStreamTrackPrivate::create(0), &audioConstraints));
    4141}
    4242
    43 RefPtr<AudioStreamTrack> AudioStreamTrack::create(ScriptExecutionContext* context, MediaStreamTrackPrivate& privateTrack)
     43RefPtr<AudioStreamTrack> AudioStreamTrack::create(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack)
    4444{
    4545    return adoptRef(new AudioStreamTrack(context, privateTrack, 0));
    4646}
    4747
    48 RefPtr<AudioStreamTrack> AudioStreamTrack::create(MediaStreamTrack* track)
     48RefPtr<AudioStreamTrack> AudioStreamTrack::create(MediaStreamTrack& track)
    4949{
    5050    return adoptRef(new AudioStreamTrack(track));
    5151}
    5252
    53 AudioStreamTrack::AudioStreamTrack(ScriptExecutionContext* context, MediaStreamTrackPrivate& privateTrack, const Dictionary* audioConstraints)
     53AudioStreamTrack::AudioStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack, const Dictionary* audioConstraints)
    5454    : MediaStreamTrack(context, privateTrack, audioConstraints)
    5555{
    5656}
    5757
    58 AudioStreamTrack::AudioStreamTrack(MediaStreamTrack* track)
     58AudioStreamTrack::AudioStreamTrack(MediaStreamTrack& track)
    5959    : MediaStreamTrack(track)
    6060{

  • trunk/Source/WebCore/Modules/mediastream/AudioStreamTrack.h

    r158220 r158365  
    4040class AudioStreamTrack FINAL : public MediaStreamTrack {
    4141public:
    42     static RefPtr<AudioStreamTrack> create(ScriptExecutionContext*, const Dictionary&);
    43     static RefPtr<AudioStreamTrack> create(ScriptExecutionContext*, MediaStreamTrackPrivate&);
    44     static RefPtr<AudioStreamTrack> create(MediaStreamTrack*);
     42    static RefPtr<AudioStreamTrack> create(ScriptExecutionContext&, const Dictionary&);
     43    static RefPtr<AudioStreamTrack> create(ScriptExecutionContext&, MediaStreamTrackPrivate&);
     44    static RefPtr<AudioStreamTrack> create(MediaStreamTrack&);
    4545
    4646    virtual ~AudioStreamTrack() { }
    … …  
    4949
    5050private:
    51     AudioStreamTrack(ScriptExecutionContext*, MediaStreamTrackPrivate&, const Dictionary*);
    52     explicit AudioStreamTrack(MediaStreamTrack*);
     51    AudioStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);
     52    explicit AudioStreamTrack(MediaStreamTrack&);
    5353};
    5454

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r158337 r158365  
    4242namespace WebCore {
    4343
    44 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context)
     44PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context)
    4545{
    4646    return MediaStream::create(context, MediaStreamDescriptor::create(MediaStreamSourceVector(), MediaStreamSourceVector()));
    4747}
    4848
    49 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStream> stream)
     49PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, PassRefPtr<MediaStream> stream)
    5050{
    5151    ASSERT(stream);
    … …  
    6363}
    6464
    65 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, const MediaStreamTrackVector& tracks)
     65PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, const MediaStreamTrackVector& tracks)
    6666{
    6767    Vector<RefPtr<MediaStreamTrackPrivate>> audioTracks;
    … …  
    7878}
    7979
    80 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     80PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext& context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
    8181{
    8282    return adoptRef(new MediaStream(context, streamDescriptor));
    8383}
    8484
    85 MediaStream::MediaStream(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
    86     : ContextDestructionObserver(context)
     85MediaStream::MediaStream(ScriptExecutionContext& context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     86    : ContextDestructionObserver(&context)
    8787    , m_descriptor(streamDescriptor)
    8888    , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
    … …  
    287287    switch (source->type()) {
    288288    case MediaStreamSource::Audio:
    289         track = AudioStreamTrack::create(scriptExecutionContext(), *MediaStreamTrackPrivate::create(source));
     289        track = AudioStreamTrack::create(*scriptExecutionContext(), *MediaStreamTrackPrivate::create(source));
    290290        m_audioTracks.append(track);
    291291        break;
    292292    case MediaStreamSource::Video:
    293         track = VideoStreamTrack::create(scriptExecutionContext(), *MediaStreamTrackPrivate::create(source));
     293        track = VideoStreamTrack::create(*scriptExecutionContext(), *MediaStreamTrackPrivate::create(source));
    294294        m_videoTracks.append(track);
    295295        break;

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.h

    r157958 r158365  
    4747class MediaStream FINAL : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver {
    4848public:
    49     static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
    50     static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStream>);
    51     static PassRefPtr<MediaStream> create(ScriptExecutionContext*, const MediaStreamTrackVector&);
    52     static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     49    static PassRefPtr<MediaStream> create(ScriptExecutionContext&);
     50    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, PassRefPtr<MediaStream>);
     51    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, const MediaStreamTrackVector&);
     52    static PassRefPtr<MediaStream> create(ScriptExecutionContext&, PassRefPtr<MediaStreamDescriptor>);
    5353    virtual ~MediaStream();
    5454
    … …  
    8383
    8484protected:
    85     MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     85    MediaStream(ScriptExecutionContext&, PassRefPtr<MediaStreamDescriptor>);
    8686
    8787    // ContextDestructionObserver

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

    r158220 r158365  
    5252namespace WebCore {
    5353
    54 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext* context, MediaStreamTrackPrivate& privateTrack, const Dictionary* constraints)
    55     : ActiveDOMObject(context)
     54MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack, const Dictionary* constraints)
     55    : ActiveDOMObject(&context)
    5656    , m_privateTrack(privateTrack)
    5757    , m_eventDispatchScheduled(false)
    … …  
    6666}
    6767
    68 MediaStreamTrack::MediaStreamTrack(MediaStreamTrack* other)
    69     : ActiveDOMObject(other->scriptExecutionContext())
    70     , m_privateTrack(*other->privateTrack().clone())
     68MediaStreamTrack::MediaStreamTrack(MediaStreamTrack& other)
     69    : ActiveDOMObject(other.scriptExecutionContext())
     70    , m_privateTrack(*other.privateTrack().clone())
    7171    , m_eventDispatchScheduled(false)
    7272    , m_stoppingTrack(false)
    … …  
    193193{
    194194    if (m_privateTrack->type() == MediaStreamSource::Audio)
    195         return AudioStreamTrack::create(this);
    196 
    197     return VideoStreamTrack::create(this);
     195        return AudioStreamTrack::create(*this);
     196
     197    return VideoStreamTrack::create(*this);
    198198}
    199199

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r158337 r158365  
    106106
    107107protected:
    108     explicit MediaStreamTrack(MediaStreamTrack*);
    109     MediaStreamTrack(ScriptExecutionContext*, MediaStreamTrackPrivate&, const Dictionary*);
     108    explicit MediaStreamTrack(MediaStreamTrack&);
     109    MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);
    110110
    111111    void setSource(PassRefPtr<MediaStreamSource>);

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r157653 r158365  
    115115}
    116116
    117 PassRefPtr<RTCPeerConnection> RTCPeerConnection::create(ScriptExecutionContext* context, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
     117PassRefPtr<RTCPeerConnection> RTCPeerConnection::create(ScriptExecutionContext& context, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode& ec)
    118118{
    119119    RefPtr<RTCConfiguration> configuration = parseConfiguration(rtcConfiguration, ec);
    … …  
    133133}
    134134
    135 RTCPeerConnection::RTCPeerConnection(ScriptExecutionContext* context, PassRefPtr<RTCConfiguration> configuration, PassRefPtr<MediaConstraints> constraints, ExceptionCode& ec)
    136     : ActiveDOMObject(context)
     135RTCPeerConnection::RTCPeerConnection(ScriptExecutionContext& context, PassRefPtr<RTCConfiguration> configuration, PassRefPtr<MediaConstraints> constraints, ExceptionCode& ec)
     136    : ActiveDOMObject(&context)
    137137    , m_signalingState(SignalingStateStable)
    138138    , m_iceGatheringState(IceGatheringStateNew)
    … …  
    141141    , m_stopped(false)
    142142{
    143     Document* document = toDocument(m_scriptExecutionContext);
    144 
    145     if (!document->frame()) {
     143    Document& document = toDocument(context);
     144
     145    if (!document.frame()) {
    146146        ec = NOT_SUPPORTED_ERR;
    147147        return;
    … …  
    154154    }
    155155
    156     document->frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
     156    document.frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
    157157
    158158    if (!m_peerHandler->initialize(configuration, constraints)) {

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r157653 r158365  
    6161class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
    6262public:
    63     static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
     63    static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext&, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
    6464    ~RTCPeerConnection();
    6565
    … …  
    131131
    132132private:
    133     RTCPeerConnection(ScriptExecutionContext*, PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>, ExceptionCode&);
     133    RTCPeerConnection(ScriptExecutionContext&, PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>, ExceptionCode&);
    134134
    135135    static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary& configuration, ExceptionCode&);

  • trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.cpp

    r158220 r158365  
    3636namespace WebCore {
    3737
    38 RefPtr<VideoStreamTrack> VideoStreamTrack::create(ScriptExecutionContext* context, const Dictionary& videoConstraints)
     38RefPtr<VideoStreamTrack> VideoStreamTrack::create(ScriptExecutionContext& context, const Dictionary& videoConstraints)
    3939{
    4040    return adoptRef(new VideoStreamTrack(context, *MediaStreamTrackPrivate::create(0), &videoConstraints));
    4141}
    4242
    43 RefPtr<VideoStreamTrack> VideoStreamTrack::create(ScriptExecutionContext* context, MediaStreamTrackPrivate& privateTrack)
     43RefPtr<VideoStreamTrack> VideoStreamTrack::create(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack)
    4444{
    4545    return adoptRef(new VideoStreamTrack(context, privateTrack, 0));
    … …  
    5151}
    5252
    53 VideoStreamTrack::VideoStreamTrack(ScriptExecutionContext* context, MediaStreamTrackPrivate& privateTrack, const Dictionary* videoConstraints)
     53VideoStreamTrack::VideoStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack, const Dictionary* videoConstraints)
    5454    : MediaStreamTrack(context, privateTrack, videoConstraints)
    5555{

  • trunk/Source/WebCore/Modules/mediastream/VideoStreamTrack.h

    r158220 r158365  
    4141class VideoStreamTrack FINAL : public MediaStreamTrack {
    4242public:
    43     static RefPtr<VideoStreamTrack> create(ScriptExecutionContext*, const Dictionary&);
    44     static RefPtr<VideoStreamTrack> create(ScriptExecutionContext*, MediaStreamTrackPrivate&);
     43    static RefPtr<VideoStreamTrack> create(ScriptExecutionContext&, const Dictionary&);
     44    static RefPtr<VideoStreamTrack> create(ScriptExecutionContext&, MediaStreamTrackPrivate&);
    4545    static RefPtr<VideoStreamTrack> create(MediaStreamTrack*);
    4646
    … …  
    5050
    5151private:
    52     VideoStreamTrack(ScriptExecutionContext*, MediaStreamTrackPrivate&, const Dictionary*);
     52    VideoStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);
    5353    explicit VideoStreamTrack(MediaStreamTrack*);
    5454};

  • trunk/Source/WebCore/Modules/notifications/Notification.cpp

    r156550 r158365  
    8181
    8282#if ENABLE(NOTIFICATIONS)
    83 Notification::Notification(ScriptExecutionContext* context, const String& title)
    84     : ActiveDOMObject(context)
     83Notification::Notification(ScriptExecutionContext& context, const String& title)
     84    : ActiveDOMObject(&context)
    8585    , m_title(title)
    8686    , m_state(Idle)
    8787    , m_taskTimer(adoptPtr(new Timer<Notification>(this, &Notification::taskTimerFired)))
    8888{
    89     m_notificationCenter = DOMWindowNotifications::webkitNotifications(toDocument(context)->domWindow());
     89    m_notificationCenter = DOMWindowNotifications::webkitNotifications(toDocument(context).domWindow());
    9090   
    9191    ASSERT(m_notificationCenter->client());
    … …  
    108108
    109109#if ENABLE(NOTIFICATIONS)
    110 PassRefPtr<Notification> Notification::create(ScriptExecutionContext* context, const String& title, const Dictionary& options)
     110PassRefPtr<Notification> Notification::create(ScriptExecutionContext& context, const String& title, const Dictionary& options)
    111111{
    112112    RefPtr<Notification> notification(adoptRef(new Notification(context, title)));
    … …  
    121121        notification->setDir(argument);
    122122    if (options.get("icon", argument)) {
    123         URL iconURI = argument.isEmpty() ? URL() : context->completeURL(argument);
     123        URL iconURI = argument.isEmpty() ? URL() : context.completeURL(argument);
    124124        if (!iconURI.isEmpty() && iconURI.isValid())
    125125            notification->setIconURL(iconURI);

  • trunk/Source/WebCore/Modules/notifications/Notification.h

    r157653 r158365  
    7272#endif
    7373#if ENABLE(NOTIFICATIONS)
    74     static PassRefPtr<Notification> create(ScriptExecutionContext*, const String& title, const Dictionary& options);
     74    static PassRefPtr<Notification> create(ScriptExecutionContext&, const String& title, const Dictionary& options);
    7575#endif
    7676   
    … …  
    144144#endif
    145145#if ENABLE(NOTIFICATIONS)
    146     Notification(ScriptExecutionContext*, const String& title);
     146    Notification(ScriptExecutionContext&, const String& title);
    147147#endif
    148148

  • trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.cpp

    r156413 r158365  
    3131namespace WebCore {
    3232   
    33 PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ScriptExecutionContext* context, const String& text)
     33PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ScriptExecutionContext& context, const String& text)
    3434{
    3535    return adoptRef(new SpeechSynthesisUtterance(context, text));
    3636}
    3737
    38 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ScriptExecutionContext* context, const String& text)
    39     : ContextDestructionObserver(context)
     38SpeechSynthesisUtterance::SpeechSynthesisUtterance(ScriptExecutionContext& context, const String& text)
     39    : ContextDestructionObserver(&context)
    4040    , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this))
    4141{

  • trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h

    r156719 r158365  
    4040class SpeechSynthesisUtterance FINAL : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData {
    4141public:
    42     static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&);
     42    static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext&, const String&);
    4343   
    4444    ~SpeechSynthesisUtterance();
    … …  
    8181
    8282private:
    83     SpeechSynthesisUtterance(ScriptExecutionContext*, const String&);
     83    SpeechSynthesisUtterance(ScriptExecutionContext&, const String&);
    8484    RefPtr<PlatformSpeechSynthesisUtterance> m_platformUtterance;
    8585    RefPtr<SpeechSynthesisVoice> m_voice;

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

    r157068 r158365  
    108108unsigned AudioContext::s_hardwareContextCount = 0;
    109109   
    110 PassRefPtr<AudioContext> AudioContext::create(Document* document, ExceptionCode& ec)
     110PassRefPtr<AudioContext> AudioContext::create(Document& document, ExceptionCode& ec)
    111111{
    112112    UNUSED_PARAM(ec);
    113113
    114     ASSERT(document);
    115114    ASSERT(isMainThread());
    116115    if (s_hardwareContextCount >= MaxHardwareContexts)
    … …  
    123122
    124123// Constructor for rendering to the audio hardware.
    125 AudioContext::AudioContext(Document* document)
    126     : ActiveDOMObject(document)
     124AudioContext::AudioContext(Document& document)
     125    : ActiveDOMObject(&document)
    127126    , m_isStopScheduled(false)
    128127    , m_isInitialized(false)
    … …  
    150149
    151150// Constructor for offline (non-realtime) rendering.
    152 AudioContext::AudioContext(Document* document, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
    153     : ActiveDOMObject(document)
     151AudioContext::AudioContext(Document& document, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
     152    : ActiveDOMObject(&document)
    154153    , m_isStopScheduled(false)
    155154    , m_isInitialized(false)

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.h

    r157044 r158365  
    7777public:
    7878    // Create an AudioContext for rendering to the audio hardware.
    79     static PassRefPtr<AudioContext> create(Document*, ExceptionCode&);
     79    static PassRefPtr<AudioContext> create(Document&, ExceptionCode&);
    8080
    8181    // Create an AudioContext for offline (non-realtime) rendering.
    … …  
    266266
    267267protected:
    268     explicit AudioContext(Document*);
    269     AudioContext(Document*, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
     268    explicit AudioContext(Document&);
     269    AudioContext(Document&, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
    270270   
    271271    static bool isSampleRateRangeGood(float sampleRate);

  • trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp

    r150856 r158365  
    3535namespace WebCore {
    3636
    37 PassRefPtr<OfflineAudioContext> OfflineAudioContext::create(ScriptExecutionContext* context, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode& ec)
     37PassRefPtr<OfflineAudioContext> OfflineAudioContext::create(ScriptExecutionContext& context, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode& ec)
    3838{
    3939    // FIXME: add support for workers.
    40     if (!context || !context->isDocument()) {
     40    if (!context.isDocument()) {
    4141        ec = NOT_SUPPORTED_ERR;
    4242        return 0;
    4343    }
    4444
    45     Document* document = toDocument(context);
     45    Document& document = toDocument(context);
    4646
    4747    if (numberOfChannels > 10 || !isSampleRateRangeGood(sampleRate)) {
    … …  
    5555}
    5656
    57 OfflineAudioContext::OfflineAudioContext(Document* document, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
     57OfflineAudioContext::OfflineAudioContext(Document& document, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
    5858    : AudioContext(document, numberOfChannels, numberOfFrames, sampleRate)
    5959{

  • trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.h

    r137516 r158365  
    3232class OfflineAudioContext : public AudioContext {
    3333public:
    34     static PassRefPtr<OfflineAudioContext> create(ScriptExecutionContext*, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode&);
     34    static PassRefPtr<OfflineAudioContext> create(ScriptExecutionContext&, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionCode&);
    3535
    3636    virtual ~OfflineAudioContext();
    3737
    3838private:
    39     OfflineAudioContext(Document*, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
     39    OfflineAudioContext(Document&, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
    4040};
    4141

  • trunk/Source/WebCore/Modules/websockets/WebSocket.cpp

    r157971 r158365  
    142142}
    143143
    144 WebSocket::WebSocket(ScriptExecutionContext* context)
    145     : ActiveDOMObject(context)
     144WebSocket::WebSocket(ScriptExecutionContext& context)
     145    : ActiveDOMObject(&context)
    146146    , m_state(CONNECTING)
    147147    , m_bufferedAmount(0)
    … …  
    159159}
    160160
    161 PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext* context)
     161PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext& context)
    162162{
    163163    RefPtr<WebSocket> webSocket(adoptRef(new WebSocket(context)));
    … …  
    166166}
    167167
    168 PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext* context, const String& url, ExceptionCode& ec)
     168PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext& context, const String& url, ExceptionCode& ec)
    169169{
    170170    Vector<String> protocols;
    … …  
    172172}
    173173
    174 PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext* context, const String& url, const Vector<String>& protocols, ExceptionCode& ec)
     174PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext& context, const String& url, const Vector<String>& protocols, ExceptionCode& ec)
    175175{
    176176    if (url.isNull()) {
    … …  
    182182    webSocket->suspendIfNeeded();
    183183
    184     webSocket->connect(context->completeURL(url), protocols, ec);
     184    webSocket->connect(context.completeURL(url), protocols, ec);
    185185    if (ec)
    186186        return 0;
    … …  
    189189}
    190190
    191 PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext* context, const String& url, const String& protocol, ExceptionCode& ec)
     191PassRefPtr<WebSocket> WebSocket::create(ScriptExecutionContext& context, const String& url, const String& protocol, ExceptionCode& ec)
    192192{
    193193    Vector<String> protocols;

  • trunk/Source/WebCore/Modules/websockets/WebSocket.h

    r157653 r158365  
    5656    static bool isAvailable();
    5757    static const char* subProtocolSeperator();
    58     static PassRefPtr<WebSocket> create(ScriptExecutionContext*);
    59     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, ExceptionCode&);
    60     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const String& protocol, ExceptionCode&);
    61     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const Vector<String>& protocols, ExceptionCode&);
     58    static PassRefPtr<WebSocket> create(ScriptExecutionContext&);
     59    static PassRefPtr<WebSocket> create(ScriptExecutionContext&, const String& url, ExceptionCode&);
     60    static PassRefPtr<WebSocket> create(ScriptExecutionContext&, const String& url, const String& protocol, ExceptionCode&);
     61    static PassRefPtr<WebSocket> create(ScriptExecutionContext&, const String& url, const Vector<String>& protocols, ExceptionCode&);
    6262    virtual ~WebSocket();
    6363
    … …  
    114114
    115115private:
    116     explicit WebSocket(ScriptExecutionContext*);
     116    explicit WebSocket(ScriptExecutionContext&);
    117117
    118118    // ActiveDOMObject functions.

  • trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp

    r155229 r158365  
    5656        return throwVMError(exec, createReferenceError(exec, "AudioContext constructor called in a script execution context which is not a document"));
    5757
    58     Document* document = toDocument(scriptExecutionContext);
     58    Document& document = toDocument(*scriptExecutionContext);
    5959
    6060    RefPtr<AudioContext> audioContext;
    … …  
    7474        // Constructor for offline (render-target) AudioContext which renders into an AudioBuffer.
    7575        // new AudioContext(in unsigned long numberOfChannels, in unsigned long numberOfFrames, in float sampleRate);
    76         document->addConsoleMessage(JSMessageSource, WarningMessageLevel,
     76        document.addConsoleMessage(JSMessageSource, WarningMessageLevel,
    7777            "Deprecated AudioContext constructor: use OfflineAudioContext instead");
    7878

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r157615 r158365  
    40254025            my ($dummy, $paramIndex) = GenerateParametersCheck($outputArray, $function, $interface, $numParameters, $interfaceName, "constructorCallback", undef, undef, undef);
    40264026
    4027             if ($codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{"ConstructorCallWith"}, "ScriptExecutionContext")) {
    4028                 push(@constructorArgList, "context");
     4027            if ($codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{"ConstructorCallWith"}, "ScriptExecutionContext") ) {
     4028                push(@constructorArgList, "*context");
    40294029                push(@$outputArray, "    ScriptExecutionContext* context = castedThis->scriptExecutionContext();\n");
    40304030                push(@$outputArray, "    if (!context)\n");

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

    r157438 r158365  
    148148    if (!context)
    149149        return throwVMError(exec, createReferenceError(exec, "TestInterface constructor associated document is unavailable"));
    150     RefPtr<TestInterface> object = TestInterface::create(context, str1, str2, ec);
     150    RefPtr<TestInterface> object = TestInterface::create(*context, str1, str2, ec);
    151151    if (ec) {
    152152        setDOMException(exec, ec);

  • trunk/Source/WebCore/dom/Document.h

    r157854 r158365  
    16191619Element* eventTargetElementForDocument(Document*);
    16201620
     1621inline Document& toDocument(ScriptExecutionContext& scriptExecutionContext)
     1622{
     1623    ASSERT_WITH_SECURITY_IMPLICATION(scriptExecutionContext.isDocument());
     1624    return static_cast<Document&>(scriptExecutionContext);
     1625}
     1626
     1627inline const Document& toDocument(const ScriptExecutionContext& scriptExecutionContext)
     1628{
     1629    ASSERT_WITH_SECURITY_IMPLICATION(scriptExecutionContext.isDocument());
     1630    return static_cast<const Document&>(scriptExecutionContext);
     1631}
     1632
    16211633inline Document* toDocument(ScriptExecutionContext* scriptExecutionContext)
    16221634{

  • trunk/Source/WebCore/dom/MessageChannel.cpp

    r45467 r158365  
    3333namespace WebCore {
    3434
    35 MessageChannel::MessageChannel(ScriptExecutionContext* context)
    36     : m_port1(MessagePort::create(*context))
    37     , m_port2(MessagePort::create(*context))
     35MessageChannel::MessageChannel(ScriptExecutionContext& context)
     36    : m_port1(MessagePort::create(context))
     37    , m_port2(MessagePort::create(context))
    3838{
    3939    MessagePortChannel::createChannel(m_port1.get(), m_port2.get());

  • trunk/Source/WebCore/dom/MessageChannel.h

    r123451 r158365  
    3939    class MessageChannel : public RefCounted<MessageChannel> {
    4040    public:
    41         static PassRefPtr<MessageChannel> create(ScriptExecutionContext* context) { return adoptRef(new MessageChannel(context)); }
     41        static PassRefPtr<MessageChannel> create(ScriptExecutionContext& context) { return adoptRef(new MessageChannel(context)); }
    4242        ~MessageChannel();
    4343
    … …  
    4646
    4747    private:
    48         explicit MessageChannel(ScriptExecutionContext*);
     48        explicit MessageChannel(ScriptExecutionContext&);
    4949
    5050        RefPtr<MessagePort> m_port1;

  • trunk/Source/WebCore/fileapi/FileReader.cpp

    r156413 r158365  
    4949static const double progressNotificationIntervalMS = 50;
    5050
    51 PassRefPtr<FileReader> FileReader::create(ScriptExecutionContext* context)
     51PassRefPtr<FileReader> FileReader::create(ScriptExecutionContext& context)
    5252{
    5353    RefPtr<FileReader> fileReader(adoptRef(new FileReader(context)));
    … …  
    5656}
    5757
    58 FileReader::FileReader(ScriptExecutionContext* context)
    59     : ActiveDOMObject(context)
     58FileReader::FileReader(ScriptExecutionContext& context)
     59    : ActiveDOMObject(&context)
    6060    , m_state(EMPTY)
    6161    , m_aborting(false)

  • trunk/Source/WebCore/fileapi/FileReader.h

    r156719 r158365  
    5656class FileReader FINAL : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
    5757public:
    58     static PassRefPtr<FileReader> create(ScriptExecutionContext*);
     58    static PassRefPtr<FileReader> create(ScriptExecutionContext&);
    5959
    6060    virtual ~FileReader();
    … …  
    102102
    103103private:
    104     explicit FileReader(ScriptExecutionContext*);
     104    explicit FileReader(ScriptExecutionContext&);
    105105
    106106    // ActiveDOMObject

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r158318 r158365  
    49374937
    49384938    // Otherwise, let controller be a newly created MediaController.
    4939     setController(MediaController::create(Node::scriptExecutionContext()));
     4939    setController(MediaController::create(document()));
    49404940}
    49414941

  • trunk/Source/WebCore/html/MediaController.cpp

    r157971 r158365  
    3939using namespace WebCore;
    4040
    41 PassRefPtr<MediaController> MediaController::create(ScriptExecutionContext* context)
     41PassRefPtr<MediaController> MediaController::create(ScriptExecutionContext& context)
    4242{
    4343    return adoptRef(new MediaController(context));
    4444}
    4545
    46 MediaController::MediaController(ScriptExecutionContext* context)
     46MediaController::MediaController(ScriptExecutionContext& context)
    4747    : m_paused(false)
    4848    , m_defaultPlaybackRate(1)

  • trunk/Source/WebCore/html/MediaController.h

    r157890 r158365  
    4646class MediaController FINAL : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
    4747public:
    48     static PassRefPtr<MediaController> create(ScriptExecutionContext*);
     48    static PassRefPtr<MediaController> create(ScriptExecutionContext&);
    4949    virtual ~MediaController();
    5050
    … …  
    115115
    116116private:
    117     explicit MediaController(ScriptExecutionContext*);
     117    explicit MediaController(ScriptExecutionContext&);
    118118    void reportControllerState();
    119119    void updateReadyState();
    … …  
    133133    virtual void derefEventTarget() OVERRIDE { deref(); }
    134134    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaControllerEventTargetInterfaceType; }
    135     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; };
     135    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return &m_scriptExecutionContext; };
    136136
    137137    friend class HTMLMediaElement;
    … …  
    151151    bool m_closedCaptionsVisible;
    152152    std::unique_ptr<Clock> m_clock;
    153     ScriptExecutionContext* m_scriptExecutionContext;
     153    ScriptExecutionContext& m_scriptExecutionContext;
    154154    Timer<MediaController> m_timeupdateTimer;
    155155    double m_previousTimeupdateTime;

  • trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp

    r154908 r158365  
    151151        return;
    152152
    153     RefPtr<TextTrackCueGeneric> cue = TextTrackCueGeneric::create(scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
     153    RefPtr<TextTrackCueGeneric> cue = TextTrackCueGeneric::create(*scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
    154154    updateCueFromCueData(cue.get(), cueData.get());
    155155    if (hasCue(cue.get(), TextTrackCue::IgnoreDuration)) {

  • trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp

    r157653 r158365  
    6565    for (size_t i = 0; i < cues.size(); ++i) {
    6666        RefPtr<WebVTTCueData> cueData = cues[i];
    67         RefPtr<TextTrackCue> cue = TextTrackCue::create(scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
     67        RefPtr<TextTrackCue> cue = TextTrackCue::create(*scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
    6868        cue->setId(cueData->id());
    6969        cue->setCueSettings(cueData->settings());

  • trunk/Source/WebCore/html/track/TextTrackCue.cpp

    r158097 r158365  
    184184// ----------------------------
    185185
    186 TextTrackCue::TextTrackCue(ScriptExecutionContext* context, double start, double end, const String& content)
     186TextTrackCue::TextTrackCue(ScriptExecutionContext& context, double start, double end, const String& content)
    187187    : m_startTime(start)
    188188    , m_endTime(end)
    … …  
    202202    , m_pauseOnExit(false)
    203203    , m_snapToLines(true)
    204     , m_cueBackgroundBox(HTMLSpanElement::create(spanTag, *toDocument(context)))
     204    , m_cueBackgroundBox(HTMLSpanElement::create(spanTag, toDocument(context)))
    205205    , m_displayTreeShouldChange(true)
    206206    , m_displayDirection(CSSValueLtr)
    207207{
    208     ASSERT(m_scriptExecutionContext->isDocument());
     208    ASSERT(m_scriptExecutionContext.isDocument());
    209209
    210210    // 4. If the text track cue writing direction is horizontal, then let
    … …  
    501501{
    502502    if (!m_webVTTNodeTree)
    503         m_webVTTNodeTree = WebVTTParser::create(0, m_scriptExecutionContext)->createDocumentFragmentFromCueText(m_content);
     503        m_webVTTNodeTree = WebVTTParser::create(0, &m_scriptExecutionContext)->createDocumentFragmentFromCueText(m_content);
    504504}
    505505
    … …  
    765765            unsigned position = 0;
    766766            String timestamp = child->nodeValue();
    767             double currentTimestamp = WebVTTParser::create(0, m_scriptExecutionContext)->collectTimeStamp(timestamp, &position);
     767            double currentTimestamp = WebVTTParser::create(0, &m_scriptExecutionContext)->collectTimeStamp(timestamp, &position);
    768768            ASSERT(currentTimestamp != -1);
    769769           

  • trunk/Source/WebCore/html/track/TextTrackCue.h

    r158097 r158365  
    7474class TextTrackCue : public RefCounted<TextTrackCue>, public EventTargetWithInlineData {
    7575public:
    76     static PassRefPtr<TextTrackCue> create(ScriptExecutionContext* context, double start, double end, const String& content)
     76    static PassRefPtr<TextTrackCue> create(ScriptExecutionContext& context, double start, double end, const String& content)
    7777    {
    7878        return adoptRef(new TextTrackCue(context, start, end, content));
    … …  
    155155
    156156    virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return TextTrackCueEventTargetInterfaceType; }
    157     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
     157    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return &m_scriptExecutionContext; }
    158158
    159159    std::pair<double, double> getCSSPosition() const;
    … …  
    204204
    205205protected:
    206     TextTrackCue(ScriptExecutionContext*, double start, double end, const String& content);
    207 
    208     Document& ownerDocument() { return *toDocument(m_scriptExecutionContext); }
     206    TextTrackCue(ScriptExecutionContext&, double start, double end, const String& content);
     207
     208    Document& ownerDocument() { return toDocument(m_scriptExecutionContext); }
    209209
    210210    virtual PassRefPtr<TextTrackCueBox> createDisplayTree();
    … …  
    255255    TextTrack* m_track;
    256256
    257     ScriptExecutionContext* m_scriptExecutionContext;
     257    ScriptExecutionContext& m_scriptExecutionContext;
    258258
    259259    bool m_isActive;

  • trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp

    r155795 r158365  
    110110}
    111111
    112 TextTrackCueGeneric::TextTrackCueGeneric(ScriptExecutionContext* context, double start, double end, const String& content)
     112TextTrackCueGeneric::TextTrackCueGeneric(ScriptExecutionContext& context, double start, double end, const String& content)
    113113    : TextTrackCue(context, start, end, content)
    114114    , m_baseFontSizeRelativeToVideoHeight(0)

  • trunk/Source/WebCore/html/track/TextTrackCueGeneric.h

    r151947 r158365  
    3737
    3838// A "generic" cue is a non-WebVTT cue, so it is not positioned/sized with the WebVTT logic.
    39 class TextTrackCueGeneric : public TextTrackCue {
     39class TextTrackCueGeneric FINAL : public TextTrackCue {
    4040public:
    41     static PassRefPtr<TextTrackCueGeneric> create(ScriptExecutionContext* context, double start, double end, const String& content)
     41    static PassRefPtr<TextTrackCueGeneric> create(ScriptExecutionContext& context, double start, double end, const String& content)
    4242    {
    4343        return adoptRef(new TextTrackCueGeneric(context, start, end, content));
    … …  
    8080    virtual bool isOrderedBefore(const TextTrackCue*) const OVERRIDE;
    8181
    82     TextTrackCueGeneric(ScriptExecutionContext*, double start, double end, const String&);
     82    TextTrackCueGeneric(ScriptExecutionContext&, double start, double end, const String&);
    8383   
    8484    Color m_foregroundColor;

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r158331 r158365  
    594594void InspectorResourceAgent::replayXHR(ErrorString*, const String& requestId)
    595595{
    596     RefPtr<XMLHttpRequest> xhr = XMLHttpRequest::create(m_pageAgent->mainFrame()->document());
     596    RefPtr<XMLHttpRequest> xhr = XMLHttpRequest::create(*m_pageAgent->mainFrame()->document());
    597597    String actualRequestId = requestId;
    598598

  • trunk/Source/WebCore/loader/TextTrackLoader.cpp

    r157801 r158365  
    218218        for (size_t i = 0; i < newCues.size(); ++i) {
    219219            RefPtr<WebVTTCueData> data = newCues[i];
    220             RefPtr<TextTrackCue> cue = TextTrackCue::create(m_scriptExecutionContext, data->startTime(), data->endTime(), data->content());
     220            RefPtr<TextTrackCue> cue = TextTrackCue::create(*m_scriptExecutionContext, data->startTime(), data->endTime(), data->content());
    221221            cue->setId(data->id());
    222222            cue->setCueSettings(data->settings());

  • trunk/Source/WebCore/page/EventSource.cpp

    r156550 r158365  
    6060const unsigned long long EventSource::defaultReconnectDelay = 3000;
    6161
    62 inline EventSource::EventSource(ScriptExecutionContext* context, const URL& url, const Dictionary& eventSourceInit)
    63     : ActiveDOMObject(context)
     62inline EventSource::EventSource(ScriptExecutionContext& context, const URL& url, const Dictionary& eventSourceInit)
     63    : ActiveDOMObject(&context)
    6464    , m_url(url)
    6565    , m_withCredentials(false)
    … …  
    7474}
    7575
    76 PassRefPtr<EventSource> EventSource::create(ScriptExecutionContext* context, const String& url, const Dictionary& eventSourceInit, ExceptionCode& ec)
     76PassRefPtr<EventSource> EventSource::create(ScriptExecutionContext& context, const String& url, const Dictionary& eventSourceInit, ExceptionCode& ec)
    7777{
    7878    if (url.isEmpty()) {
    … …  
    8181    }
    8282
    83     URL fullURL = context->completeURL(url);
     83    URL fullURL = context.completeURL(url);
    8484    if (!fullURL.isValid()) {
    8585        ec = SYNTAX_ERR;
    … …  
    8989    // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
    9090    bool shouldBypassMainWorldContentSecurityPolicy = false;
    91     if (context->isDocument()) {
    92         Document* document = toDocument(context);
    93         shouldBypassMainWorldContentSecurityPolicy = document->frame()->script().shouldBypassMainWorldContentSecurityPolicy();
    94     }
    95     if (!shouldBypassMainWorldContentSecurityPolicy && !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {
     91    if (context.isDocument()) {
     92        Document& document = toDocument(context);
     93        shouldBypassMainWorldContentSecurityPolicy = document.frame()->script().shouldBypassMainWorldContentSecurityPolicy();
     94    }
     95    if (!shouldBypassMainWorldContentSecurityPolicy && !context.contentSecurityPolicy()->allowConnectToSource(fullURL)) {
    9696        // FIXME: Should this be throwing an exception?
    9797        ec = SECURITY_ERR;

  • trunk/Source/WebCore/page/EventSource.h

    r156719 r158365  
    5252    WTF_MAKE_FAST_ALLOCATED;
    5353public:
    54     static PassRefPtr<EventSource> create(ScriptExecutionContext*, const String& url, const Dictionary&, ExceptionCode&);
     54    static PassRefPtr<EventSource> create(ScriptExecutionContext&, const String& url, const Dictionary&, ExceptionCode&);
    5555    virtual ~EventSource();
    5656
    … …  
    8080
    8181private:
    82     EventSource(ScriptExecutionContext*, const URL&, const Dictionary&);
     82    EventSource(ScriptExecutionContext&, const URL&, const Dictionary&);
    8383
    8484    virtual void refEventTarget() OVERRIDE { ref(); }

  • trunk/Source/WebCore/workers/SharedWorker.cpp

    r157000 r158365  
    6565    RefPtr<SharedWorker> worker = adoptRef(new SharedWorker(context));
    6666
    67     RefPtr<MessageChannel> channel = MessageChannel::create(&context);
     67    RefPtr<MessageChannel> channel = MessageChannel::create(context);
    6868    worker->m_port = channel->port1();
    6969    OwnPtr<MessagePortChannel> remotePort = channel->port2()->disentangle();

  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r158333 r158365  
    166166}
    167167
    168 PassRefPtr<XMLHttpRequest> XMLHttpRequest::create(ScriptExecutionContext* context)
     168PassRefPtr<XMLHttpRequest> XMLHttpRequest::create(ScriptExecutionContext& context)
    169169{
    170170    RefPtr<XMLHttpRequest> xmlHttpRequest(adoptRef(new XMLHttpRequest(context)));
    … …  
    174174}
    175175
    176 XMLHttpRequest::XMLHttpRequest(ScriptExecutionContext* context)
    177     : ActiveDOMObject(context)
     176XMLHttpRequest::XMLHttpRequest(ScriptExecutionContext& context)
     177    : ActiveDOMObject(&context)
    178178    , m_async(true)
    179179    , m_includeCredentials(false)

  • trunk/Source/WebCore/xml/XMLHttpRequest.h

    r158244 r158365  
    5555    WTF_MAKE_FAST_ALLOCATED;
    5656public:
    57     static PassRefPtr<XMLHttpRequest> create(ScriptExecutionContext*);
     57    static PassRefPtr<XMLHttpRequest> create(ScriptExecutionContext&);
    5858    ~XMLHttpRequest();
    5959
    … …  
    159159
    160160private:
    161     explicit XMLHttpRequest(ScriptExecutionContext*);
     161    explicit XMLHttpRequest(ScriptExecutionContext&);
    162162
    163163    // ActiveDOMObject
Note: See TracChangeset for help on using the changeset viewer.