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

Side by Side Diff: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/RemoteFontFaceSource.h" 5 #include "core/css/RemoteFontFaceSource.h"
6 6
7 #include "core/css/CSSCustomFontData.h" 7 #include "core/css/CSSCustomFontData.h"
8 #include "core/css/CSSFontFace.h" 8 #include "core/css/CSSFontFace.h"
9 #include "core/css/FontLoader.h" 9 #include "core/css/FontLoader.h"
10 #include "core/page/NetworkStateNotifier.h" 10 #include "core/page/NetworkStateNotifier.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // font-family causes the case, but we treat them as indivisual resources. 89 // font-family causes the case, but we treat them as indivisual resources.
90 m_histograms.loadStarted(); 90 m_histograms.loadStarted();
91 } 91 }
92 92
93 void RemoteFontFaceSource::fontLoaded(FontResource*) 93 void RemoteFontFaceSource::fontLoaded(FontResource*)
94 { 94 {
95 m_histograms.recordRemoteFont(m_font.get()); 95 m_histograms.recordRemoteFont(m_font.get());
96 m_histograms.fontLoaded(m_isInterventionTriggered); 96 m_histograms.fontLoaded(m_isInterventionTriggered);
97 97
98 m_font->ensureCustomFontData(); 98 m_font->ensureCustomFontData();
99 if (m_font->status() == Resource::DecodeError) 99 if (m_font->getStatus() == Resource::DecodeError)
100 m_fontLoader->didFailToDecode(m_font.get()); 100 m_fontLoader->didFailToDecode(m_font.get());
101 101
102 pruneTable(); 102 pruneTable();
103 if (m_face) { 103 if (m_face) {
104 m_fontLoader->fontFaceInvalidated(); 104 m_fontLoader->fontFaceInvalidated();
105 m_face->fontLoaded(this); 105 m_face->fontLoaded(this);
106 } 106 }
107 // Should not do anything after this line since the m_face->fontLoaded() 107 // Should not do anything after this line since the m_face->fontLoaded()
108 // above may trigger deleting this object. 108 // above may trigger deleting this object.
109 } 109 }
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 interventionResult |= 1 << 0; 291 interventionResult |= 1 << 0;
292 if (triggered) 292 if (triggered)
293 interventionResult |= 1 << 1; 293 interventionResult |= 1 << 1;
294 const int boundary = 1 << 2; 294 const int boundary = 1 << 2;
295 295
296 DEFINE_STATIC_LOCAL(EnumerationHistogram, interventionHistogram, ("WebFont.I nterventionResult", boundary)); 296 DEFINE_STATIC_LOCAL(EnumerationHistogram, interventionHistogram, ("WebFont.I nterventionResult", boundary));
297 interventionHistogram.count(interventionResult); 297 interventionHistogram.count(interventionResult);
298 } 298 }
299 299
300 } // namespace blink 300 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp ('k') | third_party/WebKit/Source/core/dom/PendingScript.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698