Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: Source/core/html/HTMLLinkElement.cpp

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com) 6 * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 bool blocking = mediaQueryMatches && !m_owner->isAlternate(); 732 bool blocking = mediaQueryMatches && !m_owner->isAlternate();
733 addPendingSheet(blocking ? Blocking : NonBlocking); 733 addPendingSheet(blocking ? Blocking : NonBlocking);
734 734
735 // Load stylesheets that are not needed for the layout immediately with low priority. 735 // Load stylesheets that are not needed for the layout immediately with low priority.
736 FetchRequest request = builder.build(blocking); 736 FetchRequest request = builder.build(blocking);
737 AtomicString crossOriginMode = m_owner->fastGetAttribute(HTMLNames::cros soriginAttr); 737 AtomicString crossOriginMode = m_owner->fastGetAttribute(HTMLNames::cros soriginAttr);
738 if (!crossOriginMode.isNull()) { 738 if (!crossOriginMode.isNull()) {
739 request.setCrossOriginAccessControl(document().securityOrigin(), cro ssOriginMode); 739 request.setCrossOriginAccessControl(document().securityOrigin(), cro ssOriginMode);
740 setFetchFollowingCORS(); 740 setFetchFollowingCORS();
741 } 741 }
742 setResource(document().fetcher()->fetchCSSStyleSheet(request)); 742 setResource(CSSStyleSheetResource::fetch(request, document().fetcher())) ;
743 743
744 if (!resource()) { 744 if (!resource()) {
745 // The request may have been denied if (for example) the stylesheet is local and the document is remote, or if there was a Content Security Policy F ailure. 745 // The request may have been denied if (for example) the stylesheet is local and the document is remote, or if there was a Content Security Policy F ailure.
746 m_loading = false; 746 m_loading = false;
747 removePendingSheet(); 747 removePendingSheet();
748 notifyLoadedSheetAndAllCriticalSubresources(Node::ErrorOccurredLoadi ngSubresource); 748 notifyLoadedSheetAndAllCriticalSubresources(Node::ErrorOccurredLoadi ngSubresource);
749 } 749 }
750 } else if (m_sheet) { 750 } else if (m_sheet) {
751 // we no longer contain a stylesheet, e.g. perhaps rel or type was chang ed 751 // we no longer contain a stylesheet, e.g. perhaps rel or type was chang ed
752 RefPtrWillBeRawPtr<StyleSheet> removedSheet = m_sheet.get(); 752 RefPtrWillBeRawPtr<StyleSheet> removedSheet = m_sheet.get();
(...skipping 17 matching lines...) Expand all
770 removePendingSheet(); 770 removePendingSheet();
771 } 771 }
772 772
773 DEFINE_TRACE(LinkStyle) 773 DEFINE_TRACE(LinkStyle)
774 { 774 {
775 visitor->trace(m_sheet); 775 visitor->trace(m_sheet);
776 LinkResource::trace(visitor); 776 LinkResource::trace(visitor);
777 } 777 }
778 778
779 } // namespace blink 779 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/fetch/XSLStyleSheetResource.cpp ('k') | Source/core/html/imports/HTMLImportsController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698