Diff
Modified: trunk/LayoutTests/ChangeLog (148888 => 148889)
--- trunk/LayoutTests/ChangeLog 2013-04-22 16:32:53 UTC (rev 148888)
+++ trunk/LayoutTests/ChangeLog 2013-04-22 16:40:24 UTC (rev 148889)
@@ -1,3 +1,14 @@
+2013-04-22 Jessie Berlin <[email protected]>
+
+ Fix an incorrect rebaseline done in r148830.
+
+ Instead of updating the cross platform wk2 results, r148830 should have added efl wk2
+ specific results. Move the previous mac wk2 specific results into the mac wk2 platform
+ directory.
+
+ * platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt: Renamed from LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt.
+ * platform/mac-wk2/loader/go-back-cached-main-resource-expected.txt: Downloaded from the mac-wk2 bots.
+
2013-04-22 Mario Sanchez Prada <[email protected]>
Update layout test verifying Tab behaves correctly after linking to fragment ID
Copied: trunk/LayoutTests/platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt (from rev 148887, trunk/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt) (0 => 148889)
--- trunk/LayoutTests/platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl-wk2/loader/go-back-cached-main-resource-expected.txt 2013-04-22 16:40:24 UTC (rev 148889)
@@ -0,0 +1,25 @@
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
+<unknown> - didFinishLoading
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
+resources/other-page.html - didFinishLoading
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
+resources/other-page.html - didFinishLoading
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+This test check the following situation:
+
+First you navigate to a page (first-page.html).
+Then you go to another page (other-page.html).
+You repeat previous steps again (going to first-page.html and then to other-page.html).
+Finally you click back.
+The problem was that the resource load callbacks when going back to the cached main resource were not being called.
+
+See bug #112418.
Copied: trunk/LayoutTests/platform/mac-wk2/loader/go-back-cached-main-resource-expected.txt (from rev 148887, trunk/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt) (0 => 148889)
--- trunk/LayoutTests/platform/mac-wk2/loader/go-back-cached-main-resource-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/loader/go-back-cached-main-resource-expected.txt 2013-04-22 16:40:24 UTC (rev 148889)
@@ -0,0 +1,25 @@
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
+<unknown> - didFinishLoading
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
+resources/other-page.html - didFinishLoading
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
+resources/other-page.html - didFinishLoading
+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL , http method GET> redirectResponse (null)
+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
+resources/first-page.html - didFinishLoading
+This test check the following situation:
+
+First you navigate to a page (first-page.html).
+Then you go to another page (other-page.html).
+You repeat previous steps again (going to first-page.html and then to other-page.html).
+Finally you click back.
+The problem was that the resource load callbacks when going back to the cached main resource were not being called.
+
+See bug #112418.
Deleted: trunk/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt (148888 => 148889)
--- trunk/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt 2013-04-22 16:32:53 UTC (rev 148888)
+++ trunk/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt 2013-04-22 16:40:24 UTC (rev 148889)
@@ -1,25 +0,0 @@
-resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
-resources/first-page.html - didFinishLoading
-resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
-resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
-resources/other-page.html - didFinishLoading
-resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
-resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
-resources/first-page.html - didFinishLoading
-resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL other-page.html, http method GET> redirectResponse (null)
-resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
-resources/other-page.html - didFinishLoading
-resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL first-page.html, http method GET> redirectResponse (null)
-resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
-resources/first-page.html - didFinishLoading
-This test check the following situation:
-
-First you navigate to a page (first-page.html).
-Then you go to another page (other-page.html).
-You repeat previous steps again (going to first-page.html and then to other-page.html).
-Finally you click back.
-The problem was that the resource load callbacks when going back to the cached main resource were not being called.
-
-See bug #112418.
