| OLD | NEW |
| 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 Loading... |
| 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 |
| 153 if (!newValue->IsNull() && !newValue->IsFunction()) |
| 154 newValue = v8::Null(isolate); |
| 152 if (!newValue->IsNull() && !newValue->IsUndefined()) | 155 if (!newValue->IsNull() && !newValue->IsUndefined()) |
| 153 createHiddenDependency(object, newValue, cacheIndex, isolate); | 156 createHiddenDependency(object, newValue, cacheIndex, isolate); |
| 154 } | 157 } |
| 155 | 158 |
| 156 ExecutionContext* getExecutionContext() | 159 ExecutionContext* getExecutionContext() |
| 157 { | 160 { |
| 158 if (WorkerScriptController* controller = WorkerScriptController::controllerF
orContext()) | 161 if (WorkerScriptController* controller = WorkerScriptController::controllerF
orContext()) |
| 159 return &controller->workerGlobalScope(); | 162 return &controller->workerGlobalScope(); |
| 160 | 163 |
| 161 return currentDocument(); | 164 return currentDocument(); |
| 162 } | 165 } |
| 163 | 166 |
| 164 } // namespace WebCore | 167 } // namespace WebCore |
| OLD | NEW |