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

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

Issue 2812833003: Revert of [SharedArrayBuffer] Prevent SharedArrayBuffer being used in Web APIs (Closed)
Patch Set: Created 3 years, 8 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 } 74 }
75 75
76 FontFace* FontFace::Create(ExecutionContext* context, 76 FontFace* FontFace::Create(ExecutionContext* context,
77 const AtomicString& family, 77 const AtomicString& family,
78 StringOrArrayBufferOrArrayBufferView& source, 78 StringOrArrayBufferOrArrayBufferView& source,
79 const FontFaceDescriptors& descriptors) { 79 const FontFaceDescriptors& descriptors) {
80 if (source.isString()) 80 if (source.isString())
81 return Create(context, family, source.getAsString(), descriptors); 81 return Create(context, family, source.getAsString(), descriptors);
82 if (source.isArrayBuffer()) 82 if (source.isArrayBuffer())
83 return Create(context, family, source.getAsArrayBuffer(), descriptors); 83 return Create(context, family, source.getAsArrayBuffer(), descriptors);
84 if (source.isArrayBufferView()) { 84 if (source.isArrayBufferView())
85 return Create(context, family, source.getAsArrayBufferView().View(), 85 return Create(context, family, source.getAsArrayBufferView(), descriptors);
86 descriptors);
87 }
88 NOTREACHED(); 86 NOTREACHED();
89 return nullptr; 87 return nullptr;
90 } 88 }
91 89
92 FontFace* FontFace::Create(ExecutionContext* context, 90 FontFace* FontFace::Create(ExecutionContext* context,
93 const AtomicString& family, 91 const AtomicString& family,
94 const String& source, 92 const String& source,
95 const FontFaceDescriptors& descriptors) { 93 const FontFaceDescriptors& descriptors) {
96 FontFace* font_face = new FontFace(context, family, descriptors); 94 FontFace* font_face = new FontFace(context, family, descriptors);
97 95
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 672
675 bool FontFace::HadBlankText() const { 673 bool FontFace::HadBlankText() const {
676 return css_font_face_->HadBlankText(); 674 return css_font_face_->HadBlankText();
677 } 675 }
678 676
679 bool FontFace::HasPendingActivity() const { 677 bool FontFace::HasPendingActivity() const {
680 return status_ == kLoading && GetExecutionContext(); 678 return status_ == kLoading && GetExecutionContext();
681 } 679 }
682 680
683 } // namespace blink 681 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698