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

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

Issue 31063004: Have Frame::loader() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLHtmlElement.cpp ('k') | Source/core/html/HTMLPlugInElement.cpp » ('j') | 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 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 LinkRequestBuilder builder(m_owner); 565 LinkRequestBuilder builder(m_owner);
566 566
567 if (m_owner->relAttribute().iconType() != InvalidIcon && builder.url().isVal id() && !builder.url().isEmpty()) { 567 if (m_owner->relAttribute().iconType() != InvalidIcon && builder.url().isVal id() && !builder.url().isEmpty()) {
568 if (!m_owner->shouldLoadLink()) 568 if (!m_owner->shouldLoadLink())
569 return; 569 return;
570 if (!document().securityOrigin()->canDisplay(builder.url())) 570 if (!document().securityOrigin()->canDisplay(builder.url()))
571 return; 571 return;
572 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l())) 572 if (!document().contentSecurityPolicy()->allowImageFromSource(builder.ur l()))
573 return; 573 return;
574 if (document().frame()) 574 if (document().frame())
575 document().frame()->loader()->client()->dispatchDidChangeIcons(m_own er->relAttribute().iconType()); 575 document().frame()->loader().client()->dispatchDidChangeIcons(m_owne r->relAttribute().iconType());
576 } 576 }
577 577
578 if (!m_owner->loadLink(type, builder.url())) 578 if (!m_owner->loadLink(type, builder.url()))
579 return; 579 return;
580 580
581 if ((m_disabledState != Disabled) && m_owner->relAttribute().isStyleSheet() 581 if ((m_disabledState != Disabled) && m_owner->relAttribute().isStyleSheet()
582 && document().frame() && builder.url().isValid()) { 582 && document().frame() && builder.url().isValid()) {
583 583
584 if (m_resource) { 584 if (m_resource) {
585 removePendingSheet(); 585 removePendingSheet();
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 void LinkStyle::ownerRemoved() 633 void LinkStyle::ownerRemoved()
634 { 634 {
635 if (m_sheet) 635 if (m_sheet)
636 clearSheet(); 636 clearSheet();
637 637
638 if (styleSheetIsLoading()) 638 if (styleSheetIsLoading())
639 removePendingSheet(RemovePendingSheetNotifyLater); 639 removePendingSheet(RemovePendingSheetNotifyLater);
640 } 640 }
641 641
642 } // namespace WebCore 642 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLHtmlElement.cpp ('k') | Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698