Diff
Modified: trunk/Source/WebCore/ChangeLog (109669 => 109670)
--- trunk/Source/WebCore/ChangeLog 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/ChangeLog 2012-03-04 03:26:27 UTC (rev 109670)
@@ -1,3 +1,54 @@
+2012-03-03 Benjamin Poulain <[email protected]>
+
+ Remove the redundant method KURL::protocolInHTTPFamily()
+ https://bugs.webkit.org/show_bug.cgi?id=80216
+
+ Reviewed by Anders Carlsson.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::open):
+ (WebCore::FrameLoader::addExtraFieldsToRequest):
+ * loader/ResourceLoadScheduler.cpp:
+ (WebCore::ResourceLoadScheduler::hostForURL):
+ (WebCore::ResourceLoadScheduler::scheduleLoad):
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::requestIsHTTPOrHTTPSGet):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::freshnessLifetime):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::removeFragmentIdentifierIfNeeded):
+ * loader/icon/IconController.cpp:
+ (WebCore::IconController::defaultURL):
+ * platform/KURL.h:
+ (KURL):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ * platform/network/CredentialStorage.cpp:
+ (WebCore::CredentialStorage::set):
+ (WebCore::findDefaultProtectionSpaceForURL):
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::setCachePolicy):
+ (WebCore::ResourceRequestBase::setTimeoutInterval):
+ (WebCore::ResourceRequestBase::setHTTPMethod):
+ (WebCore::ResourceRequestBase::setHTTPHeaderField):
+ (WebCore::ResourceRequestBase::clearHTTPAuthorization):
+ (WebCore::ResourceRequestBase::clearHTTPReferrer):
+ (WebCore::ResourceRequestBase::clearHTTPOrigin):
+ (WebCore::ResourceRequestBase::setResponseContentDispositionEncodingFallbackArray):
+ (WebCore::ResourceRequestBase::setHTTPBody):
+ (WebCore::ResourceRequestBase::setAllowCookies):
+ (WebCore::ResourceRequestBase::setPriority):
+ (WebCore::ResourceRequestBase::addHTTPHeaderField):
+ * platform/network/blackberry/NetworkManager.cpp:
+ (WebCore::NetworkManager::startJob):
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::createNSURLConnection):
+ * platform/network/qt/QNetworkReplyHandler.cpp:
+ (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send):
+
2012-03-03 Robin Cao <[email protected]>
[BlackBerry] Upstream LayerWebKitThread and its derived classes
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -2026,7 +2026,7 @@
KURL url = ""
// FIXME: I suspect this block of code doesn't do anything.
- if (url.protocolInHTTPFamily() && !url.host().isEmpty() && url.path().isEmpty())
+ if (url.protocolIsInHTTPFamily() && !url.host().isEmpty() && url.path().isEmpty())
url.setPath("/");
m_hasReceivedFirstData = false;
@@ -2555,7 +2555,7 @@
}
// The remaining modifications are only necessary for HTTP and HTTPS.
- if (!request.url().isEmpty() && !request.url().protocolInHTTPFamily())
+ if (!request.url().isEmpty() && !request.url().protocolIsInHTTPFamily())
return;
applyUserAgent(request);
Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -54,7 +54,7 @@
ResourceLoadScheduler::HostInformation* ResourceLoadScheduler::hostForURL(const KURL& url, CreateHostPolicy createHostPolicy)
{
- if (!url.protocolInHTTPFamily())
+ if (!url.protocolIsInHTTPFamily())
return m_nonHTTPProtocolHost;
m_hosts.checkConsistency();
@@ -126,7 +126,7 @@
bool hadRequests = host->hasRequests();
host->schedule(resourceLoader, priority);
- if (priority > ResourceLoadPriorityLow || !resourceLoader->url().protocolInHTTPFamily() || (priority == ResourceLoadPriorityLow && !hadRequests)) {
+ if (priority > ResourceLoadPriorityLow || !resourceLoader->url().protocolIsInHTTPFamily() || (priority == ResourceLoadPriorityLow && !hadRequests)) {
// Try to request important resources immediately.
servePendingRequests(host, priority);
return;
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -117,7 +117,7 @@
bool ApplicationCache::requestIsHTTPOrHTTPSGet(const ResourceRequest& request)
{
- if (!request.url().protocolInHTTPFamily())
+ if (!request.url().protocolIsInHTTPFamily())
return false;
if (!equalIgnoringCase(request.httpMethod(), "GET"))
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -299,7 +299,7 @@
double CachedResource::freshnessLifetime() const
{
// Cache non-http resources liberally
- if (!m_response.url().protocolInHTTPFamily())
+ if (!m_response.url().protocolIsInHTTPFamily())
return std::numeric_limits<double>::max();
// RFC2616 13.2.4
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -77,7 +77,7 @@
// Strip away fragment identifier from HTTP URLs.
// Data URLs must be unmodified. For file and custom URLs clients may expect resources
// to be unique even when they differ by the fragment identifier only.
- if (!originalURL.protocolInHTTPFamily())
+ if (!originalURL.protocolIsInHTTPFamily())
return originalURL;
KURL url = ""
url.removeFragmentIdentifier();
Modified: trunk/Source/WebCore/loader/icon/IconController.cpp (109669 => 109670)
--- trunk/Source/WebCore/loader/icon/IconController.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/loader/icon/IconController.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -257,7 +257,7 @@
{
// Don't return a favicon iconURL unless we're http or https
KURL documentURL = m_frame->document()->url();
- if (!documentURL.protocolInHTTPFamily())
+ if (!documentURL.protocolIsInHTTPFamily())
return IconURL();
KURL url;
Modified: trunk/Source/WebCore/platform/KURL.h (109669 => 109670)
--- trunk/Source/WebCore/platform/KURL.h 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/KURL.h 2012-03-04 03:26:27 UTC (rev 109670)
@@ -228,9 +228,6 @@
void print() const;
#endif
- // FIXME: Remove this after changing all callers to use protocolIsInHTTPFamily.
- bool protocolInHTTPFamily() const { return protocolIsInHTTPFamily(); }
-
private:
void invalidate();
bool isHierarchical() const;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -580,7 +580,7 @@
KURL url(KURL(), uri);
- if (!url.isValid() || !url.protocolInHTTPFamily()) {
+ if (!url.isValid() || !url.protocolIsInHTTPFamily()) {
g_set_error(error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Invalid URI '%s'", uri);
return FALSE;
}
@@ -624,7 +624,7 @@
KURL url(KURL(), uri);
- if (!url.isValid() || !url.protocolInHTTPFamily()) {
+ if (!url.isValid() || !url.protocolIsInHTTPFamily()) {
GST_ERROR_OBJECT(src, "Invalid URI '%s'", uri);
return FALSE;
}
Modified: trunk/Source/WebCore/platform/network/CredentialStorage.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/network/CredentialStorage.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/CredentialStorage.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -85,7 +85,7 @@
void CredentialStorage::set(const Credential& credential, const ProtectionSpace& protectionSpace, const KURL& url)
{
- ASSERT(protectionSpace.isProxy() || url.protocolInHTTPFamily());
+ ASSERT(protectionSpace.isProxy() || url.protocolIsInHTTPFamily());
ASSERT(protectionSpace.isProxy() || url.isValid());
protectionSpaceToCredentialMap().set(protectionSpace, credential);
@@ -112,7 +112,7 @@
static PathToDefaultProtectionSpaceMap::iterator findDefaultProtectionSpaceForURL(const KURL& url)
{
- ASSERT(url.protocolInHTTPFamily());
+ ASSERT(url.protocolIsInHTTPFamily());
ASSERT(url.isValid());
PathToDefaultProtectionSpaceMap& map = pathToDefaultProtectionSpaceMap();
@@ -141,7 +141,7 @@
bool CredentialStorage::set(const Credential& credential, const KURL& url)
{
- ASSERT(url.protocolInHTTPFamily());
+ ASSERT(url.protocolIsInHTTPFamily());
ASSERT(url.isValid());
PathToDefaultProtectionSpaceMap::iterator iter = findDefaultProtectionSpaceForURL(url);
if (iter == pathToDefaultProtectionSpaceMap().end())
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -151,7 +151,7 @@
m_cachePolicy = cachePolicy;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -168,7 +168,7 @@
m_timeoutInterval = timeoutInterval;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -201,7 +201,7 @@
m_httpMethod = httpMethod;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -232,7 +232,7 @@
m_httpHeaderFields.set(name, value);
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -247,7 +247,7 @@
m_httpHeaderFields.remove("Authorization");
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -257,7 +257,7 @@
m_httpHeaderFields.remove("Referer");
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -267,7 +267,7 @@
m_httpHeaderFields.remove("Origin");
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -283,7 +283,7 @@
if (!encoding3.isNull())
m_responseContentDispositionEncodingFallbackArray.append(encoding3);
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -300,7 +300,7 @@
m_httpBody = httpBody;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -317,7 +317,7 @@
m_allowCookies = allowCookies;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -334,7 +334,7 @@
m_priority = priority;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
@@ -345,7 +345,7 @@
if (!result.second)
result.first->second += "," + value;
- if (url().protocolInHTTPFamily())
+ if (url().protocolIsInHTTPFamily())
m_platformRequestUpdated = false;
}
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -109,7 +109,7 @@
if (authType != BlackBerry::Platform::NetworkRequest::AuthNone)
platformRequest.setCredentials(username.utf8().data(), password.utf8().data(), authType);
- } else if (url.protocolInHTTPFamily()) {
+ } else if (url.protocolIsInHTTPFamily()) {
// For URLs that match the paths of those previously challenged for HTTP Basic authentication,
// try and reuse the credential preemptively, as allowed by RFC 2617.
Credential credential = CredentialStorage::get(url);
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -460,7 +460,7 @@
void ResourceHandle::createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff)
{
- if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolInHTTPFamily()) {
+ if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolIsInHTTPFamily()) {
// Credentials for ftp can only be passed in URL, the didReceiveAuthenticationChallenge delegate call won't be made.
KURL urlWithCredentials(firstRequest().url());
urlWithCredentials.setUser(d->m_user);
@@ -470,7 +470,7 @@
// <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication,
// try and reuse the credential preemptively, as allowed by RFC 2617.
- if (shouldUseCredentialStorage && firstRequest().url().protocolInHTTPFamily()) {
+ if (shouldUseCredentialStorage && firstRequest().url().protocolIsInHTTPFamily()) {
if (d->m_user.isEmpty() && d->m_pass.isEmpty()) {
// <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication,
// try and reuse the credential preemptively, as allowed by RFC 2617.
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (109669 => 109670)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2012-03-04 03:26:27 UTC (rev 109670)
@@ -185,7 +185,7 @@
void ResourceHandle::createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff)
{
// Credentials for ftp can only be passed in URL, the connection:didReceiveAuthenticationChallenge: delegate call won't be made.
- if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolInHTTPFamily()) {
+ if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolIsInHTTPFamily()) {
KURL urlWithCredentials(firstRequest().url());
urlWithCredentials.setUser(d->m_user);
urlWithCredentials.setPass(d->m_pass);
@@ -195,7 +195,7 @@
if (shouldRelaxThirdPartyCookiePolicy(firstRequest().url()))
firstRequest().setFirstPartyForCookies(firstRequest().url());
- if (shouldUseCredentialStorage && firstRequest().url().protocolInHTTPFamily()) {
+ if (shouldUseCredentialStorage && firstRequest().url().protocolIsInHTTPFamily()) {
if (d->m_user.isEmpty() && d->m_pass.isEmpty()) {
// <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication,
// try and reuse the credential preemptively, as allowed by RFC 2617.
Modified: trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (109669 => 109670)
--- trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -486,7 +486,7 @@
// The status code is equal to 0 for protocols not in the HTTP family.
int statusCode = m_replyWrapper->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
- if (url.protocolInHTTPFamily()) {
+ if (url.protocolIsInHTTPFamily()) {
String suggestedFilename = filenameFromHTTPContentDisposition(QString::fromLatin1(m_replyWrapper->reply()->rawHeader("Content-Disposition")));
if (!suggestedFilename.isEmpty())
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (109669 => 109670)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -553,7 +553,7 @@
if (!initSend(ec))
return;
- if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
+ if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
String contentType = getRequestHeader("Content-Type");
if (contentType.isEmpty()) {
#if ENABLE(DASHBOARD_SUPPORT)
@@ -584,7 +584,7 @@
if (!initSend(ec))
return;
- if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
+ if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
String contentType = getRequestHeader("Content-Type");
if (contentType.isEmpty()) {
#if ENABLE(DASHBOARD_SUPPORT)
@@ -611,7 +611,7 @@
if (!initSend(ec))
return;
- if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
+ if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
// FIXME: Should we set a Content-Type if one is not set.
// FIXME: add support for uploading bundles.
m_requestEntityBody = FormData::create();
@@ -631,7 +631,7 @@
if (!initSend(ec))
return;
- if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
+ if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
m_requestEntityBody = FormData::createMultiPart(*(static_cast<FormDataList*>(body)), body->encoding(), document());
// We need to ask the client to provide the generated file names if needed. When FormData fills the element
@@ -654,7 +654,7 @@
if (!initSend(ec))
return;
- if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
+ if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
m_requestEntityBody = FormData::create(body->data(), body->byteLength());
if (m_upload)
m_requestEntityBody->setAlwaysStream(true);
Modified: trunk/Source/WebKit/chromium/ChangeLog (109669 => 109670)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-04 03:26:27 UTC (rev 109670)
@@ -1,3 +1,15 @@
+2012-03-03 Benjamin Poulain <[email protected]>
+
+ Remove the redundant method KURL::protocolInHTTPFamily()
+ https://bugs.webkit.org/show_bug.cgi?id=80216
+
+ Reviewed by Anders Carlsson.
+
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::dispatchWillPerformClientRedirect):
+ * src/WebPageSerializer.cpp:
+ (WebCore::retrieveResourcesForElement):
+
2012-03-03 Hans Wennborg <[email protected]>
Implement Speech _javascript_ API
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (109669 => 109670)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -612,7 +612,7 @@
// carry out such a navigation anyway, the best thing we can do for now to
// not get confused is ignore this notification.
if (m_expectedClientRedirectDest.isLocalFile()
- && m_expectedClientRedirectSrc.protocolInHTTPFamily()) {
+ && m_expectedClientRedirectSrc.protocolIsInHTTPFamily()) {
m_expectedClientRedirectSrc = KURL();
m_expectedClientRedirectDest = KURL();
return;
Modified: trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp (109669 => 109670)
--- trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -127,7 +127,7 @@
// Ignore URLs that have a non-standard protocols. Since the FTP protocol
// does no have a cache mechanism, we skip it as well.
- if (!url.protocolInHTTPFamily() && !url.isLocalFile())
+ if (!url.protocolIsInHTTPFamily() && !url.isLocalFile())
return;
if (!resourceURLs->contains(url))
Modified: trunk/Source/WebKit/mac/ChangeLog (109669 => 109670)
--- trunk/Source/WebKit/mac/ChangeLog 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-03-04 03:26:27 UTC (rev 109670)
@@ -1,3 +1,13 @@
+2012-03-03 Benjamin Poulain <[email protected]>
+
+ Remove the redundant method KURL::protocolInHTTPFamily()
+ https://bugs.webkit.org/show_bug.cgi?id=80216
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createPlugin):
+
2012-03-03 Hans Wennborg <[email protected]>
Implement Speech _javascript_ API
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (109669 => 109670)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-03-04 03:26:27 UTC (rev 109670)
@@ -1714,7 +1714,7 @@
WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
if (implementations->plugInFailedWithErrorFunc) {
KURL pluginPageURL = document->completeURL(stripLeadingAndTrailingHTMLSpaces(parameterValue(paramNames, paramValues, "pluginspage")));
- if (!pluginPageURL.protocolInHTTPFamily())
+ if (!pluginPageURL.protocolIsInHTTPFamily())
pluginPageURL = KURL();
NSString *pluginName = pluginPackage ? (NSString *)[pluginPackage pluginInfo].name : nil;
Modified: trunk/Source/WebKit/win/ChangeLog (109669 => 109670)
--- trunk/Source/WebKit/win/ChangeLog 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/win/ChangeLog 2012-03-04 03:26:27 UTC (rev 109670)
@@ -1,3 +1,15 @@
+2012-03-03 Benjamin Poulain <[email protected]>
+
+ Remove the redundant method KURL::protocolInHTTPFamily()
+ https://bugs.webkit.org/show_bug.cgi?id=80216
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidFailToStartPlugin):
+ * WebHistory.cpp:
+ (WebHistory::visitedURL):
+
2012-02-26 Hajime Morrita <[email protected]>
Move ChromeClient::showContextMenu() to ContextMenuClient
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (109669 => 109670)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -826,7 +826,7 @@
if (!pluginView->pluginsPage().isNull()) {
KURL pluginPageURL = frame->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(pluginView->pluginsPage()));
- if (pluginPageURL.protocolInHTTPFamily()) {
+ if (pluginPageURL.protocolIsInHTTPFamily()) {
static CFStringRef key = MarshallingHelpers::LPCOLESTRToCFStringRef(WebKitErrorPlugInPageURLStringKey);
RetainPtr<CFStringRef> str(AdoptCF, pluginPageURL.string().createCFString());
CFDictionarySetValue(userInfo.get(), key, str.get());
Modified: trunk/Source/WebKit/win/WebHistory.cpp (109669 => 109670)
--- trunk/Source/WebKit/win/WebHistory.cpp 2012-03-04 03:08:45 UTC (rev 109669)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2012-03-04 03:26:27 UTC (rev 109670)
@@ -735,7 +735,7 @@
entryPrivate->setLastVisitWasFailure(wasFailure);
if (!httpMethod.isEmpty())
- entryPrivate->setLastVisitWasHTTPNonGet(!equalIgnoringCase(httpMethod, "GET") && url.protocolInHTTPFamily());
+ entryPrivate->setLastVisitWasHTTPNonGet(!equalIgnoringCase(httpMethod, "GET") && url.protocolIsInHTTPFamily());
COMPtr<WebHistoryItem> item(Query, entry);
item->historyItem()->setRedirectURLs(nullptr);
