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

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

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 } 595 }
596 } else { 596 } else {
597 source = adoptPtrWillBeNoop(new LocalFontFaceSource(item->resource() )); 597 source = adoptPtrWillBeNoop(new LocalFontFaceSource(item->resource() ));
598 } 598 }
599 599
600 if (source) 600 if (source)
601 m_cssFontFace->addSource(source.release()); 601 m_cssFontFace->addSource(source.release());
602 } 602 }
603 } 603 }
604 604
605 void FontFace::initCSSFontFace(const unsigned char* data, unsigned size) 605 void FontFace::initCSSFontFace(const unsigned char* data, size_t size)
606 { 606 {
607 m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get()); 607 m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
608 if (m_error) 608 if (m_error)
609 return; 609 return;
610 610
611 RefPtr<SharedBuffer> buffer = SharedBuffer::create(data, size); 611 RefPtr<SharedBuffer> buffer = SharedBuffer::create(data, size);
612 OwnPtrWillBeRawPtr<BinaryDataFontFaceSource> source = adoptPtrWillBeNoop(new BinaryDataFontFaceSource(buffer.get(), m_otsParseMessage)); 612 OwnPtrWillBeRawPtr<BinaryDataFontFaceSource> source = adoptPtrWillBeNoop(new BinaryDataFontFaceSource(buffer.get(), m_otsParseMessage));
613 if (source->isValid()) 613 if (source->isValid())
614 setLoadStatus(Loaded); 614 setLoadStatus(Loaded);
615 else 615 else
(...skipping 21 matching lines...) Expand all
637 { 637 {
638 return m_cssFontFace->hadBlankText(); 638 return m_cssFontFace->hadBlankText();
639 } 639 }
640 640
641 bool FontFace::hasPendingActivity() const 641 bool FontFace::hasPendingActivity() const
642 { 642 {
643 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped(); 643 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped();
644 } 644 }
645 645
646 } // namespace blink 646 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.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