← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to JavaScriptCore/runtime/Lookup.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
JavaScriptCore/runtime/Lookup.cpp
20
20
#include "config.h"
21
21
#include "Lookup.h"
22
22
 
 
23
#include "JSFunction.h"
23
24
#include "PrototypeFunction.h"
24
25
 
25
26
namespace JSC {
66
67
void setUpStaticFunctionSlot(ExecState* exec, const HashEntry* entry, JSObject* thisObj, const Identifier& propertyName, PropertySlot& slot)
67
68
{
68
69
    ASSERT(entry->attributes() & Function);
69
 
    JSValuePtr* location = thisObj->getDirectLocation(propertyName);
 
70
    JSValue* location = thisObj->getDirectLocation(propertyName);
70
71
 
71
72
    if (!location) {
72
 
        PrototypeFunction* function = new (exec) PrototypeFunction(exec, entry->functionLength(), propertyName, entry->function());
 
73
        InternalFunction* function = new (exec) NativeFunctionWrapper(exec, exec->lexicalGlobalObject()->prototypeFunctionStructure(), entry->functionLength(), propertyName, entry->function());
73
74
        thisObj->putDirect(propertyName, function, entry->attributes());
74
75
        location = thisObj->getDirectLocation(propertyName);
75
76
    }