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

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

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-3: . Created 4 years, 10 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 case Loaded: 320 case Loaded:
321 return "loaded"; 321 return "loaded";
322 case Error: 322 case Error:
323 return "error"; 323 return "error";
324 default: 324 default:
325 ASSERT_NOT_REACHED(); 325 ASSERT_NOT_REACHED();
326 } 326 }
327 return emptyString(); 327 return emptyString();
328 } 328 }
329 329
330 void FontFace::setLoadStatus(LoadStatus status) 330 void FontFace::setLoadStatus(LoadStatusType status)
331 { 331 {
332 m_status = status; 332 m_status = status;
333 ASSERT(m_status != Error || m_error); 333 ASSERT(m_status != Error || m_error);
334 334
335 if (m_status == Loaded || m_status == Error) { 335 if (m_status == Loaded || m_status == Error) {
336 if (m_loadedProperty) { 336 if (m_loadedProperty) {
337 if (m_status == Loaded) 337 if (m_status == Loaded)
338 m_loadedProperty->resolve(this); 338 m_loadedProperty->resolve(this);
339 else 339 else
340 m_loadedProperty->reject(m_error.get()); 340 m_loadedProperty->reject(m_error.get());
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 { 643 {
644 return m_cssFontFace->hadBlankText(); 644 return m_cssFontFace->hadBlankText();
645 } 645 }
646 646
647 bool FontFace::hasPendingActivity() const 647 bool FontFace::hasPendingActivity() const
648 { 648 {
649 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped(); 649 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped();
650 } 650 }
651 651
652 } // namespace blink 652 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.h ('k') | third_party/WebKit/Source/core/css/MediaQuery.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698