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

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

Issue 204373003: Oilpan: Change references to MutableStylePropertySet to transition types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 , m_resolver(ScriptPromiseResolver::create(context)) 94 , m_resolver(ScriptPromiseResolver::create(context))
95 { } 95 { }
96 ScriptState* m_scriptState; 96 ScriptState* m_scriptState;
97 RefPtr<ScriptPromiseResolver> m_resolver; 97 RefPtr<ScriptPromiseResolver> m_resolver;
98 }; 98 };
99 99
100 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID) 100 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID)
101 { 101 {
102 if (s.isEmpty()) 102 if (s.isEmpty())
103 return nullptr; 103 return nullptr;
104 RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::creat e(); 104 RefPtrWillBeRawPtr<MutableStylePropertySet> parsedStyle = MutableStyleProper tySet::create();
105 BisonCSSParser::parseValue(parsedStyle.get(), propertyID, s, true, *document ); 105 BisonCSSParser::parseValue(parsedStyle.get(), propertyID, s, true, *document );
106 return parsedStyle->getPropertyCSSValue(propertyID); 106 return parsedStyle->getPropertyCSSValue(propertyID);
107 } 107 }
108 108
109 static bool initFontFace(FontFace* fontFace, ExecutionContext* context, const At omicString& family, const Dictionary& descriptors, ExceptionState& exceptionStat e) 109 static bool initFontFace(FontFace* fontFace, ExecutionContext* context, const At omicString& family, const Dictionary& descriptors, ExceptionState& exceptionStat e)
110 { 110 {
111 fontFace->setFamily(context, family, exceptionState); 111 fontFace->setFamily(context, family, exceptionState);
112 if (exceptionState.hadException()) 112 if (exceptionState.hadException())
113 return false; 113 return false;
114 114
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 visitor->trace(m_featureSettings); 597 visitor->trace(m_featureSettings);
598 visitor->trace(m_error); 598 visitor->trace(m_error);
599 } 599 }
600 600
601 bool FontFace::hadBlankText() const 601 bool FontFace::hadBlankText() const
602 { 602 {
603 return m_cssFontFace->hadBlankText(); 603 return m_cssFontFace->hadBlankText();
604 } 604 }
605 605
606 } // namespace WebCore 606 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698