Title: [125231] trunk
- Revision
- 125231
- Author
- [email protected]
- Date
- 2012-08-09 18:32:05 -0700 (Thu, 09 Aug 2012)
Log Message
IndexedDB: intversion-long-queue.html fails an assert
https://bugs.webkit.org/show_bug.cgi?id=92783
Reviewed by Tony Chang.
Source/WebCore:
onBlocked needs the same shouldEnqueueEvent check that the other
event generators have.
Tests: intversion-long-queue is no longer skipped.
* Modules/indexeddb/IDBRequest.h:
(IDBRequest):
* Modules/indexeddb/IDBVersionChangeRequest.cpp:
(WebCore::IDBVersionChangeRequest::onBlocked):
LayoutTests:
* platform/chromium/TestExpectations:
* storage/indexeddb/intversion-long-queue-expected.txt:
Add some FAIL lines that will be fixed when patch from 92897 lands.
This patch doesn't actually change any behavior,
intversion-long-queue-expected.txt was generated with 92897 patched in
and the test was skipped so it didn't matter.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (125230 => 125231)
--- trunk/LayoutTests/ChangeLog 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/LayoutTests/ChangeLog 2012-08-10 01:32:05 UTC (rev 125231)
@@ -1,3 +1,17 @@
+2012-08-09 David Grogan <[email protected]>
+
+ IndexedDB: intversion-long-queue.html fails an assert
+ https://bugs.webkit.org/show_bug.cgi?id=92783
+
+ Reviewed by Tony Chang.
+
+ * platform/chromium/TestExpectations:
+ * storage/indexeddb/intversion-long-queue-expected.txt:
+ Add some FAIL lines that will be fixed when patch from 92897 lands.
+ This patch doesn't actually change any behavior,
+ intversion-long-queue-expected.txt was generated with 92897 patched in
+ and the test was skipped so it didn't matter.
+
2012-08-09 Julien Chaffraix <[email protected]>
REGRESSION(r117339): cell in block-level table in inline-block are aligned with their last line box
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (125230 => 125231)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-10 01:32:05 UTC (rev 125231)
@@ -3421,9 +3421,6 @@
// Times out in DRT, but works in chrome
BUGWK92776 SKIP : storage/indexeddb/intversion-delete-in-upgradeneeded.html = PASS
-// Will work when the patch in 92897 lands.
-BUGWK92897 SKIP : storage/indexeddb/intversion-long-queue.html = PASS
-
// Started failing around r122770
BUGWK91445 LINUX : plugins/embed-attributes-style.html = PASS IMAGE
Modified: trunk/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt (125230 => 125231)
--- trunk/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/LayoutTests/storage/indexeddb/intversion-long-queue-expected.txt 2012-08-10 01:32:05 UTC (rev 125231)
@@ -65,13 +65,8 @@
FAIL event.newVersion should be null (of type object). Was undefined (of type undefined).
PASS event.target.result is null
-upgradeNeededCallback():
-gotUpgradeNeededEvent = true
-PASS event.newVersion is 1
-PASS event.oldVersion is 0
-
openWithVersionSuccessCallback():
-PASS gotUpgradeNeededEvent is true
+FAIL gotUpgradeNeededEvent should be true. Was false.
PASS event.target.result.objectStoreNames.length is 0
PASS successfullyParsed is true
Modified: trunk/Source/WebCore/ChangeLog (125230 => 125231)
--- trunk/Source/WebCore/ChangeLog 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/Source/WebCore/ChangeLog 2012-08-10 01:32:05 UTC (rev 125231)
@@ -1,3 +1,20 @@
+2012-08-09 David Grogan <[email protected]>
+
+ IndexedDB: intversion-long-queue.html fails an assert
+ https://bugs.webkit.org/show_bug.cgi?id=92783
+
+ Reviewed by Tony Chang.
+
+ onBlocked needs the same shouldEnqueueEvent check that the other
+ event generators have.
+
+ Tests: intversion-long-queue is no longer skipped.
+
+ * Modules/indexeddb/IDBRequest.h:
+ (IDBRequest):
+ * Modules/indexeddb/IDBVersionChangeRequest.cpp:
+ (WebCore::IDBVersionChangeRequest::onBlocked):
+
2012-08-09 Eric Penner <[email protected]>
[chromium] Paint animated layers immediately to avoid animation hiccups.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (125230 => 125231)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2012-08-10 01:32:05 UTC (rev 125231)
@@ -108,14 +108,14 @@
protected:
IDBRequest(ScriptExecutionContext*, PassRefPtr<IDBAny> source, IDBTransaction*);
void enqueueEvent(PassRefPtr<Event>);
+ bool shouldEnqueueEvent() const;
+
RefPtr<IDBAny> m_result;
unsigned short m_errorCode;
String m_errorMessage;
RefPtr<DOMError> m_error;
private:
- bool shouldEnqueueEvent() const;
-
// EventTarget
virtual void refEventTarget() { ref(); }
virtual void derefEventTarget() { deref(); }
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.cpp (125230 => 125231)
--- trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.cpp 2012-08-10 01:21:44 UTC (rev 125230)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.cpp 2012-08-10 01:32:05 UTC (rev 125231)
@@ -58,6 +58,8 @@
void IDBVersionChangeRequest::onBlocked()
{
+ if (!shouldEnqueueEvent())
+ return;
ASSERT(!m_errorCode && m_errorMessage.isNull() && !m_result);
enqueueEvent(IDBVersionChangeEvent::create(m_version, eventNames().blockedEvent));
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
