Attachment 173306 Details for Bug 96614 – Patch

[patch] Patch

bug-96614-20121109232834.patch (text/plain), 2.27 KB, created by Charles Wei on 2012-11-09 07:30:34 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Charles Wei

Created: 2012-11-09 07:30:34 PST

Size: 2.27 KB

patch

obsolete

>Subversion Revision: 134037
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index baf7a1ae70b173537e464a22791d8ad6280401a8..21dac1b892371c623d214938c0bcb23bd2413b12 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2012-11-09  Charles Wei  <charles.wei@torchmobile.com.cn>
>+
>+        Need to clear exception in JSDictionary that might have been caused by previous operation.
>+        https://bugs.webkit.org/show_bug.cgi?id=96614
>+
>+        Reviewed by George Staikos.
>+
>+        IndexedDB IDBDatabase::createObjectStore supports both String type of KeyPath and
>+        String Array type of KeyPath. It will first try to get the keyPath as a String Array,
>+        if fails, it will try to get KeyPath as a String, from the Dictionary. The first get
>+        will leave the internal ExecState of Dictionary in exception state. We need to clear
>+        the exception state before the 2nd query, otherwise the second query will also fail.
>+
>+        No new tests. The existing test case LayoutTests/storage/indexeddb/tutorial.html should
>+        now work with this patch.
>+        * bindings/js/JSDictionary.cpp:
>+        (WebCore::JSDictionary::getWithUndefinedOrNullCheck):
>+
> 2012-11-09  Vsevolod Vlasov  <vsevik@chromium.org>
> 
>         Web Inspector: Add meaningful error message when request content was evicted from inspector cache.
>diff --git a/Source/WebCore/bindings/js/JSDictionary.cpp b/Source/WebCore/bindings/js/JSDictionary.cpp
>index f476d7268e2a73d3d43d0a7fffd6041907c5af01..ad17a96d46ba3f00db012e78211a60d17fb6da93 100644
>--- a/Source/WebCore/bindings/js/JSDictionary.cpp
>+++ b/Source/WebCore/bindings/js/JSDictionary.cpp
>@@ -216,6 +216,11 @@ bool JSDictionary::getWithUndefinedOrNullCheck(const String& propertyName, Strin
> {
>     ASSERT(isValid());
>     JSValue value;
>+
>+    // FIXME: This check should be moved to the head of JSDictionary::tryGetProperty(propertyName, JSValue&)
>+    // Currently we can't move the check there because it seems breaks some Qt/EFL tests for some reason.
>+    if (m_exec->hadException()) // Clear exceptions that might have been caused by previous query.
>+        m_exec->clearException();
>     if (tryGetProperty(propertyName.utf8().data(), value) != PropertyFound || value.isUndefinedOrNull())
>         return false;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 96614: 163809 | 164065 | 173253 | 173261 | 173304 | 173306 | 173540 | 177806 | 177865 | 177906 | 177907 | 178728 | 179040 | 179158 | 179326 | 179456