Diff
Modified: trunk/Source/WebCore/ChangeLog (218392 => 218393)
--- trunk/Source/WebCore/ChangeLog 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/ChangeLog 2017-06-16 16:12:38 UTC (rev 218393)
@@ -1,3 +1,41 @@
+2017-06-16 Daniel Bates <daba...@apple.com>
+
+ Use the term icon instead of favicon
+ https://bugs.webkit.org/show_bug.cgi?id=173400
+
+ Reviewed by Alex Christensen.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResourceContent):
+ (WebCore::InspectorPageAgent::cachedResourceType):
+ * loader/LinkLoader.cpp:
+ (WebCore::createLinkPreloadResourceClient):
+ * loader/ResourceLoadInfo.cpp:
+ (WebCore::toResourceType):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::logResourceLoaded):
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::CachedRawResource):
+ * loader/cache/CachedRawResource.h:
+ (isType):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::defaultPriorityForResourceType):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::isMainOrMediaOrIconOrRawResource):
+ (WebCore::CachedResource::ignoreForRequestCount):
+ (WebCore::CachedResource::isMainOrMediaOrFaviconOrRawResource): Deleted.
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::createResource):
+ (WebCore::CachedResourceLoader::requestIcon):
+ (WebCore::contentTypeFromResourceType):
+ (WebCore::CachedResourceLoader::checkInsecureContent):
+ (WebCore::CachedResourceLoader::allowedByContentSecurityPolicy):
+ (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+ (WebCore::CachedResourceLoader::requestFavicon): Deleted.
+ * loader/cache/CachedResourceLoader.h:
+ * loader/icon/IconLoader.cpp:
+ (WebCore::IconLoader::startLoading):
+
2017-06-16 Per Arne Vollan <pvol...@apple.com>
WebKit does not honor closed caption stroke width.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (218392 => 218393)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -140,7 +140,7 @@
*result = downcast<CachedScript>(*cachedResource).script().toString();
return true;
case CachedResource::MediaResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::RawResource: {
auto* buffer = cachedResource->resourceBuffer();
if (!buffer)
@@ -292,7 +292,7 @@
case CachedResource::MainResource:
return InspectorPageAgent::DocumentResource;
case CachedResource::MediaResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::RawResource: {
switch (cachedResource.resourceRequest().requester()) {
case ResourceRequest::Requester::Fetch:
Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/LinkLoader.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -153,7 +153,7 @@
case CachedResource::RawResource:
return LinkPreloadRawResourceClient::create(loader, static_cast<CachedRawResource&>(resource));
case CachedResource::MainResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
#if ENABLE(SVG_FONTS)
case CachedResource::SVGFontResource:
#endif
Modified: trunk/Source/WebCore/loader/ResourceLoadInfo.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -56,7 +56,7 @@
return ResourceType::Font;
case CachedResource::MediaResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::RawResource:
return ResourceType::Raw;
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -448,7 +448,7 @@
resourceType = DiagnosticLoggingKeys::fontKey();
break;
case CachedResource::MediaResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::RawResource:
resourceType = DiagnosticLoggingKeys::rawKey();
break;
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -41,7 +41,7 @@
, m_identifier(0)
, m_allowEncodedDataReplacement(true)
{
- ASSERT(isMainOrMediaOrFaviconOrRawResource());
+ ASSERT(isMainOrMediaOrIconOrRawResource());
}
std::optional<SharedBufferDataView> CachedRawResource::calculateIncrementalDataChunk(const SharedBuffer* data) const
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2017-06-16 16:12:38 UTC (rev 218393)
@@ -98,5 +98,5 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::CachedRawResource)
- static bool isType(const WebCore::CachedResource& resource) { return resource.isMainOrMediaOrFaviconOrRawResource(); }
+ static bool isType(const WebCore::CachedResource& resource) { return resource.isMainOrMediaOrIconOrRawResource(); }
SPECIALIZE_TYPE_TRAITS_END()
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -78,7 +78,7 @@
case CachedResource::MediaResource:
case CachedResource::FontResource:
case CachedResource::RawResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
return ResourceLoadPriority::Medium;
case CachedResource::ImageResource:
return ResourceLoadPriority::Low;
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2017-06-16 16:12:38 UTC (rev 218393)
@@ -71,7 +71,7 @@
#endif
MediaResource,
RawResource,
- Favicon,
+ Icon,
SVGDocumentResource
#if ENABLE(XSLT)
, XSLStyleSheet
@@ -162,7 +162,7 @@
bool isImage() const { return type() == ImageResource; }
// FIXME: CachedRawResource could be a main resource, an audio/video resource, or a raw XHR/icon resource.
- bool isMainOrMediaOrFaviconOrRawResource() const { return type() == MainResource || type() == MediaResource || type() == Favicon || type() == RawResource; }
+ bool isMainOrMediaOrIconOrRawResource() const { return type() == MainResource || type() == MediaResource || type() == Icon || type() == RawResource; }
bool ignoreForRequestCount() const
{
return m_resourceRequest.ignoreForRequestCount()
@@ -171,7 +171,7 @@
|| type() == LinkPrefetch
|| type() == LinkSubresource
#endif
- || type() == Favicon
+ || type() == Icon
|| type() == RawResource;
}
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -105,7 +105,7 @@
return new CachedFont(WTFMove(request), sessionID);
case CachedResource::MediaResource:
case CachedResource::RawResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::MainResource:
return new CachedRawResource(WTFMove(request), type, sessionID);
#if ENABLE(XSLT)
@@ -277,9 +277,9 @@
return downcast<CachedRawResource>(requestResource(CachedResource::MediaResource, WTFMove(request)).get());
}
-CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestFavicon(CachedResourceRequest&& request)
+CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestIcon(CachedResourceRequest&& request)
{
- return downcast<CachedRawResource>(requestResource(CachedResource::Favicon, WTFMove(request)).get());
+ return downcast<CachedRawResource>(requestResource(CachedResource::Icon, WTFMove(request)).get());
}
CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestRawResource(CachedResourceRequest&& request)
@@ -313,7 +313,7 @@
#endif
case CachedResource::RawResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::SVGDocumentResource:
return MixedContentChecker::ContentType::Active;
#if ENABLE(XSLT)
@@ -364,7 +364,7 @@
#endif
case CachedResource::MediaResource:
case CachedResource::RawResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::ImageResource:
#if ENABLE(SVG_FONTS)
case CachedResource::SVGFontResource:
@@ -412,7 +412,7 @@
return false;
break;
case CachedResource::SVGDocumentResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::ImageResource:
if (!m_document->contentSecurityPolicy()->allowImageFromSource(url, redirectResponseReceived))
return false;
@@ -953,7 +953,7 @@
// FIXME: We should use the same cache policy for all resource types. The raw resource policy is overly strict
// while the normal subresource policy is too loose.
- if (existingResource->isMainOrMediaOrFaviconOrRawResource() && frame()) {
+ if (existingResource->isMainOrMediaOrIconOrRawResource() && frame()) {
bool strictPolicyDisabled = frame()->loader().isStrictRawResourceValidationPolicyDisabledForTesting();
bool canReuseRawResource = strictPolicyDisabled || downcast<CachedRawResource>(*existingResource).canReuse(request);
if (!canReuseRawResource)
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (218392 => 218393)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2017-06-16 16:12:38 UTC (rev 218393)
@@ -79,7 +79,7 @@
CachedResourceHandle<CachedScript> requestScript(CachedResourceRequest&&);
CachedResourceHandle<CachedFont> requestFont(CachedResourceRequest&&, bool isSVG);
CachedResourceHandle<CachedRawResource> requestMedia(CachedResourceRequest&&);
- CachedResourceHandle<CachedRawResource> requestFavicon(CachedResourceRequest&&);
+ CachedResourceHandle<CachedRawResource> requestIcon(CachedResourceRequest&&);
CachedResourceHandle<CachedRawResource> requestRawResource(CachedResourceRequest&&);
CachedResourceHandle<CachedRawResource> requestMainResource(CachedResourceRequest&&);
CachedResourceHandle<CachedSVGDocument> requestSVGDocument(CachedResourceRequest&&);
Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (218392 => 218393)
--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -88,7 +88,7 @@
request.setInitiator(cachedResourceRequestInitiators().icon);
auto* frame = m_frame ? m_frame : m_documentLoader->frame();
- m_resource = frame->document()->cachedResourceLoader().requestFavicon(WTFMove(request));
+ m_resource = frame->document()->cachedResourceLoader().requestIcon(WTFMove(request));
if (m_resource)
m_resource->addClient(*this);
else
Modified: trunk/Source/WebKit2/ChangeLog (218392 => 218393)
--- trunk/Source/WebKit2/ChangeLog 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-16 16:12:38 UTC (rev 218393)
@@ -1,3 +1,13 @@
+2017-06-16 Daniel Bates <daba...@apple.com>
+
+ Use the term icon instead of favicon
+ https://bugs.webkit.org/show_bug.cgi?id=173400
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::maximumBufferingTime):
+
2017-06-16 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Remove WKCookieManagerSoup
Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (218392 => 218393)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-06-16 16:08:30 UTC (rev 218392)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-06-16 16:12:38 UTC (rev 218393)
@@ -117,7 +117,7 @@
case CachedResource::MediaResource:
return 50_ms;
case CachedResource::MainResource:
- case CachedResource::Favicon:
+ case CachedResource::Icon:
case CachedResource::RawResource:
case CachedResource::SVGDocumentResource:
#if ENABLE(LINK_PREFETCH)
