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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2223133004: Removed Wrap-Flow and Wrap-Through from ComputedStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed stale comment and rebase Created 4 years, 4 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.cpp » ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 EUnicodeBidi unicodeBidi() const { return static_cast<EUnicodeBidi>(m_nonInh eritedData.m_unicodeBidi); } 1220 EUnicodeBidi unicodeBidi() const { return static_cast<EUnicodeBidi>(m_nonInh eritedData.m_unicodeBidi); }
1221 void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; } 1221 void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; }
1222 1222
1223 // vertical-align 1223 // vertical-align
1224 static EVerticalAlign initialVerticalAlign() { return VerticalAlignBaseline; } 1224 static EVerticalAlign initialVerticalAlign() { return VerticalAlignBaseline; }
1225 EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(m_ nonInheritedData.m_verticalAlign); } 1225 EVerticalAlign verticalAlign() const { return static_cast<EVerticalAlign>(m_ nonInheritedData.m_verticalAlign); }
1226 const Length& getVerticalAlignLength() const { return m_box->verticalAlign() ; } 1226 const Length& getVerticalAlignLength() const { return m_box->verticalAlign() ; }
1227 void setVerticalAlign(EVerticalAlign v) { m_nonInheritedData.m_verticalAlign = v; } 1227 void setVerticalAlign(EVerticalAlign v) { m_nonInheritedData.m_verticalAlign = v; }
1228 void setVerticalAlignLength(const Length& length) { setVerticalAlign(Vertica lAlignLength); SET_VAR(m_box, m_verticalAlign, length); } 1228 void setVerticalAlignLength(const Length& length) { setVerticalAlign(Vertica lAlignLength); SET_VAR(m_box, m_verticalAlign, length); }
1229 1229
1230 // Exclusions properties.
1231 // wrap-flow
1232 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1233
1234 // wrap-through
1235 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
1236
1237 // will-change 1230 // will-change
1238 const Vector<CSSPropertyID>& willChangeProperties() const { return m_rareNon InheritedData->m_willChange->m_properties; } 1231 const Vector<CSSPropertyID>& willChangeProperties() const { return m_rareNon InheritedData->m_willChange->m_properties; }
1239 bool willChangeContents() const { return m_rareNonInheritedData->m_willChang e->m_contents; } 1232 bool willChangeContents() const { return m_rareNonInheritedData->m_willChang e->m_contents; }
1240 bool willChangeScrollPosition() const { return m_rareNonInheritedData->m_wil lChange->m_scrollPosition; } 1233 bool willChangeScrollPosition() const { return m_rareNonInheritedData->m_wil lChange->m_scrollPosition; }
1241 bool subtreeWillChangeContents() const { return m_rareInheritedData->m_subtr eeWillChangeContents; } 1234 bool subtreeWillChangeContents() const { return m_rareInheritedData->m_subtr eeWillChangeContents; }
1242 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ NESTED_VAR(m_rareNonInheritedData, m_willChange, m_properties, properties); } 1235 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ NESTED_VAR(m_rareNonInheritedData, m_willChange, m_properties, properties); }
1243 void setWillChangeContents(bool b) { SET_NESTED_VAR(m_rareNonInheritedData, m_willChange, m_contents, b); } 1236 void setWillChangeContents(bool b) { SET_NESTED_VAR(m_rareNonInheritedData, m_willChange, m_contents, b); }
1244 void setWillChangeScrollPosition(bool b) { SET_NESTED_VAR(m_rareNonInherited Data, m_willChange, m_scrollPosition, b); } 1237 void setWillChangeScrollPosition(bool b) { SET_NESTED_VAR(m_rareNonInherited Data, m_willChange, m_scrollPosition, b); }
1245 void setSubtreeWillChangeContents(bool b) { SET_VAR(m_rareInheritedData, m_s ubtreeWillChangeContents, b); } 1238 void setSubtreeWillChangeContents(bool b) { SET_VAR(m_rareInheritedData, m_s ubtreeWillChangeContents, b); }
1246 1239
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
2373 // TODO(sashab): Rename this to just getColor(), and add a comment explainin g how it works. 2366 // TODO(sashab): Rename this to just getColor(), and add a comment explainin g how it works.
2374 Color visitedDependentColor(int colorProperty) const; 2367 Color visitedDependentColor(int colorProperty) const;
2375 2368
2376 // -webkit-appearance utility functions. 2369 // -webkit-appearance utility functions.
2377 bool hasAppearance() const { return appearance() != NoControlPart; } 2370 bool hasAppearance() const { return appearance() != NoControlPart; }
2378 2371
2379 // Other utility functions. 2372 // Other utility functions.
2380 bool isStyleAvailable() const; 2373 bool isStyleAvailable() const;
2381 bool isSharable() const; 2374 bool isSharable() const;
2382 2375
2383 // TODO(sashab) Remove these.
2384 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; }
2385 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; }
2386 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; }
2387 static float initialImageResolution() { return 1; }
2388 void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(m_rareNonInheritedData, m_wrap Flow, wrapFlow); }
2389 void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(m_rareNonInheritedDat a, m_wrapThrough, wrapThrough); }
2390
2391 private: 2376 private:
2392 void setVisitedLinkColor(const Color&); 2377 void setVisitedLinkColor(const Color&);
2393 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(m_rareNonI nheritedData, m_visitedLinkBackgroundColor, v); } 2378 void setVisitedLinkBackgroundColor(const StyleColor& v) { SET_VAR(m_rareNonI nheritedData, m_visitedLinkBackgroundColor, v); }
2394 void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(m_rareNonI nheritedData, m_visitedLinkBorderLeftColor, v); } 2379 void setVisitedLinkBorderLeftColor(const StyleColor& v) { SET_VAR(m_rareNonI nheritedData, m_visitedLinkBorderLeftColor, v); }
2395 void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(m_rareNon InheritedData, m_visitedLinkBorderRightColor, v); } 2380 void setVisitedLinkBorderRightColor(const StyleColor& v) { SET_VAR(m_rareNon InheritedData, m_visitedLinkBorderRightColor, v); }
2396 void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(m_rareNo nInheritedData, m_visitedLinkBorderBottomColor, v); } 2381 void setVisitedLinkBorderBottomColor(const StyleColor& v) { SET_VAR(m_rareNo nInheritedData, m_visitedLinkBorderBottomColor, v); }
2397 void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(m_rareNonIn heritedData, m_visitedLinkBorderTopColor, v); } 2382 void setVisitedLinkBorderTopColor(const StyleColor& v) { SET_VAR(m_rareNonIn heritedData, m_visitedLinkBorderTopColor, v); }
2398 void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(m_rareNonInhe ritedData, m_visitedLinkOutlineColor, v); } 2383 void setVisitedLinkOutlineColor(const StyleColor& v) { SET_VAR(m_rareNonInhe ritedData, m_visitedLinkOutlineColor, v); }
2399 void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_NESTED_VAR(m_r areNonInheritedData, m_multiCol, m_visitedLinkColumnRuleColor, v); } 2384 void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_NESTED_VAR(m_r areNonInheritedData, m_multiCol, m_visitedLinkColumnRuleColor, v); }
2400 void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(m_rare NonInheritedData, m_visitedLinkTextDecorationColor, v); } 2385 void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(m_rare NonInheritedData, m_visitedLinkTextDecorationColor, v); }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 } 2552 }
2568 2553
2569 inline bool ComputedStyle::hasPseudoElementStyle() const 2554 inline bool ComputedStyle::hasPseudoElementStyle() const
2570 { 2555 {
2571 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 2556 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
2572 } 2557 }
2573 2558
2574 } // namespace blink 2559 } // namespace blink
2575 2560
2576 #endif // ComputedStyle_h 2561 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698