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

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

Issue 220723012: Add a missing null check to LinkStyle::process() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 String type = m_owner->typeValue().lower(); 620 String type = m_owner->typeValue().lower();
621 LinkRequestBuilder builder(m_owner); 621 LinkRequestBuilder builder(m_owner);
622 622
623 if (m_owner->relAttribute().iconType() != InvalidIcon && builder.url().isVal id() && !builder.url().isEmpty()) { 623 if (m_owner->relAttribute().iconType() != InvalidIcon && builder.url().isVal id() && !builder.url().isEmpty()) {
624 if (!m_owner->shouldLoadLink()) 624 if (!m_owner->shouldLoadLink())
625 return; 625 return;
626 if (!document().securityOrigin()->canDisplay(builder.url())) 626 if (!document().securityOrigin()->canDisplay(builder.url()))
627 return; 627 return;
628 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l())) 628 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l()))
629 return; 629 return;
630 if (document().frame()) 630 if (document().frame() && document().frame()->loader().client())
631 document().frame()->loader().client()->dispatchDidChangeIcons(m_owne r->relAttribute().iconType()); 631 document().frame()->loader().client()->dispatchDidChangeIcons(m_owne r->relAttribute().iconType());
632 } 632 }
633 633
634 if (!m_owner->loadLink(type, builder.url())) 634 if (!m_owner->loadLink(type, builder.url()))
635 return; 635 return;
636 636
637 if ((m_disabledState != Disabled) && m_owner->relAttribute().isStyleSheet() 637 if ((m_disabledState != Disabled) && m_owner->relAttribute().isStyleSheet()
638 && shouldLoadResource() && builder.url().isValid()) { 638 && shouldLoadResource() && builder.url().isValid()) {
639 639
640 if (resource()) { 640 if (resource()) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 void LinkStyle::ownerRemoved() 692 void LinkStyle::ownerRemoved()
693 { 693 {
694 if (m_sheet) 694 if (m_sheet)
695 clearSheet(); 695 clearSheet();
696 696
697 if (styleSheetIsLoading()) 697 if (styleSheetIsLoading())
698 removePendingSheet(RemovePendingSheetNotifyLater); 698 removePendingSheet(RemovePendingSheetNotifyLater);
699 } 699 }
700 700
701 } // namespace WebCore 701 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698