Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: Source/bindings/v8/V8AbstractEventListener.cpp

Issue 209713003: Make DOMWrapperWorld::current() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8AbstractEventListener.h ('k') | Source/bindings/v8/V8Binding.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 #include "bindings/v8/V8Binding.h" 36 #include "bindings/v8/V8Binding.h"
37 #include "bindings/v8/V8EventListenerList.h" 37 #include "bindings/v8/V8EventListenerList.h"
38 #include "bindings/v8/V8HiddenValue.h" 38 #include "bindings/v8/V8HiddenValue.h"
39 #include "core/events/BeforeUnloadEvent.h" 39 #include "core/events/BeforeUnloadEvent.h"
40 #include "core/events/Event.h" 40 #include "core/events/Event.h"
41 #include "core/inspector/InspectorCounters.h" 41 #include "core/inspector/InspectorCounters.h"
42 #include "core/workers/WorkerGlobalScope.h" 42 #include "core/workers/WorkerGlobalScope.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 V8AbstractEventListener::V8AbstractEventListener(bool isAttribute, DOMWrapperWor ld* world, v8::Isolate* isolate) 46 V8AbstractEventListener::V8AbstractEventListener(bool isAttribute, DOMWrapperWor ld& world, v8::Isolate* isolate)
47 : EventListener(JSEventListenerType) 47 : EventListener(JSEventListenerType)
48 , m_isAttribute(isAttribute) 48 , m_isAttribute(isAttribute)
49 , m_world(world) 49 , m_world(world)
50 , m_isolate(isolate) 50 , m_isolate(isolate)
51 { 51 {
52 if (isMainThread()) 52 if (isMainThread())
53 InspectorCounters::incrementCounter(InspectorCounters::JSEventListenerCo unter); 53 InspectorCounters::incrementCounter(InspectorCounters::JSEventListenerCo unter);
54 } 54 }
55 55
56 V8AbstractEventListener::~V8AbstractEventListener() 56 V8AbstractEventListener::~V8AbstractEventListener()
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 EventTarget* target = event->currentTarget(); 171 EventTarget* target = event->currentTarget();
172 v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), isolate ); 172 v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), isolate );
173 if (value.IsEmpty()) 173 if (value.IsEmpty())
174 return v8::Local<v8::Object>(); 174 return v8::Local<v8::Object>();
175 return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(valu e)); 175 return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(valu e));
176 } 176 }
177 177
178 bool V8AbstractEventListener::belongsToTheCurrentWorld() const 178 bool V8AbstractEventListener::belongsToTheCurrentWorld() const
179 { 179 {
180 return m_isolate->InContext() && m_world == DOMWrapperWorld::current(m_isola te); 180 return m_isolate->InContext() && m_world == &DOMWrapperWorld::current(m_isol ate);
181 } 181 }
182 182
183 void V8AbstractEventListener::setWeakCallback(const v8::WeakCallbackData<v8::Obj ect, V8AbstractEventListener> &data) 183 void V8AbstractEventListener::setWeakCallback(const v8::WeakCallbackData<v8::Obj ect, V8AbstractEventListener> &data)
184 { 184 {
185 data.GetParameter()->m_listener.clear(); 185 data.GetParameter()->m_listener.clear();
186 } 186 }
187 187
188 } // namespace WebCore 188 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8AbstractEventListener.h ('k') | Source/bindings/v8/V8Binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698