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

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

Issue 1365923002: Make Document.charset an alias of characterSet, as per spec (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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 { 66 {
67 visitor->trace(m_owner); 67 visitor->trace(m_owner);
68 } 68 }
69 69
70 LinkRequestBuilder::LinkRequestBuilder(HTMLLinkElement* owner) 70 LinkRequestBuilder::LinkRequestBuilder(HTMLLinkElement* owner)
71 : m_owner(owner) 71 : m_owner(owner)
72 , m_url(owner->getNonEmptyURLAttribute(hrefAttr)) 72 , m_url(owner->getNonEmptyURLAttribute(hrefAttr))
73 { 73 {
74 m_charset = m_owner->getAttribute(charsetAttr); 74 m_charset = m_owner->getAttribute(charsetAttr);
75 if (m_charset.isEmpty() && m_owner->document().frame()) 75 if (m_charset.isEmpty() && m_owner->document().frame())
76 m_charset = m_owner->document().charset(); 76 m_charset = m_owner->document().characterSet();
77 } 77 }
78 78
79 FetchRequest LinkRequestBuilder::build(bool blocking) const 79 FetchRequest LinkRequestBuilder::build(bool blocking) const
80 { 80 {
81 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow; 81 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;
82 return FetchRequest(ResourceRequest(m_owner->document().completeURL(m_url)), m_owner->localName(), m_charset, priority); 82 return FetchRequest(ResourceRequest(m_owner->document().completeURL(m_url)), m_owner->localName(), m_charset, priority);
83 } 83 }
84 84
85 } // namespace blink 85 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698