diff options
Diffstat (limited to 'webkit/port/bindings/v8/ScriptController.cpp')
| -rw-r--r-- | webkit/port/bindings/v8/ScriptController.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp index a0b0969..9f2a5be 100644 --- a/webkit/port/bindings/v8/ScriptController.cpp +++ b/webkit/port/bindings/v8/ScriptController.cpp @@ -1,10 +1,10 @@ // Copyright (c) 2008, 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 @@ -14,7 +14,7 @@ // * Neither the name of Google Inc. nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -224,7 +224,7 @@ ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) // HTMLTokenizer used to use base zero line numbers for scripts, now it // uses base 1. This confuses v8, which uses line offsets from the // first line. - v8::Local<v8::Value> obj = m_proxy->Evaluate(sourceCode.url(), + v8::Local<v8::Value> obj = m_proxy->Evaluate(sourceCode.url(), sourceCode.startLine() - 1, sourceCode.source(), NULL); @@ -328,21 +328,21 @@ PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widge // NPObjects can be created either by the browser (e.g. the main // window object) or by the plugin (the main plugin object // for a HTMLEmbedElement). Further, - // unlike most DOM Objects, the frame is especially careful to ensure - // NPObjects terminate at frame teardown because if a plugin leaks a + // unlike most DOM Objects, the frame is especially careful to ensure + // NPObjects terminate at frame teardown because if a plugin leaks a // reference, it could leak its objects (or the browser's objects). - // + // // The Frame maintains a list of plugin objects (m_pluginObjects) // which it can use to quickly find the wrapped embed object. - // - // Inside the NPRuntime, we've added a few methods for registering - // wrapped NPObjects. The purpose of the registration is because + // + // Inside the NPRuntime, we've added a few methods for registering + // wrapped NPObjects. The purpose of the registration is because // javascript garbage collection is non-deterministic, yet we need to // be able to tear down the plugin objects immediately. When an object // is registered, javascript can use it. When the object is destroyed, // or when the object's "owning" object is destroyed, the object will // be un-registered, and the javascript engine must not use it. - // + // // Inside the javascript engine, the engine can keep a reference to the // NPObject as part of its wrapper. However, before accessing the object // it must consult the NPN_Registry. @@ -363,7 +363,7 @@ void ScriptController::cleanupScriptObjectsForPlugin(void* nativeHandle) _NPN_UnregisterObject(it->second); NPN_ReleaseObject(it->second); m_pluginObjects.remove(it); -} +} static NPObject* createNoScriptObject() { |