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

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

Issue 1623403002: Remove fetching stylesheets with unsupported type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 4 years, 11 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
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 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 return; 714 return;
715 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l())) 715 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l()))
716 return; 716 return;
717 if (document().frame() && document().frame()->loader().client()) 717 if (document().frame() && document().frame()->loader().client())
718 document().frame()->loader().client()->dispatchDidChangeIcons(m_owne r->relAttribute().iconType()); 718 document().frame()->loader().client()->dispatchDidChangeIcons(m_owne r->relAttribute().iconType());
719 } 719 }
720 720
721 if (!m_owner->loadLink(type, as, builder.url())) 721 if (!m_owner->loadLink(type, as, builder.url()))
722 return; 722 return;
723 723
724 if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && shouldLoadResource() && builder.url().isValid()) { 724 if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && styleSheetTypeIsSupported(type) && shouldLoadResource() && builder.url().isVali d()) {
725 if (!styleSheetTypeIsSupported(type))
726 UseCounter::countDeprecation(document(), UseCounter::NonCSSStyleShee tType);
727
728 if (resource()) { 725 if (resource()) {
729 removePendingSheet(); 726 removePendingSheet();
730 clearResource(); 727 clearResource();
731 clearFetchFollowingCORS(); 728 clearFetchFollowingCORS();
732 } 729 }
733 730
734 if (!m_owner->shouldLoadLink()) 731 if (!m_owner->shouldLoadLink())
735 return; 732 return;
736 733
737 m_loading = true; 734 m_loading = true;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 } 786 }
790 787
791 DEFINE_TRACE(LinkStyle) 788 DEFINE_TRACE(LinkStyle)
792 { 789 {
793 visitor->trace(m_sheet); 790 visitor->trace(m_sheet);
794 LinkResource::trace(visitor); 791 LinkResource::trace(visitor);
795 ResourceOwner<StyleSheetResource>::trace(visitor); 792 ResourceOwner<StyleSheetResource>::trace(visitor);
796 } 793 }
797 794
798 } // namespace blink 795 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698