diff options
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bridge/qt/qt_class.cpp | 8 |
4 files changed, 18 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index b1b56f6..1973377 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -cacbdf18fc917122834042d77a9164a490aafde4 +807157e42add842605ec67d9363dd3f1861748ca diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 629883a..79581d1 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 4696beb87359fe9236d23e0791526eb38dab341d + cacbdf18fc917122834042d77a9164a490aafde4 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index ac5c388..481b416 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2010-05-17 Kenneth Rohde Christiansen <kenneth@webkit.org> + + Reviewed by Laszlo Gombos. + + REGRESSION(59563): [Qt] JSValue QtClass::fallbackObject can be optimized + + Patch declared a variable index, which shadowed an earlier declared + variable. + + * bridge/qt/qt_class.cpp: + (JSC::Bindings::QtClass::fallbackObject): + 2010-05-14 Noam Rosenthal <noam.rosenthal@nokia.com> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_class.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_class.cpp index 5bbc99f..2e1f6e6 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_class.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_class.cpp @@ -98,12 +98,12 @@ JSValue QtClass::fallbackObject(ExecState* exec, Instance* inst, const Identifie if (m.access() == QMetaMethod::Private) continue; - int index = 0; + int iter = 0; const char* signature = m.signature(); - while (signature[index] && signature[index] != '(') - ++index; + while (signature[iter] && signature[iter] != '(') + ++iter; - if (normal == QByteArray::fromRawData(signature, index)) { + if (normal == QByteArray::fromRawData(signature, iter)) { QtRuntimeMetaMethod* val = new (exec) QtRuntimeMetaMethod(exec, identifier, static_cast<QtInstance*>(inst), index, normal, false); qtinst->m_methods.insert(name, val); return val; |