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

Side by Side Diff: third_party/WebKit/Source/core/fetch/FontResource.cpp

Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use hasClientsOrObservers() for live_size Created 4 years, 4 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) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Torch Mobile, Inc. 3 * Copyright (C) 2009 Torch Mobile, Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 return m_fontData.get(); 134 return m_fontData.get();
135 } 135 }
136 136
137 FontPlatformData FontResource::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation) 137 FontPlatformData FontResource::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation)
138 { 138 {
139 ASSERT(m_fontData); 139 ASSERT(m_fontData);
140 return m_fontData->fontPlatformData(size, bold, italic, orientation); 140 return m_fontData->fontPlatformData(size, bold, italic, orientation);
141 } 141 }
142 142
143 bool FontResource::isSafeToUnlock() const
144 {
145 return data()->hasOneRef();
146 }
147
148 void FontResource::fontLoadShortLimitCallback(TimerBase*) 143 void FontResource::fontLoadShortLimitCallback(TimerBase*)
149 { 144 {
150 if (!isLoading()) 145 if (!isLoading())
151 return; 146 return;
152 ASSERT(m_loadLimitState == UnderLimit); 147 ASSERT(m_loadLimitState == UnderLimit);
153 m_loadLimitState = ShortLimitExceeded; 148 m_loadLimitState = ShortLimitExceeded;
154 ResourceClientWalker<FontResourceClient> walker(clients()); 149 ResourceClientWalker<FontResourceClient> walker(clients());
155 while (FontResourceClient* client = walker.next()) 150 while (FontResourceClient* client = walker.next())
156 client->fontLoadShortLimitExceeded(this); 151 client->fontLoadShortLimitExceeded(this);
157 } 152 }
(...skipping 17 matching lines...) Expand all
175 170
176 void FontResource::checkNotify() 171 void FontResource::checkNotify()
177 { 172 {
178 m_fontLoadShortLimitTimer.stop(); 173 m_fontLoadShortLimitTimer.stop();
179 m_fontLoadLongLimitTimer.stop(); 174 m_fontLoadLongLimitTimer.stop();
180 175
181 Resource::checkNotify(); 176 Resource::checkNotify();
182 } 177 }
183 178
184 } // namespace blink 179 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/FontResource.h ('k') | third_party/WebKit/Source/core/fetch/ImageResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698