| Index: Source/core/html/parser/HTMLResourcePreloader.h
|
| diff --git a/Source/core/html/parser/HTMLResourcePreloader.h b/Source/core/html/parser/HTMLResourcePreloader.h
|
| index 21a67545efe32365842906884f75394376a021a2..df505a7059c46a97524681c87f8614c5d62d2ad1 100644
|
| --- a/Source/core/html/parser/HTMLResourcePreloader.h
|
| +++ b/Source/core/html/parser/HTMLResourcePreloader.h
|
| @@ -34,14 +34,10 @@ namespace WebCore {
|
|
|
| class PreloadRequest {
|
| public:
|
| - static PassOwnPtr<PreloadRequest> create(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType, const String& mediaAttribute)
|
| - {
|
| - return adoptPtr(new PreloadRequest(initiatorName, initiatorPosition, resourceURL, baseURL, resourceType, mediaAttribute));
|
| - }
|
|
|
| static PassOwnPtr<PreloadRequest> create(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType)
|
| {
|
| - return adoptPtr(new PreloadRequest(initiatorName, initiatorPosition, resourceURL, baseURL, resourceType, ""));
|
| + return adoptPtr(new PreloadRequest(initiatorName, initiatorPosition, resourceURL, baseURL, resourceType));
|
| }
|
|
|
| bool isSafeToSendToAnotherThread() const;
|
| @@ -49,19 +45,17 @@ public:
|
| CachedResourceRequest resourceRequest(Document*);
|
|
|
| const String& charset() const { return m_charset; }
|
| - const String& media() const { return m_mediaAttribute; }
|
| void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
|
| void setCrossOriginModeAllowsCookies(bool allowsCookies) { m_crossOriginModeAllowsCookies = allowsCookies; }
|
| CachedResource::Type resourceType() const { return m_resourceType; }
|
|
|
| private:
|
| - PreloadRequest(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType, const String& mediaAttribute)
|
| + PreloadRequest(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType)
|
| : m_initiatorName(initiatorName.isolatedCopy())
|
| , m_initiatorPosition(initiatorPosition)
|
| , m_resourceURL(resourceURL.isolatedCopy())
|
| , m_baseURL(baseURL.copy())
|
| , m_resourceType(resourceType)
|
| - , m_mediaAttribute(mediaAttribute.isolatedCopy())
|
| , m_crossOriginModeAllowsCookies(false)
|
| {
|
| }
|
| @@ -74,7 +68,6 @@ private:
|
| KURL m_baseURL;
|
| String m_charset;
|
| CachedResource::Type m_resourceType;
|
| - String m_mediaAttribute;
|
| bool m_crossOriginModeAllowsCookies;
|
| };
|
|
|
|
|