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

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

Issue 1413563005: Reset CORS status upon re-initiating fetch of a stylesheet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 } 712 }
713 713
714 if (!m_owner->loadLink(type, as, builder.url())) 714 if (!m_owner->loadLink(type, as, builder.url()))
715 return; 715 return;
716 716
717 if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && shouldLoadResource() && builder.url().isValid()) { 717 if (m_disabledState != Disabled && m_owner->relAttribute().isStyleSheet() && shouldLoadResource() && builder.url().isValid()) {
718 718
719 if (resource()) { 719 if (resource()) {
720 removePendingSheet(); 720 removePendingSheet();
721 clearResource(); 721 clearResource();
722 clearFetchFollowingCORS();
722 } 723 }
723 724
724 if (!m_owner->shouldLoadLink()) 725 if (!m_owner->shouldLoadLink())
725 return; 726 return;
726 727
727 m_loading = true; 728 m_loading = true;
728 729
729 bool mediaQueryMatches = true; 730 bool mediaQueryMatches = true;
730 LocalFrame* frame = loadingFrame(); 731 LocalFrame* frame = loadingFrame();
731 if (!m_owner->media().isEmpty() && frame && frame->document()) { 732 if (!m_owner->media().isEmpty() && frame && frame->document()) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 removePendingSheet(); 779 removePendingSheet();
779 } 780 }
780 781
781 DEFINE_TRACE(LinkStyle) 782 DEFINE_TRACE(LinkStyle)
782 { 783 {
783 visitor->trace(m_sheet); 784 visitor->trace(m_sheet);
784 LinkResource::trace(visitor); 785 LinkResource::trace(visitor);
785 } 786 }
786 787
787 } // namespace blink 788 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698