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

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

Issue 2561973002: Changed EOverflowAnchor to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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) 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 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 m_inheritedData.m_printColorAdjust = 366 m_inheritedData.m_printColorAdjust =
367 static_cast<unsigned>(initialPrintColorAdjust()); 367 static_cast<unsigned>(initialPrintColorAdjust());
368 m_inheritedData.m_pointerEvents = 368 m_inheritedData.m_pointerEvents =
369 static_cast<unsigned>(initialPointerEvents()); 369 static_cast<unsigned>(initialPointerEvents());
370 m_inheritedData.m_insideLink = NotInsideLink; 370 m_inheritedData.m_insideLink = NotInsideLink;
371 m_inheritedData.m_writingMode = initialWritingMode(); 371 m_inheritedData.m_writingMode = initialWritingMode();
372 372
373 m_nonInheritedData.m_effectiveDisplay = 373 m_nonInheritedData.m_effectiveDisplay =
374 m_nonInheritedData.m_originalDisplay = 374 m_nonInheritedData.m_originalDisplay =
375 static_cast<unsigned>(initialDisplay()); 375 static_cast<unsigned>(initialDisplay());
376 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor(); 376 m_nonInheritedData.m_overflowAnchor =
377 static_cast<unsigned>(initialOverflowAnchor());
377 m_nonInheritedData.m_overflowX = initialOverflowX(); 378 m_nonInheritedData.m_overflowX = initialOverflowX();
378 m_nonInheritedData.m_overflowY = initialOverflowY(); 379 m_nonInheritedData.m_overflowY = initialOverflowY();
379 m_nonInheritedData.m_verticalAlign = initialVerticalAlign(); 380 m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
380 m_nonInheritedData.m_clear = initialClear(); 381 m_nonInheritedData.m_clear = initialClear();
381 m_nonInheritedData.m_position = initialPosition(); 382 m_nonInheritedData.m_position = initialPosition();
382 m_nonInheritedData.m_tableLayout = initialTableLayout(); 383 m_nonInheritedData.m_tableLayout = initialTableLayout();
383 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi(); 384 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
384 m_nonInheritedData.m_breakBefore = initialBreakBefore(); 385 m_nonInheritedData.m_breakBefore = initialBreakBefore();
385 m_nonInheritedData.m_breakAfter = initialBreakAfter(); 386 m_nonInheritedData.m_breakAfter = initialBreakAfter();
386 m_nonInheritedData.m_breakInside = initialBreakInside(); 387 m_nonInheritedData.m_breakInside = initialBreakInside();
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone) 1538 if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone)
1538 return 0; 1539 return 0;
1539 return m_rareNonInheritedData->m_outline.offset(); 1540 return m_rareNonInheritedData->m_outline.offset();
1540 } 1541 }
1541 void setOutlineOffset(int v) { 1542 void setOutlineOffset(int v) {
1542 SET_VAR(m_rareNonInheritedData, m_outline.m_offset, v); 1543 SET_VAR(m_rareNonInheritedData, m_outline.m_offset, v);
1543 } 1544 }
1544 1545
1545 // Overflow properties. 1546 // Overflow properties.
1546 // overflow-anchor 1547 // overflow-anchor
1547 static EOverflowAnchor initialOverflowAnchor() { return AnchorAuto; } 1548 static EOverflowAnchor initialOverflowAnchor() {
1549 return EOverflowAnchor::Auto;
1550 }
1548 EOverflowAnchor overflowAnchor() const { 1551 EOverflowAnchor overflowAnchor() const {
1549 return static_cast<EOverflowAnchor>(m_nonInheritedData.m_overflowAnchor); 1552 return static_cast<EOverflowAnchor>(m_nonInheritedData.m_overflowAnchor);
1550 } 1553 }
1551 void setOverflowAnchor(EOverflowAnchor v) { 1554 void setOverflowAnchor(EOverflowAnchor v) {
1552 m_nonInheritedData.m_overflowAnchor = v; 1555 m_nonInheritedData.m_overflowAnchor = static_cast<unsigned>(v);
1553 } 1556 }
1554 1557
1555 // overflow-x 1558 // overflow-x
1556 static EOverflow initialOverflowX() { return OverflowVisible; } 1559 static EOverflow initialOverflowX() { return OverflowVisible; }
1557 EOverflow overflowX() const { 1560 EOverflow overflowX() const {
1558 return static_cast<EOverflow>(m_nonInheritedData.m_overflowX); 1561 return static_cast<EOverflow>(m_nonInheritedData.m_overflowX);
1559 } 1562 }
1560 void setOverflowX(EOverflow v) { m_nonInheritedData.m_overflowX = v; } 1563 void setOverflowX(EOverflow v) { m_nonInheritedData.m_overflowX = v; }
1561 1564
1562 // overflow-y 1565 // overflow-y
(...skipping 2513 matching lines...) Expand 10 before | Expand all | Expand 10 after
4076 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4079 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4077 } 4080 }
4078 4081
4079 inline bool ComputedStyle::hasPseudoElementStyle() const { 4082 inline bool ComputedStyle::hasPseudoElementStyle() const {
4080 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4083 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4081 } 4084 }
4082 4085
4083 } // namespace blink 4086 } // namespace blink
4084 4087
4085 #endif // ComputedStyle_h 4088 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698