Changeset 115206 in webkit

Timestamp:

Apr 25, 2012, 7:42:24 AM (13 years ago)

Author:

gavinp@chromium.org

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):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebURLError.h (modified) (2 diffs)
• Platform/chromium/public/WebURLRequest.h (modified) (2 diffs)
• Platform/chromium/public/WebURLResponse.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/WebFrameTest.cpp (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-04-25  Gavin Peters  <gavinp@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  <gavinp@chromium.org>
 

trunk/Source/Platform/chromium/public/WebURLError.h

@@ -35 +35 @@
 #include "WebURL.h"
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
 namespace WebCore { class ResourceError; }
 #endif
@@ -65 +65 @@
     WebURLError() : reason(0), isCancellation(false) { }
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
     WebURLError(const WebCore::ResourceError&);
     WebURLError& operator=(const WebCore::ResourceError&);

trunk/Source/Platform/chromium/public/WebURLRequest.h

@@ -35 +35 @@
 #include "WebHTTPBody.h"
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
 namespace WebCore { class ResourceRequest; }
 #endif
@@ -183 +183 @@
     WEBKIT_EXPORT void setExtraData(ExtraData*);
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
     WebCore::ResourceRequest& toMutableResourceRequest();
     const WebCore::ResourceRequest& toResourceRequest() const;

trunk/Source/Platform/chromium/public/WebURLResponse.h

@@ -35 +35 @@
 #include "WebPrivateOwnPtr.h"
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
 namespace WebCore { class ResourceResponse; }
 #endif
@@ -134 +134 @@
     WEBKIT_EXPORT void setSecurityInfo(const WebCString&);
 
-#if defined(WEBKIT_IMPLEMENTATION)
+#if WEBKIT_IMPLEMENTATION
     WebCore::ResourceResponse& toMutableResourceResponse();
     const WebCore::ResourceResponse& toResourceResponse() const;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-25  Gavin Peters  <gavinp@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  <yurys@chromium.org>
 

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -274 +274 @@
         // 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;
     }
 };