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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolverState.h

Issue 2918983002: Remove references to rare_inherited_data_ in ComputedStyle. (Closed)
Patch Set: fix setTextOrientation Created 3 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 font_builder_.DidChangeEffectiveZoom(); 195 font_builder_.DidChangeEffectiveZoom();
196 } 196 }
197 void SetWritingMode(WritingMode new_writing_mode) { 197 void SetWritingMode(WritingMode new_writing_mode) {
198 if (style_->GetWritingMode() == new_writing_mode) { 198 if (style_->GetWritingMode() == new_writing_mode) {
199 return; 199 return;
200 } 200 }
201 style_->SetWritingMode(new_writing_mode); 201 style_->SetWritingMode(new_writing_mode);
202 font_builder_.DidChangeWritingMode(); 202 font_builder_.DidChangeWritingMode();
203 } 203 }
204 void SetTextOrientation(ETextOrientation text_orientation) { 204 void SetTextOrientation(ETextOrientation text_orientation) {
205 if (style_->SetTextOrientation(text_orientation)) 205 if (style_->GetTextOrientation() != text_orientation) {
206 style_->SetTextOrientation(text_orientation);
206 font_builder_.DidChangeTextOrientation(); 207 font_builder_.DidChangeTextOrientation();
208 }
207 } 209 }
208 210
209 void SetHasDirAutoAttribute(bool value) { has_dir_auto_attribute_ = value; } 211 void SetHasDirAutoAttribute(bool value) { has_dir_auto_attribute_ = value; }
210 bool HasDirAutoAttribute() const { return has_dir_auto_attribute_; } 212 bool HasDirAutoAttribute() const { return has_dir_auto_attribute_; }
211 213
212 void SetCustomPropertySetForApplyAtRule(const String&, StylePropertySet*); 214 void SetCustomPropertySetForApplyAtRule(const String&, StylePropertySet*);
213 StylePropertySet* CustomPropertySetForApplyAtRule(const String&); 215 StylePropertySet* CustomPropertySetForApplyAtRule(const String&);
214 216
215 HeapHashMap<CSSPropertyID, Member<const CSSValue>>& 217 HeapHashMap<CSSPropertyID, Member<const CSSValue>>&
216 ParsedPropertiesForPendingSubstitutionCache( 218 ParsedPropertiesForPendingSubstitutionCache(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 254
253 mutable HeapHashMap< 255 mutable HeapHashMap<
254 Member<const CSSPendingSubstitutionValue>, 256 Member<const CSSPendingSubstitutionValue>,
255 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>> 257 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>>
256 parsed_properties_for_pending_substitution_cache_; 258 parsed_properties_for_pending_substitution_cache_;
257 }; 259 };
258 260
259 } // namespace blink 261 } // namespace blink
260 262
261 #endif // StyleResolverState_h 263 #endif // StyleResolverState_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698