Attachment #161692 for bug #95563

View Details Raw Unified Return to Bug 95563

| Differences between



2012-08-31  Michael Pruett  <michael@68k.org>

        [JSC] Clear exceptions in JSDictionary::get().
        https://bugs.webkit.org/show_bug.cgi?id=95563

        Reviewed by NOBODY (OOPS!).

        Clear exceptions thrown in JSDictionary::get() so that such
        exceptions do not cause subsequent calls to fail spuriously.

        Test: storage/indexeddb/create-object-store-options.html

        * bindings/js/JSDictionary.cpp:
        (WebCore::JSDictionary::tryGetProperty):
        * bindings/js/JSDictionary.h:
        (WebCore::JSDictionary::tryGetPropertyAndResult):

2012-08-31  Andrey Adaikin  <aandrey@chromium.org>

        Web Inspector: [WebGL] Link WebGL calls to the source code where it was made



    if (!m_initializerObject.get()->getPropertySlot(m_exec, identifier, slot))
        return NoPropertyFound;

    if (m_exec->hadException()) {
        m_exec->clearException();
        return ExceptionThrown;
    }

    finalResult = slot.getValue(m_exec, identifier);
    if (m_exec->hadException()) {
        m_exec->clearException();
        return ExceptionThrown;
    }

    return PropertyFound;
}



        Result result;
        convertValue(m_exec, value, result);

        if (m_exec->hadException()) {
            m_exec->clearException();
            return ExceptionThrown;
        }

        setter(context, result);
        break;

Return to Bug 95563

Lines 145-152 JSDictionary::GetPropertyResult JSDictionary::tryGetPropertyAndResult(const char a/Source/WebCore/bindings/js/JSDictionary.h_sec1
- a/Source/WebCore/bindings/js/JSDictionary.h -1 / +3 lines
145	Result result;	145	Result result;
146	convertValue(m_exec, value, result);	146	convertValue(m_exec, value, result);
147		147
148	if (m_exec->hadException())	148	if (m_exec->hadException()) {
		149	m_exec->clearException();
149	return ExceptionThrown;	150	return ExceptionThrown;
		151	}
150		152
151	setter(context, result);	153	setter(context, result);
152	break;	154	break;

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +17 lines
		1	2012-08-31 Michael Pruett <michael@68k.org>
		2
		3	[JSC] Clear exceptions in JSDictionary::get().
		4	https://bugs.webkit.org/show_bug.cgi?id=95563
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Clear exceptions thrown in JSDictionary::get() so that such
		9	exceptions do not cause subsequent calls to fail spuriously.
		10
		11	Test: storage/indexeddb/create-object-store-options.html
		12
		13	* bindings/js/JSDictionary.cpp:
		14	(WebCore::JSDictionary::tryGetProperty):
		15	* bindings/js/JSDictionary.h:
		16	(WebCore::JSDictionary::tryGetPropertyAndResult):
		17
1	2012-08-31 Andrey Adaikin <aandrey@chromium.org>	18	2012-08-31 Andrey Adaikin <aandrey@chromium.org>
2		19
3	Web Inspector: [WebGL] Link WebGL calls to the source code where it was made	20	Web Inspector: [WebGL] Link WebGL calls to the source code where it was made

Lines 53-64 JSDictionary::GetPropertyResult JSDictionary::tryGetProperty(const char* propert a/Source/WebCore/bindings/js/JSDictionary.cpp_sec1
- a/Source/WebCore/bindings/js/JSDictionary.cpp -2 / +6 lines
53	if (!m_initializerObject.get()->getPropertySlot(m_exec, identifier, slot))	53	if (!m_initializerObject.get()->getPropertySlot(m_exec, identifier, slot))
54	return NoPropertyFound;	54	return NoPropertyFound;
55		55
56	if (m_exec->hadException())	56	if (m_exec->hadException()) {
		57	m_exec->clearException();
57	return ExceptionThrown;	58	return ExceptionThrown;
		59	}
58		60
59	finalResult = slot.getValue(m_exec, identifier);	61	finalResult = slot.getValue(m_exec, identifier);
60	if (m_exec->hadException())	62	if (m_exec->hadException()) {
		63	m_exec->clearException();
61	return ExceptionThrown;	64	return ExceptionThrown;
		65	}
62		66
63	return PropertyFound;	67	return PropertyFound;
64	}	68	}