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

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

Issue 7694026: Merge 93227 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « Source/WebCore/dom/StyleElement.cpp ('k') | Source/WebCore/html/HTMLStyleElement.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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 HTMLLinkElement::~HTMLLinkElement() 70 HTMLLinkElement::~HTMLLinkElement()
71 { 71 {
72 if (m_sheet) 72 if (m_sheet)
73 m_sheet->clearOwnerNode(); 73 m_sheet->clearOwnerNode();
74 74
75 if (m_cachedSheet) { 75 if (m_cachedSheet) {
76 m_cachedSheet->removeClient(this); 76 m_cachedSheet->removeClient(this);
77 removePendingSheet(); 77 removePendingSheet();
78 } 78 }
79
80 if (inDocument())
81 document()->removeStyleSheetCandidateNode(this);
79 } 82 }
80 83
81 void HTMLLinkElement::setDisabled(bool disabled) 84 void HTMLLinkElement::setDisabled(bool disabled)
82 { 85 {
83 if (!m_sheet) 86 if (!m_sheet)
84 return; 87 return;
85 88
86 bool wasDisabled = m_sheet->disabled(); 89 bool wasDisabled = m_sheet->disabled();
87 if (wasDisabled == disabled) 90 if (wasDisabled == disabled)
88 return; 91 return;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 } 437 }
435 document()->removePendingSheet(); 438 document()->removePendingSheet();
436 } 439 }
437 440
438 bool HTMLLinkElement::disabled() const 441 bool HTMLLinkElement::disabled() const
439 { 442 {
440 return m_sheet && m_sheet->disabled(); 443 return m_sheet && m_sheet->disabled();
441 } 444 }
442 445
443 } 446 }
OLDNEW
« no previous file with comments | « Source/WebCore/dom/StyleElement.cpp ('k') | Source/WebCore/html/HTMLStyleElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698