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

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

Issue 2669433002: Moved table-layout property to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase Created 3 years, 10 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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // bunch of stuff other than real style data. 364 // bunch of stuff other than real style data.
365 // See comments for each skipped flag below. 365 // See comments for each skipped flag below.
366 m_nonInheritedData.m_effectiveDisplay = 366 m_nonInheritedData.m_effectiveDisplay =
367 other.m_nonInheritedData.m_effectiveDisplay; 367 other.m_nonInheritedData.m_effectiveDisplay;
368 m_nonInheritedData.m_originalDisplay = 368 m_nonInheritedData.m_originalDisplay =
369 other.m_nonInheritedData.m_originalDisplay; 369 other.m_nonInheritedData.m_originalDisplay;
370 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; 370 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX;
371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; 371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY;
372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; 372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
373 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; 373 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
374 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
375 m_nonInheritedData.m_hasViewportUnits = 374 m_nonInheritedData.m_hasViewportUnits =
376 other.m_nonInheritedData.m_hasViewportUnits; 375 other.m_nonInheritedData.m_hasViewportUnits;
377 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; 376 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
378 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; 377 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
379 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; 378 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
380 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 379 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
381 380
382 // Correctly set during selector matching: 381 // Correctly set during selector matching:
383 // m_nonInheritedData.m_styleType 382 // m_nonInheritedData.m_styleType
384 // m_nonInheritedData.m_pseudoBits 383 // m_nonInheritedData.m_pseudoBits
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() || 816 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() ||
818 floating() != other.floating() || 817 floating() != other.floating() ||
819 m_nonInheritedData.m_originalDisplay != 818 m_nonInheritedData.m_originalDisplay !=
820 other.m_nonInheritedData.m_originalDisplay) 819 other.m_nonInheritedData.m_originalDisplay)
821 return true; 820 return true;
822 821
823 if (isDisplayTableType(display())) { 822 if (isDisplayTableType(display())) {
824 if (borderCollapse() != other.borderCollapse() || 823 if (borderCollapse() != other.borderCollapse() ||
825 emptyCells() != other.emptyCells() || 824 emptyCells() != other.emptyCells() ||
826 captionSide() != other.captionSide() || 825 captionSide() != other.captionSide() ||
827 m_nonInheritedData.m_tableLayout != 826 tableLayout() != other.tableLayout())
828 other.m_nonInheritedData.m_tableLayout)
829 return true; 827 return true;
830 828
831 // In the collapsing border model, 'hidden' suppresses other borders, while 829 // In the collapsing border model, 'hidden' suppresses other borders, while
832 // 'none' does not, so these style differences can be width differences. 830 // 'none' does not, so these style differences can be width differences.
833 if ((borderCollapse() == EBorderCollapse::kCollapse) && 831 if ((borderCollapse() == EBorderCollapse::kCollapse) &&
834 ((borderTopStyle() == BorderStyleHidden && 832 ((borderTopStyle() == BorderStyleHidden &&
835 other.borderTopStyle() == BorderStyleNone) || 833 other.borderTopStyle() == BorderStyleNone) ||
836 (borderTopStyle() == BorderStyleNone && 834 (borderTopStyle() == BorderStyleNone &&
837 other.borderTopStyle() == BorderStyleHidden) || 835 other.borderTopStyle() == BorderStyleHidden) ||
838 (borderBottomStyle() == BorderStyleHidden && 836 (borderBottomStyle() == BorderStyleHidden &&
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 if (value < 0) 2474 if (value < 0)
2477 fvalue -= 0.5f; 2475 fvalue -= 0.5f;
2478 else 2476 else
2479 fvalue += 0.5f; 2477 fvalue += 0.5f;
2480 } 2478 }
2481 2479
2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2480 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2483 } 2481 }
2484 2482
2485 } // namespace blink 2483 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698