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

Side by Side Diff: sky/engine/core/css/FontFace.cpp

Issue 686783002: Remove almost all of Oilpan (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/css/FontFace.h ('k') | sky/engine/core/css/StylePropertySet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 void FontFace::setError(PassRefPtr<DOMException> error) 347 void FontFace::setError(PassRefPtr<DOMException> error)
348 { 348 {
349 if (!m_error) 349 if (!m_error)
350 m_error = error ? error : DOMException::create(NetworkError); 350 m_error = error ? error : DOMException::create(NetworkError);
351 setLoadStatus(Error); 351 setLoadStatus(Error);
352 } 352 }
353 353
354 ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState) 354 ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState)
355 { 355 {
356 if (!m_loadedProperty) { 356 if (!m_loadedProperty) {
357 m_loadedProperty = new LoadedProperty(scriptState->executionContext(), t his, LoadedProperty::Loaded); 357 m_loadedProperty = adoptPtr(new LoadedProperty(scriptState->executionCon text(), this, LoadedProperty::Loaded));
358 if (m_status == Loaded) 358 if (m_status == Loaded)
359 m_loadedProperty->resolve(this); 359 m_loadedProperty->resolve(this);
360 else if (m_status == Error) 360 else if (m_status == Error)
361 m_loadedProperty->reject(m_error.get()); 361 m_loadedProperty->reject(m_error.get());
362 } 362 }
363 return m_loadedProperty->promise(scriptState->world()); 363 return m_loadedProperty->promise(scriptState->world());
364 } 364 }
365 365
366 ScriptPromise FontFace::load(ScriptState* scriptState) 366 ScriptPromise FontFace::load(ScriptState* scriptState)
367 { 367 {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 setError(DOMException::create(SyntaxError, "Invalid font data in ArrayBu ffer.")); 548 setError(DOMException::create(SyntaxError, "Invalid font data in ArrayBu ffer."));
549 m_cssFontFace->addSource(source.release()); 549 m_cssFontFace->addSource(source.release());
550 } 550 }
551 551
552 bool FontFace::hadBlankText() const 552 bool FontFace::hadBlankText() const
553 { 553 {
554 return m_cssFontFace->hadBlankText(); 554 return m_cssFontFace->hadBlankText();
555 } 555 }
556 556
557 } // namespace blink 557 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFace.h ('k') | sky/engine/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698