Diff
Modified: trunk/LayoutTests/ChangeLog (126883 => 126884)
--- trunk/LayoutTests/ChangeLog 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/LayoutTests/ChangeLog 2012-08-28 15:46:51 UTC (rev 126884)
@@ -1,3 +1,17 @@
+2012-08-28 Christophe Dumez <[email protected]>
+
+ [EFL] WebKit EFL updates view on HTTP 204 response
+ https://bugs.webkit.org/show_bug.cgi?id=95199
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Unskip http/tests/navigation/response204.html now
+ that EFL port properly ignores responses with
+ HTTP status 204 (No content).
+
+ * platform/efl-wk2/TestExpectations:
+ * platform/efl/Skipped:
+
2012-08-28 János Badics <[email protected]>
[Qt][WK1] Gardening after r126873. Skip a newly added failing test.
Modified: trunk/LayoutTests/platform/efl/Skipped (126883 => 126884)
--- trunk/LayoutTests/platform/efl/Skipped 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-08-28 15:46:51 UTC (rev 126884)
@@ -357,10 +357,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=54251
http/tests/multipart/invalid-image-data-standalone.html
-# HTTP 204 (No Content) should be ignored
-# https://bugs.webkit.org/show_bug.cgi?id=60206
-http/tests/navigation/response204.html
-
# http/tests/multipart/stop-crash.html fails on GTK and Qt missing multipart/x-mixed-replace support in libsoup
# https://bugs.webkit.org/show_bug.cgi?id=47060
http/tests/multipart/stop-crash.html
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (126883 => 126884)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-08-28 15:46:51 UTC (rev 126884)
@@ -138,9 +138,10 @@
//////////////////////////////////////////////////////////////////////////////////////////
// WebKitTestRunner needs an implementation for testRunner.queueLoad
-BUGWKEFL : fast/dom/navigation-type-back-forward.html = TEXT
-BUGWKEFL : fast/dom/navigation-type-navigate.html = TEXT
-BUGWKEFL : fast/dom/navigation-type-reload.html = TEXT
+BUGWK42674 : fast/dom/navigation-type-back-forward.html = TEXT
+BUGWK42674 : fast/dom/navigation-type-navigate.html = TEXT
+BUGWK42674 : fast/dom/navigation-type-reload.html = TEXT
+BUGWK42674 : http/tests/navigation/response204.html = TEXT
// WebKitTestRunner needs an implementation for testRunner.titleTextDirection
BUGWK93470 : fast/dom/title-directionality-removeChild.html = TEXT
Modified: trunk/Source/WebKit/efl/ChangeLog (126883 => 126884)
--- trunk/Source/WebKit/efl/ChangeLog 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-08-28 15:46:51 UTC (rev 126884)
@@ -1,3 +1,16 @@
+2012-08-28 Christophe Dumez <[email protected]>
+
+ [EFL] WebKit EFL updates view on HTTP 204 response
+ https://bugs.webkit.org/show_bug.cgi?id=95199
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Ignore HTTP responses which have status code equal
+ to 204 (No Content).
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForResponse):
+
2012-08-28 Thiago Marcos P. Santos <[email protected]>
[EFL] Rename knob images to thumb on the default theme
Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (126883 => 126884)
--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2012-08-28 15:46:51 UTC (rev 126884)
@@ -45,6 +45,7 @@
#include "FrameTree.h"
#include "FrameView.h"
#include "HTMLFormElement.h"
+#include "HTTPStatusCodes.h"
#include "IntentRequest.h"
#include "MIMETypeRegistry.h"
#include "NotImplemented.h"
@@ -297,6 +298,12 @@
return;
}
+ // Ignore responses with an HTTP status code of 204 (No Content)
+ if (response.httpStatusCode() == HTTPNoContent) {
+ callPolicyFunction(function, PolicyIgnore);
+ return;
+ }
+
if (canShowMIMEType(response.mimeType()))
callPolicyFunction(function, PolicyUse);
else
Modified: trunk/Source/WebKit2/ChangeLog (126883 => 126884)
--- trunk/Source/WebKit2/ChangeLog 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-28 15:46:51 UTC (rev 126884)
@@ -1,3 +1,16 @@
+2012-08-28 Christophe Dumez <[email protected]>
+
+ [EFL] WebKit EFL updates view on HTTP 204 response
+ https://bugs.webkit.org/show_bug.cgi?id=95199
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Ignore HTTP responses which have status code equal
+ to 204 (No Content).
+
+ * UIProcess/API/efl/ewk_view_policy_client.cpp:
+ (decidePolicyForResponseCallback):
+
2012-08-28 Zeno Albisser <[email protected]>
LayerTreeCoordinatorProxy should use uint64_t for surface key.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_policy_client.cpp (126883 => 126884)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_policy_client.cpp 2012-08-28 15:46:22 UTC (rev 126883)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_policy_client.cpp 2012-08-28 15:46:51 UTC (rev 126884)
@@ -31,6 +31,7 @@
#include "ewk_navigation_policy_decision_private.h"
#include "ewk_view_policy_client_private.h"
#include "ewk_view_private.h"
+#include <WebCore/HTTPStatusCodes.h>
#include <wtf/text/CString.h>
using namespace WebCore;
@@ -58,6 +59,13 @@
static void decidePolicyForResponseCallback(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
const ResourceResponse resourceResponse = toImpl(response)->resourceResponse();
+
+ // Ignore responses with an HTTP status code of 204 (No Content)
+ if (resourceResponse.httpStatusCode() == HTTPNoContent) {
+ WKFramePolicyListenerIgnore(listener);
+ return;
+ }
+
// If the URL Response has "Content-Disposition: attachment;" header, then
// we should download it.
if (resourceResponse.isAttachment()) {
