Title: [138258] trunk
Revision
138258
Author
carlo...@webkit.org
Date
2012-12-20 08:45:57 -0800 (Thu, 20 Dec 2012)

Log Message

[Qt]REGRESSION(r138222): It made fast/forms/number/number-spinbutton-click-in-iframe.html crash
https://bugs.webkit.org/show_bug.cgi?id=105529

Reviewed by Nate Chapin.

Source/WebCore:

Make sure assignIdentifierToInitialRequest() and
dispatchWillSendRequest() are called before all other
notification callbacks for the substitute data.

Fixes a crash in fast/forms/number/number-spinbutton-click-in-iframe.html.

* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::load): Call
handleSubstituteDataLoadSoon() after assigning the substitute data
identifier.

LayoutTests:

* platform/qt/TestExpectations: Unskip
fast/forms/number/number-spinbutton-click-in-iframe.html.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (138257 => 138258)


--- trunk/LayoutTests/ChangeLog	2012-12-20 16:22:37 UTC (rev 138257)
+++ trunk/LayoutTests/ChangeLog	2012-12-20 16:45:57 UTC (rev 138258)
@@ -1,3 +1,13 @@
+2012-12-20  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [Qt]REGRESSION(r138222): It made fast/forms/number/number-spinbutton-click-in-iframe.html crash
+        https://bugs.webkit.org/show_bug.cgi?id=105529
+
+        Reviewed by Nate Chapin.
+
+        * platform/qt/TestExpectations: Unskip
+        fast/forms/number/number-spinbutton-click-in-iframe.html.
+
 2012-12-20  Lianghui Chen  <liac...@rim.com>
 
         2 fast/filesystem test cases ask for more space than the size they request when creating the file system

Modified: trunk/LayoutTests/platform/qt/TestExpectations (138257 => 138258)


--- trunk/LayoutTests/platform/qt/TestExpectations	2012-12-20 16:22:37 UTC (rev 138257)
+++ trunk/LayoutTests/platform/qt/TestExpectations	2012-12-20 16:45:57 UTC (rev 138258)
@@ -2497,6 +2497,3 @@
 http/tests/xmlhttprequest/post-blob-content-type-sync.html
 
 webkit.org/b/104788 css3/flexbox/flex-algorithm.html [ Failure ]
-
-# [Qt]REGRESSION(r138222): It made fast/forms/number/number-spinbutton-click-in-iframe.html crash
-webkit.org/b/105529 fast/forms/number/number-spinbutton-click-in-iframe.html

Modified: trunk/Source/WebCore/ChangeLog (138257 => 138258)


--- trunk/Source/WebCore/ChangeLog	2012-12-20 16:22:37 UTC (rev 138257)
+++ trunk/Source/WebCore/ChangeLog	2012-12-20 16:45:57 UTC (rev 138258)
@@ -1,3 +1,21 @@
+2012-12-20  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [Qt]REGRESSION(r138222): It made fast/forms/number/number-spinbutton-click-in-iframe.html crash
+        https://bugs.webkit.org/show_bug.cgi?id=105529
+
+        Reviewed by Nate Chapin.
+
+        Make sure assignIdentifierToInitialRequest() and
+        dispatchWillSendRequest() are called before all other
+        notification callbacks for the substitute data.
+
+        Fixes a crash in fast/forms/number/number-spinbutton-click-in-iframe.html.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::load): Call
+        handleSubstituteDataLoadSoon() after assigning the substitute data
+        identifier.
+
 2012-12-20  Kunihiko Sakamoto  <ksakam...@chromium.org>
 
         INPUT_MULTIPLE_FIELDS_UI: Add minimum/maximum value to DateTimeEditElement::LayoutParameters

Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (138257 => 138258)


--- trunk/Source/WebCore/loader/MainResourceLoader.cpp	2012-12-20 16:22:37 UTC (rev 138257)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp	2012-12-20 16:45:57 UTC (rev 138258)
@@ -643,10 +643,10 @@
     documentLoader()->applicationCacheHost()->maybeLoadMainResource(request, m_substituteData);
 
     if (m_substituteData.isValid()) {
-        handleSubstituteDataLoadSoon(request);
         m_substituteDataLoadIdentifier = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
         frameLoader()->notifier()->assignIdentifierToInitialRequest(m_substituteDataLoadIdentifier, documentLoader(), request);
         frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_substituteDataLoadIdentifier, request, ResourceResponse());
+        handleSubstituteDataLoadSoon(request);
         return;
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to