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

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

Issue 14672042: Prepare to add more initiator info to CachedResource(Request) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Restore performance reporting logic. Created 7 years, 7 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
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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 mediaQueryMatches = evaluator.eval(media.get()); 229 mediaQueryMatches = evaluator.eval(media.get());
230 } 230 }
231 231
232 // Don't hold up render tree construction and script execution on styles heets 232 // Don't hold up render tree construction and script execution on styles heets
233 // that are not needed for the rendering at the moment. 233 // that are not needed for the rendering at the moment.
234 bool blocking = mediaQueryMatches && !isAlternate(); 234 bool blocking = mediaQueryMatches && !isAlternate();
235 addPendingSheet(blocking ? Blocking : NonBlocking); 235 addPendingSheet(blocking ? Blocking : NonBlocking);
236 236
237 // Load stylesheets that are not needed for the rendering immediately wi th low priority. 237 // Load stylesheets that are not needed for the rendering immediately wi th low priority.
238 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolve d : ResourceLoadPriorityVeryLow; 238 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolve d : ResourceLoadPriorityVeryLow;
239 CachedResourceRequest request(ResourceRequest(document()->completeURL(ur l)), charset, priority); 239 CachedResourceRequest request(ResourceRequest(document()->completeURL(ur l)), localName(), charset, priority);
240 request.setInitiator(this);
241 m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet (request); 240 m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet (request);
242 241
243 if (m_cachedSheet) 242 if (m_cachedSheet)
244 m_cachedSheet->addClient(this); 243 m_cachedSheet->addClient(this);
245 else { 244 else {
246 // The request may have been denied if (for example) the stylesheet is local and the document is remote. 245 // The request may have been denied if (for example) the stylesheet is local and the document is remote.
247 m_loading = false; 246 m_loading = false;
248 removePendingSheet(); 247 removePendingSheet();
249 } 248 }
250 } else if (m_sheet) { 249 } else if (m_sheet) {
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 { 514 {
516 return m_sizes.get(); 515 return m_sizes.get();
517 } 516 }
518 517
519 void HTMLLinkElement::setSizes(const String& value) 518 void HTMLLinkElement::setSizes(const String& value)
520 { 519 {
521 m_sizes->setValue(value); 520 m_sizes->setValue(value);
522 } 521 }
523 522
524 } // namespace WebCore 523 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698