← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/bridge/c/c_runtime.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:
WebCore/bridge/c/c_runtime.cpp
37
37
namespace JSC {
38
38
namespace Bindings {
39
39
 
40
 
JSValuePtr CField::valueFromInstance(ExecState* exec, const Instance* inst) const
 
40
JSValue CField::valueFromInstance(ExecState* exec, const Instance* inst) const
41
41
{
42
42
    const CInstance* instance = static_cast<const CInstance*>(inst);
43
43
    NPObject* obj = instance->getObject();
51
51
            result = obj->_class->getProperty(obj, _fieldIdentifier, &property);
52
52
        }
53
53
        if (result) {
54
 
            JSValuePtr result = convertNPVariantToValue(exec, &property, instance->rootObject());
 
54
            JSValue result = convertNPVariantToValue(exec, &property, instance->rootObject());
55
55
            _NPN_ReleaseVariantValue(&property);
56
56
            return result;
57
57
        }
59
59
    return jsUndefined();
60
60
}
61
61
 
62
 
void CField::setValueToInstance(ExecState *exec, const Instance *inst, JSValuePtr aValue) const
 
62
void CField::setValueToInstance(ExecState *exec, const Instance *inst, JSValue aValue) const
63
63
{
64
64
    const CInstance* instance = static_cast<const CInstance*>(inst);
65
65
    NPObject* obj = instance->getObject();