XSLImportRule should not be ResourceClient.

Source/core/xml/XSLImportRule.cpp

 /*
  * This file is part of the XSL implementation.
  *
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/xml/XSLImportRule.h"
 
 #include "core/FetchInitiatorTypeNames.h"
 #include "core/dom/Document.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/XSLStyleSheetResource.h"
+#include "platform/SharedBuffer.h"
+#include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 XSLImportRule::XSLImportRule(XSLStyleSheet* parent, const String& href)
     : m_parentStyleSheet(parent)
     , m_strHref(href)
-    , m_resource(0)
     , m_loading(false)
 {
 }
 
 XSLImportRule::~XSLImportRule()
 {
 #if !ENABLE(OILPAN)
     if (m_styleSheet)
         m_styleSheet->setParentStyleSheet(0);
 #endif
-
-    if (m_resource)
-        m_resource->removeClient(this);
 }
 
 void XSLImportRule::setXSLStyleSheet(const String& href, const KURL& baseURL, const String& sheet)
 {
     if (m_styleSheet)
         m_styleSheet->setParentStyleSheet(0);
 
     m_styleSheet = XSLStyleSheet::create(this, href, baseURL);
 
     XSLStyleSheet* parent = parentStyleSheet();
@@ skipping 32 matching lines @@
         absHref = KURL(parentSheet->baseURL(), m_strHref).string();
     }
 
     // Check for a cycle in our import chain. If we encounter a stylesheet in
     // our parent chain with the same URL, then just bail.
     for (XSLStyleSheet* parentSheet = parentStyleSheet(); parentSheet; parentSheet = parentSheet->parentStyleSheet()) {
         if (absHref == parentSheet->baseURL().string())
             return;
     }
 
-    FetchRequest request(ResourceRequest(fetcher->document()->completeURL(absHref)), FetchInitiatorTypeNames::xml);
-    m_resource = fetcher->fetchXSLStyleSheet(request);
+    ResourceLoaderOptions fetchOptions(ResourceFetcher::defaultResourceOptions());
+    FetchRequest request(ResourceRequest(fetcher->document()->completeURL(absHref)), FetchInitiatorTypeNames::xml, fetchOptions);
+    request.setOriginRestriction(FetchRequest::RestrictToSameOrigin);
+    ResourcePtr<Resource> resource = fetcher->fetchSynchronously(request);
+    if (!resource)
+        return;
 
-    if (m_resource) {
-        m_resource->addClient(this);
-
-        // If the imported sheet is in the cache, then setXSLStyleSheet gets
-        // called, and the sheet even gets parsed (via parseString). In this
-        // case we have loaded (even if our subresources haven't), so if we have
-        // a stylesheet after checking the cache, then we've clearly loaded.
-        if (!m_styleSheet)
-            m_loading = true;
-    }
+    ASSERT(!m_styleSheet);
+    if (SharedBuffer* data = resource->resourceBuffer())
+        setXSLStyleSheet(absHref, parentSheet->baseURL(), UTF8Encoding().decode(data->data(), data->size()));
 }
 
 void XSLImportRule::trace(Visitor* visitor)
 {
     visitor->trace(m_parentStyleSheet);
     visitor->trace(m_styleSheet);
 }
 
 } // namespace blink