Changeset 89658 in webkit

Timestamp:

Jun 24, 2011, 1:25:50 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-24 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Darin Fisher.

Web Inspector: [Chromium] Successfully prefetched page shows up as an error in console
​https://bugs.webkit.org/show_bug.cgi?id=62396

• public/WebURLError.h: (WebKit::WebURLError::WebURLError):
• src/WebURLError.cpp: (WebKit::WebURLError::operator=): (WebKit::WebURLError::operator ResourceError):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebURLError.h (modified) (1 diff)
• src/WebURLError.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-24  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Web Inspector: [Chromium] Successfully prefetched page shows up as an error in console
+        https://bugs.webkit.org/show_bug.cgi?id=62396
+
+        * public/WebURLError.h:
+        (WebKit::WebURLError::WebURLError):
+        * src/WebURLError.cpp:
+        (WebKit::WebURLError::operator=):
+        (WebKit::WebURLError::operator ResourceError):
+
 2011-06-23  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -53 +53 @@
     int reason;
 
+    // A flag showing whether this error should be treated as a cancellation,
+    // e.g. we do not show console errors for cancellations.
+    bool isCancellation;
+
     // The url that failed to load.
     WebURL unreachableURL;
 
-    WebURLError() : reason(0) { }
+    WebURLError() : reason(0), isCancellation(false) { }
 
 #if defined(WEBKIT_IMPLEMENTATION)

trunk/Source/WebKit/chromium/src/WebURLError.cpp

@@ -53 +53 @@
         reason = error.errorCode();
         unreachableURL = KURL(ParsedURLString, error.failingURL());
+        isCancellation = error.isCancellation();
     }
     return *this;
@@ -62 +63 @@
         return ResourceError();
     CString spec = unreachableURL.spec();
-    return ResourceError(domain, reason,
-                         String::fromUTF8(spec.data(), spec.length()),
-                         String());
+    ResourceError resourceError = ResourceError(domain, reason,
+                                                String::fromUTF8(spec.data(),
+                                                spec.length()), String());
+    resourceError.setIsCancellation(isCancellation);
+    return resourceError;
 }