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

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

Issue 34393005: IDL compiler: merge and simplify EventHandler non-callable value check (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Formatting Created 7 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 void transferHiddenDependency(v8::Handle<v8::Object> object, EventListener* oldV alue, v8::Local<v8::Value> newValue, int cacheIndex, v8::Isolate* isolate) 142 void transferHiddenDependency(v8::Handle<v8::Object> object, EventListener* oldV alue, v8::Local<v8::Value> newValue, int cacheIndex, v8::Isolate* isolate)
143 { 143 {
144 if (oldValue) { 144 if (oldValue) {
145 V8AbstractEventListener* oldListener = V8AbstractEventListener::cast(old Value); 145 V8AbstractEventListener* oldListener = V8AbstractEventListener::cast(old Value);
146 if (oldListener) { 146 if (oldListener) {
147 v8::Local<v8::Object> oldListenerObject = oldListener->getExistingLi stenerObject(); 147 v8::Local<v8::Object> oldListenerObject = oldListener->getExistingLi stenerObject();
148 if (!oldListenerObject.IsEmpty()) 148 if (!oldListenerObject.IsEmpty())
149 removeHiddenDependency(object, oldListenerObject, cacheIndex, is olate); 149 removeHiddenDependency(object, oldListenerObject, cacheIndex, is olate);
150 } 150 }
151 } 151 }
152 // Non-callable input should be treated as null 152 if (!newValue->IsNull()
153 if (!newValue->IsNull() && !newValue->IsFunction()) 153 // Non-callable input is treated as null and ignored
154 newValue = v8::Null(isolate); 154 && newValue->IsFunction()
155 if (!newValue->IsNull() && !newValue->IsUndefined()) 155 && !newValue->IsUndefined())
haraken 2013/10/22 12:05:30 If IsFunction() is true, both IsNull() and IsUndef
Nils Barth (inactive) 2013/10/22 12:16:51 Thanks, changed! (I wasn't sure about the relation
156 createHiddenDependency(object, newValue, cacheIndex, isolate); 156 createHiddenDependency(object, newValue, cacheIndex, isolate);
157 } 157 }
158 158
159 ExecutionContext* getExecutionContext() 159 ExecutionContext* getExecutionContext()
160 { 160 {
161 if (WorkerScriptController* controller = WorkerScriptController::controllerF orContext()) 161 if (WorkerScriptController* controller = WorkerScriptController::controllerF orContext())
162 return &controller->workerGlobalScope(); 162 return &controller->workerGlobalScope();
163 163
164 return currentDocument(); 164 return currentDocument();
165 } 165 }
166 166
167 } // namespace WebCore 167 } // namespace WebCore
OLDNEW
« Source/bindings/v8/V8EventListenerList.h ('K') | « Source/bindings/v8/V8EventListenerList.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698