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

Side by Side Diff: third_party/WebKit/Source/core/dom/ProcessingInstruction.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) 2000 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2000 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 clearResource(); 165 clearResource();
166 166
167 String url = document().completeURL(href).string(); 167 String url = document().completeURL(href).string();
168 168
169 ResourcePtr<StyleSheetResource> resource; 169 ResourcePtr<StyleSheetResource> resource;
170 FetchRequest request(ResourceRequest(document().completeURL(href)), FetchIni tiatorTypeNames::processinginstruction); 170 FetchRequest request(ResourceRequest(document().completeURL(href)), FetchIni tiatorTypeNames::processinginstruction);
171 if (m_isXSL) { 171 if (m_isXSL) {
172 if (RuntimeEnabledFeatures::xsltEnabled()) 172 if (RuntimeEnabledFeatures::xsltEnabled())
173 resource = XSLStyleSheetResource::fetch(request, document().fetcher( )); 173 resource = XSLStyleSheetResource::fetch(request, document().fetcher( ));
174 } else { 174 } else {
175 request.setCharset(charset.isEmpty() ? document().charset() : charset); 175 request.setCharset(charset.isEmpty() ? document().characterSet() : chars et);
176 resource = CSSStyleSheetResource::fetch(request, document().fetcher()); 176 resource = CSSStyleSheetResource::fetch(request, document().fetcher());
177 } 177 }
178 178
179 if (resource) { 179 if (resource) {
180 m_loading = true; 180 m_loading = true;
181 if (!m_isXSL) 181 if (!m_isXSL)
182 document().styleEngine().addPendingSheet(); 182 document().styleEngine().addPendingSheet();
183 setResource(resource); 183 setResource(resource);
184 } 184 }
185 } 185 }
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 } 307 }
308 308
309 DEFINE_TRACE(ProcessingInstruction) 309 DEFINE_TRACE(ProcessingInstruction)
310 { 310 {
311 visitor->trace(m_sheet); 311 visitor->trace(m_sheet);
312 visitor->trace(m_listenerForXSLT); 312 visitor->trace(m_listenerForXSLT);
313 CharacterData::trace(visitor); 313 CharacterData::trace(visitor);
314 } 314 }
315 315
316 } // namespace 316 } // namespace
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.idl ('k') | third_party/WebKit/Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698