Title: [152368] branches/safari-537-branch/Source/WebKit2
- Revision
- 152368
- Author
- [email protected]
- Date
- 2013-07-03 10:45:15 -0700 (Wed, 03 Jul 2013)
Log Message
Merged r152317. <rdar://problem/14309423>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152367 => 152368)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-03 17:35:13 UTC (rev 152367)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-03 17:45:15 UTC (rev 152368)
@@ -1,3 +1,20 @@
+2013-07-03 Lucas Forschler <[email protected]>
+
+ Merge r152317
+
+ 2013-07-02 Alexey Proskuryakov <[email protected]>
+
+ security/block-test.html fails when NetworkProcess is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=118320
+ <rdar://problem/14309423>
+
+ Reviewed by Geoff Garen.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::wasBlocked):
+ (WebKit::NetworkResourceLoader::cannotShowURL):
+ Implemented missing ResourceHandleClient functions.
+
2013-07-02 Lucas Forschler <[email protected]>
Merge r152328
Modified: branches/safari-537-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (152367 => 152368)
--- branches/safari-537-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-07-03 17:35:13 UTC (rev 152367)
+++ branches/safari-537-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-07-03 17:45:15 UTC (rev 152368)
@@ -40,6 +40,7 @@
#include "ShareableResource.h"
#include "SharedMemory.h"
#include "WebCoreArgumentCoders.h"
+#include "WebErrors.h"
#include "WebResourceLoaderMessages.h"
#include <WebCore/NotImplemented.h>
#include <WebCore/ResourceBuffer.h>
@@ -239,17 +240,18 @@
send(Messages::WebResourceLoader::DidSendData(bytesSent, totalBytesToBeSent));
}
-// FIXME (NetworkProcess): Many of the following ResourceHandleClient methods definitely need implementations. A few will not.
-// Once we know what they are they can be removed.
+void NetworkResourceLoader::wasBlocked(ResourceHandle* handle)
+{
+ ASSERT_UNUSED(handle, handle == m_handle);
-void NetworkResourceLoader::wasBlocked(ResourceHandle*)
-{
- notImplemented();
+ didFail(handle, WebKit::blockedError(request()));
}
-void NetworkResourceLoader::cannotShowURL(ResourceHandle*)
+void NetworkResourceLoader::cannotShowURL(ResourceHandle* handle)
{
- notImplemented();
+ ASSERT_UNUSED(handle, handle == m_handle);
+
+ didFail(handle, WebKit::cannotShowURLError(request()));
}
bool NetworkResourceLoader::shouldUseCredentialStorage(ResourceHandle* handle)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
