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

Side by Side Diff: third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 } 74 }
75 // TODO(yoichio): Should preload if document is imported. 75 // TODO(yoichio): Should preload if document is imported.
76 if (!m_document->loader()) 76 if (!m_document->loader())
77 return; 77 return;
78 FetchRequest request = preload->resourceRequest(m_document); 78 FetchRequest request = preload->resourceRequest(m_document);
79 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res 79 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res
80 // making Document::completeURLWithOverride logic to be statically accessibl e. 80 // making Document::completeURLWithOverride logic to be statically accessibl e.
81 if (request.url().protocolIsData()) 81 if (request.url().protocolIsData())
82 return; 82 return;
83 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource ) 83 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource )
84 request.setCharset(preload->charset().isEmpty() ? m_document->charset(). string() : preload->charset()); 84 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().string() : preload->charset());
85 request.setForPreload(true); 85 request.setForPreload(true);
86 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20); 86 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20);
87 m_document->loader()->startPreload(preload->resourceType(), request); 87 m_document->loader()->startPreload(preload->resourceType(), request);
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/LinkResource.cpp ('k') | third_party/WebKit/Source/core/loader/FormSubmission.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698