Change RefPtr<DOMWrapperWorld> that causes reference cycles to DOMWrapperWorld*

Source/bindings/v8/V8AbstractEventListener.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8EventListenerList.h"
 #include "core/events/BeforeUnloadEvent.h"
 #include "core/events/Event.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/inspector/InspectorCounters.h"
 #include "core/workers/WorkerGlobalScope.h"
 
 namespace WebCore {
 
-V8AbstractEventListener::V8AbstractEventListener(bool isAttribute, PassRefPtr<DOMWrapperWorld> world, v8::Isolate* isolate)
+V8AbstractEventListener::V8AbstractEventListener(bool isAttribute, DOMWrapperWorld* world, v8::Isolate* isolate)
     : EventListener(JSEventListenerType)
     , m_isAttribute(isAttribute)
     , m_world(world)
     , m_isolate(isolate)
 {
     if (isMainThread())
         InspectorCounters::incrementCounter(InspectorCounters::JSEventListenerCounter);
 }
 
 V8AbstractEventListener::~V8AbstractEventListener()
@@ skipping 13 matching lines @@
         return;
 
     ASSERT(event);
 
     // The callback function on XMLHttpRequest can clear the event listener and destroys 'this' object. Keep a local reference to it.
     // See issue 889829.
     RefPtr<V8AbstractEventListener> protect(this);
 
     v8::HandleScope handleScope(m_isolate);
 
-    v8::Local<v8::Context> v8Context = toV8Context(context, world());
+    v8::Local<v8::Context> v8Context = toV8Context(context, m_world);
     if (v8Context.IsEmpty())
         return;
 
     // Enter the V8 context in which to perform the event handling.
     v8::Context::Scope scope(v8Context);
 
     // Get the V8 wrapper for the event object.
     v8::Isolate* isolate = v8Context->GetIsolate();
     v8::Handle<v8::Value> jsEvent = toV8(event, v8::Handle<v8::Object>(), isolate);
     if (jsEvent.IsEmpty())
         return;
     invokeEventHandler(context, event, v8::Local<v8::Value>::New(isolate, jsEvent));
 }
 
 void V8AbstractEventListener::setListenerObject(v8::Handle<v8::Object> listener)
 {
     m_listener.set(m_isolate, listener);
     m_listener.setWeak(this, &setWeakCallback);
 }
 
 void V8AbstractEventListener::invokeEventHandler(ExecutionContext* context, Event* event, v8::Local<v8::Value> jsEvent)
 {
     // If jsEvent is empty, attempt to set it as a hidden value would crash v8.
     if (jsEvent.IsEmpty())
         return;
 
-    v8::Local<v8::Context> v8Context = toV8Context(context, world());
+    v8::Local<v8::Context> v8Context = toV8Context(context, m_world);
     if (v8Context.IsEmpty())
         return;
 
     // We push the event being processed into the global object, so that it can be exposed by DOMWindow's bindings.
     v8::Handle<v8::String> eventSymbol = v8AtomicString(v8Context->GetIsolate(), "event");
     v8::Local<v8::Value> returnValue;
 
     {
         // Catch exceptions thrown in the event handler so they do not propagate to javascript code that caused the event to fire.
         v8::TryCatch tryCatch;
@@ skipping 42 matching lines @@
 
 bool V8AbstractEventListener::shouldPreventDefault(v8::Local<v8::Value> returnValue)
 {
     // Prevent default action if the return value is false in accord with the spec
     // http://www.w3.org/TR/html5/webappapis.html#event-handler-attributes
     return returnValue->IsBoolean() && !returnValue->BooleanValue();
 }
 
 v8::Local<v8::Object> V8AbstractEventListener::getReceiverObject(ExecutionContext* context, Event* event)
 {
-    v8::Isolate* isolate = toV8Context(context, world())->GetIsolate();
+    v8::Isolate* isolate = toV8Context(context, m_world)->GetIsolate();
     v8::Local<v8::Object> listener = m_listener.newLocal(isolate);
     if (!m_listener.isEmpty() && !listener->IsFunction())
         return listener;
 
     EventTarget* target = event->currentTarget();
     v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), isolate);
     if (value.IsEmpty())
         return v8::Local<v8::Object>();
     return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(value));
 }
 
 bool V8AbstractEventListener::belongsToTheCurrentWorld() const
 {
     return m_isolate->InContext() && m_world == DOMWrapperWorld::current(m_isolate);
 }
 
 void V8AbstractEventListener::setWeakCallback(const v8::WeakCallbackData<v8::Object, V8AbstractEventListener> &data)
 {
     data.GetParameter()->m_listener.clear();
 }
 
 } // namespace WebCore