Title: [89658] trunk/Source/WebKit/chromium
- Revision
- 89658
- Author
- [email protected]
- Date
- 2011-06-24 01:25:50 -0700 (Fri, 24 Jun 2011)
Log Message
2011-06-24 Vsevolod Vlasov <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89657 => 89658)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-24 08:24:16 UTC (rev 89657)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-24 08:25:50 UTC (rev 89658)
@@ -1,3 +1,16 @@
+2011-06-24 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Pavel Feldman.
Modified: trunk/Source/WebKit/chromium/public/WebURLError.h (89657 => 89658)
--- trunk/Source/WebKit/chromium/public/WebURLError.h 2011-06-24 08:24:16 UTC (rev 89657)
+++ trunk/Source/WebKit/chromium/public/WebURLError.h 2011-06-24 08:25:50 UTC (rev 89658)
@@ -52,10 +52,14 @@
// embedder (see for example WebFrameClient).
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)
WebURLError(const WebCore::ResourceError&);
Modified: trunk/Source/WebKit/chromium/src/WebURLError.cpp (89657 => 89658)
--- trunk/Source/WebKit/chromium/src/WebURLError.cpp 2011-06-24 08:24:16 UTC (rev 89657)
+++ trunk/Source/WebKit/chromium/src/WebURLError.cpp 2011-06-24 08:25:50 UTC (rev 89658)
@@ -52,6 +52,7 @@
domain = error.domain();
reason = error.errorCode();
unreachableURL = KURL(ParsedURLString, error.failingURL());
+ isCancellation = error.isCancellation();
}
return *this;
}
@@ -61,9 +62,11 @@
if (!reason)
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;
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
