Title: [115206] trunk/Source
- Revision
- 115206
- Author
- gav...@chromium.org
- Date
- 2012-04-25 07:42:24 -0700 (Wed, 25 Apr 2012)
Log Message
[Chromium] Fix some conditional compilation logic in Platform
https://bugs.webkit.org/show_bug.cgi?id=83798
Reviewed by Darin Fisher.
Source/Platform:
* chromium/public/WebURLError.h:
(WebURLError):
* chromium/public/WebURLRequest.h:
(WebURLRequest):
* chromium/public/WebURLResponse.h:
(WebURLResponse):
Source/WebKit/chromium:
* tests/WebFrameTest.cpp:
(WebKit::TestReloadDoesntRedirectWebFrameClient::cancelledError):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (115205 => 115206)
--- trunk/Source/Platform/ChangeLog 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/Platform/ChangeLog 2012-04-25 14:42:24 UTC (rev 115206)
@@ -1,5 +1,19 @@
2012-04-25 Gavin Peters <gav...@chromium.org>
+ [Chromium] Fix some conditional compilation logic in Platform
+ https://bugs.webkit.org/show_bug.cgi?id=83798
+
+ Reviewed by Darin Fisher.
+
+ * chromium/public/WebURLError.h:
+ (WebURLError):
+ * chromium/public/WebURLRequest.h:
+ (WebURLRequest):
+ * chromium/public/WebURLResponse.h:
+ (WebURLResponse):
+
+2012-04-25 Gavin Peters <gav...@chromium.org>
+
Move WebReferrerPolicy.h from WebKit to Platform
https://bugs.webkit.org/show_bug.cgi?id=84539
Modified: trunk/Source/Platform/chromium/public/WebURLError.h (115205 => 115206)
--- trunk/Source/Platform/chromium/public/WebURLError.h 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/Platform/chromium/public/WebURLError.h 2012-04-25 14:42:24 UTC (rev 115206)
@@ -34,7 +34,7 @@
#include "WebString.h"
#include "WebURL.h"
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
namespace WebCore { class ResourceError; }
#endif
@@ -64,7 +64,7 @@
WebURLError() : reason(0), isCancellation(false) { }
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
WebURLError(const WebCore::ResourceError&);
WebURLError& operator=(const WebCore::ResourceError&);
operator WebCore::ResourceError() const;
Modified: trunk/Source/Platform/chromium/public/WebURLRequest.h (115205 => 115206)
--- trunk/Source/Platform/chromium/public/WebURLRequest.h 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/Platform/chromium/public/WebURLRequest.h 2012-04-25 14:42:24 UTC (rev 115206)
@@ -34,7 +34,7 @@
#include "WebCommon.h"
#include "WebHTTPBody.h"
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
namespace WebCore { class ResourceRequest; }
#endif
@@ -182,7 +182,7 @@
WEBKIT_EXPORT ExtraData* extraData() const;
WEBKIT_EXPORT void setExtraData(ExtraData*);
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
WebCore::ResourceRequest& toMutableResourceRequest();
const WebCore::ResourceRequest& toResourceRequest() const;
#endif
Modified: trunk/Source/Platform/chromium/public/WebURLResponse.h (115205 => 115206)
--- trunk/Source/Platform/chromium/public/WebURLResponse.h 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/Platform/chromium/public/WebURLResponse.h 2012-04-25 14:42:24 UTC (rev 115206)
@@ -34,7 +34,7 @@
#include "WebCommon.h"
#include "WebPrivateOwnPtr.h"
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
namespace WebCore { class ResourceResponse; }
#endif
@@ -133,7 +133,7 @@
WEBKIT_EXPORT WebCString securityInfo() const;
WEBKIT_EXPORT void setSecurityInfo(const WebCString&);
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
WebCore::ResourceResponse& toMutableResourceResponse();
const WebCore::ResourceResponse& toResourceResponse() const;
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (115205 => 115206)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-25 14:42:24 UTC (rev 115206)
@@ -1,3 +1,13 @@
+2012-04-25 Gavin Peters <gav...@chromium.org>
+
+ [Chromium] Fix some conditional compilation logic in Platform
+ https://bugs.webkit.org/show_bug.cgi?id=83798
+
+ Reviewed by Darin Fisher.
+
+ * tests/WebFrameTest.cpp:
+ (WebKit::TestReloadDoesntRedirectWebFrameClient::cancelledError):
+
2012-04-25 Yury Semikhatsky <yu...@chromium.org>
Web Inspector: move HeapSnapshotLoader into a separate file
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (115205 => 115206)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-04-25 14:39:36 UTC (rev 115205)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-04-25 14:42:24 UTC (rev 115206)
@@ -273,7 +273,12 @@
{
// Return a dummy error so the DocumentLoader doesn't assert when
// the reload cancels it.
- return WebURLError(WebCore::ResourceError("", 1, "", "cancelled"));
+ WebURLError webURLError;
+ webURLError.domain = "";
+ webURLError.reason = 1;
+ webURLError.isCancellation = true;
+ webURLError.unreachableURL = WebURL();
+ return webURLError;
}
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
