CSSPreloadScanner should handle <base> adjusted URLs

third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp

 /*
  * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 17 matching lines @@
 #include "config.h"
 #include "core/html/parser/CSSPreloadScanner.h"
 
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "platform/text/SegmentedString.h"
 
 namespace blink {
 
 CSSPreloadScanner::CSSPreloadScanner()
-    : m_state(Initial)
-    , m_requests(0)
-    , m_referrerPolicy(ReferrerPolicyDefault)
 {
 }
 
 CSSPreloadScanner::~CSSPreloadScanner()
 {
 }
 
 void CSSPreloadScanner::reset()
 {
     m_state = Initial;
     m_rule.clear();
     m_ruleValue.clear();
 }
 
 template<typename Char>
-void CSSPreloadScanner::scanCommon(const Char* begin, const Char* end, const SegmentedString& source, PreloadRequestStream& requests)
+void CSSPreloadScanner::scanCommon(const Char* begin, const Char* end, const SegmentedString& source, PreloadRequestStream& requests, const KURL& predictedBaseElementURL)
 {
     m_requests = &requests;
+    m_predictedBaseElementURL = &predictedBaseElementURL;
+
     for (const Char* it = begin; it != end && m_state != DoneParsingImportRules; ++it)
         tokenize(*it, source);
-    m_requests = 0;
+
+    m_requests = nullptr;
+    m_predictedBaseElementURL = nullptr;
 }
 
-void CSSPreloadScanner::scan(const HTMLToken::DataVector& data, const SegmentedString& source, PreloadRequestStream& requests)
+void CSSPreloadScanner::scan(const HTMLToken::DataVector& data, const SegmentedString& source, PreloadRequestStream& requests, const KURL& predictedBaseElementURL)
 {
-    scanCommon(data.data(), data.data() + data.size(), source, requests);
+    scanCommon(data.data(), data.data() + data.size(), source, requests, predictedBaseElementURL);
 }
 
-void CSSPreloadScanner::scan(const String& tagName,  const SegmentedString& source, PreloadRequestStream& requests)
+void CSSPreloadScanner::scan(const String& tagName, const SegmentedString& source, PreloadRequestStream& requests, const KURL& predictedBaseElementURL)
 {
     if (tagName.is8Bit()) {
         const LChar* begin = tagName.characters8();
-        scanCommon(begin, begin + tagName.length(), source, requests);
+        scanCommon(begin, begin + tagName.length(), source, requests, predictedBaseElementURL);
         return;
     }
     const UChar* begin = tagName.characters16();
-    scanCommon(begin, begin + tagName.length(), source, requests);
+    scanCommon(begin, begin + tagName.length(), source, requests, predictedBaseElementURL);
 }
 
 void CSSPreloadScanner::setReferrerPolicy(const ReferrerPolicy policy)
 {
     m_referrerPolicy = policy;
 }
 
 inline void CSSPreloadScanner::tokenize(UChar c, const SegmentedString& source)
 {
     // We are just interested in @import rules, no need for real tokenization here
@@ skipping 124 matching lines @@
         --reducedLength;
 
     return string.substring(offset, reducedLength);
 }
 
 void CSSPreloadScanner::emitRule(const SegmentedString& source)
 {
     if (equalIgnoringCase(m_rule, "import")) {
         String url = parseCSSStringOrURL(m_ruleValue.toString());
         if (!url.isEmpty()) {
-            KURL baseElementURL; // FIXME: This should be passed in from the HTMLPreloadScaner via scan()!
             TextPosition position = TextPosition(source.currentLine(), source.currentColumn());
-            OwnPtr<PreloadRequest> request = PreloadRequest::create(FetchInitiatorTypeNames::css, position, url, baseElementURL, Resource::CSSStyleSheet, m_referrerPolicy);
+            OwnPtr<PreloadRequest> request = PreloadRequest::create(FetchInitiatorTypeNames::css, position, url, *m_predictedBaseElementURL, Resource::CSSStyleSheet, m_referrerPolicy);
             // FIXME: Should this be including the charset in the preload request?
             m_requests->append(request.release());
         }
         m_state = Initial;
     } else if (equalIgnoringCase(m_rule, "charset"))
         m_state = Initial;
     else
         m_state = DoneParsingImportRules;
     m_rule.clear();
     m_ruleValue.clear();
 }
 
 }