Diff
Modified: trunk/Source/WebCore/ChangeLog (207052 => 207053)
--- trunk/Source/WebCore/ChangeLog 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/ChangeLog 2016-10-11 06:42:53 UTC (rev 207053)
@@ -1,3 +1,26 @@
+2016-10-10 Youenn Fablet <[email protected]>
+
+ CachedResourceRequest constructor should be made more efficient
+ https://bugs.webkit.org/show_bug.cgi?id=163210
+
+ Reviewed by Alex Christensen.
+
+ No change of behavior.
+
+ Refactoring to use one CachedResourceRequest constructor that will move its request and charset to improve efficiency.
+
+ * css/StyleRuleImport.cpp:
+ (WebCore::StyleRuleImport::requestStyleSheet):
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::checkStyleSheet):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::process):
+ * html/parser/HTMLResourcePreloader.cpp:
+ (WebCore::PreloadRequest::resourceRequest):
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::CachedResourceRequest):
+ * loader/cache/CachedResourceRequest.h:
+
2016-10-10 Adam Bergkvist <[email protected]> and Alejandro G. Castro <[email protected]>
WebRTC: Make MediaEndpointPeerConnection handle remotely assigned mids correctly
Modified: trunk/Source/WebCore/css/StyleRuleImport.cpp (207052 => 207053)
--- trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-10-11 06:42:53 UTC (rev 207053)
@@ -115,7 +115,7 @@
// FIXME: Skip Content Security Policy check when stylesheet is in a user agent shadow tree.
// See <https://bugs.webkit.org/show_bug.cgi?id=146663>.
- CachedResourceRequest request(ResourceRequest(absURL), m_parentStyleSheet->charset());
+ CachedResourceRequest request(absURL, CachedResourceLoader::defaultCachedResourceOptions(), Nullopt, String(m_parentStyleSheet->charset()));
request.setInitiator(cachedResourceRequestInitiators().css);
if (m_cachedSheet)
m_cachedSheet->removeClient(m_styleSheetClient);
Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (207052 => 207053)
--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-10-11 06:42:53 UTC (rev 207053)
@@ -145,11 +145,8 @@
} else
#endif
{
- CachedResourceRequest request(ResourceRequest(document().completeURL(href)));
String charset = attrs.get("charset");
- if (charset.isEmpty())
- charset = document().charset();
- request.setCharset(charset);
+ CachedResourceRequest request(document().completeURL(href), CachedResourceLoader::defaultCachedResourceOptions(), Nullopt, charset.isEmpty() ? document().charset() : WTFMove(charset));
m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
}
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (207052 => 207053)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-10-11 06:42:53 UTC (rev 207053)
@@ -228,7 +228,7 @@
|| (document().settings() && document().settings()->treatsAnyTextCSSLinkAsStylesheet() && m_type.containsIgnoringASCIICase("text/css"));
if (m_disabledState != Disabled && treatAsStyleSheet && document().frame() && url.isValid()) {
- AtomicString charset = attributeWithoutSynchronization(charsetAttr);
+ String charset = attributeWithoutSynchronization(charsetAttr);
if (charset.isEmpty() && document().frame())
charset = document().charset();
@@ -261,7 +261,7 @@
Optional<ResourceLoadPriority> priority;
if (!isActive)
priority = ResourceLoadPriority::VeryLow;
- CachedResourceRequest request(url, charset, priority);
+ CachedResourceRequest request(url, CachedResourceLoader::defaultCachedResourceOptions(), priority, WTFMove(charset));
request.setInitiator(this);
if (document().contentSecurityPolicy()->allowStyleWithNonce(attributeWithoutSynchronization(HTMLNames::nonceAttr))) {
Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (207052 => 207053)
--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-10-11 06:42:53 UTC (rev 207053)
@@ -43,7 +43,7 @@
CachedResourceRequest PreloadRequest::resourceRequest(Document& document)
{
ASSERT(isMainThread());
- CachedResourceRequest request(ResourceRequest(completeURL(document)));
+ CachedResourceRequest request(completeURL(document), CachedResourceLoader::defaultCachedResourceOptions());
request.setInitiator(m_initiator);
request.setAsPotentiallyCrossOrigin(m_crossOriginMode, document);
return request;
Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (207052 => 207053)
--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-10-11 06:42:53 UTC (rev 207053)
@@ -34,16 +34,9 @@
namespace WebCore {
-CachedResourceRequest::CachedResourceRequest(const ResourceRequest& resourceRequest, const String& charset, Optional<ResourceLoadPriority> priority)
- : m_resourceRequest(resourceRequest)
- , m_charset(charset)
- , m_options(CachedResourceLoader::defaultCachedResourceOptions())
- , m_priority(priority)
-{
-}
-
-CachedResourceRequest::CachedResourceRequest(ResourceRequest&& resourceRequest, const ResourceLoaderOptions& options, Optional<ResourceLoadPriority> priority)
+CachedResourceRequest::CachedResourceRequest(ResourceRequest&& resourceRequest, const ResourceLoaderOptions& options, Optional<ResourceLoadPriority> priority, String&& charset)
: m_resourceRequest(WTFMove(resourceRequest))
+ , m_charset(WTFMove(charset))
, m_options(options)
, m_priority(priority)
{
Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (207052 => 207053)
--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-10-11 06:39:15 UTC (rev 207052)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-10-11 06:42:53 UTC (rev 207053)
@@ -40,8 +40,7 @@
class CachedResourceRequest {
public:
- explicit CachedResourceRequest(const ResourceRequest&, const String& charset = String(), Optional<ResourceLoadPriority> = Nullopt);
- CachedResourceRequest(ResourceRequest&&, const ResourceLoaderOptions&, Optional<ResourceLoadPriority> = Nullopt);
+ CachedResourceRequest(ResourceRequest&&, const ResourceLoaderOptions&, Optional<ResourceLoadPriority> = Nullopt, String&& charset = String());
ResourceRequest& mutableResourceRequest() { return m_resourceRequest; }
const ResourceRequest& resourceRequest() const { return m_resourceRequest; }