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

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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_overflowAnchor = 370 m_nonInheritedData.m_overflowAnchor =
371 other.m_nonInheritedData.m_overflowAnchor; 371 other.m_nonInheritedData.m_overflowAnchor;
372 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX; 372 m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX;
373 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY; 373 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY;
374 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; 374 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
375 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; 375 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
376 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
377 m_nonInheritedData.m_hasViewportUnits = 376 m_nonInheritedData.m_hasViewportUnits =
378 other.m_nonInheritedData.m_hasViewportUnits; 377 other.m_nonInheritedData.m_hasViewportUnits;
379 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; 378 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
380 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; 379 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
381 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; 380 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
382 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 381 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
383 382
384 // Correctly set during selector matching: 383 // Correctly set during selector matching:
385 // m_nonInheritedData.m_styleType 384 // m_nonInheritedData.m_styleType
386 // m_nonInheritedData.m_pseudoBits 385 // m_nonInheritedData.m_pseudoBits
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() || 818 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() ||
820 floating() != other.floating() || 819 floating() != other.floating() ||
821 m_nonInheritedData.m_originalDisplay != 820 m_nonInheritedData.m_originalDisplay !=
822 other.m_nonInheritedData.m_originalDisplay) 821 other.m_nonInheritedData.m_originalDisplay)
823 return true; 822 return true;
824 823
825 if (isDisplayTableType(display())) { 824 if (isDisplayTableType(display())) {
826 if (borderCollapse() != other.borderCollapse() || 825 if (borderCollapse() != other.borderCollapse() ||
827 emptyCells() != other.emptyCells() || 826 emptyCells() != other.emptyCells() ||
828 captionSide() != other.captionSide() || 827 captionSide() != other.captionSide() ||
829 m_nonInheritedData.m_tableLayout != 828 tableLayout() != other.tableLayout())
830 other.m_nonInheritedData.m_tableLayout)
831 return true; 829 return true;
832 830
833 // In the collapsing border model, 'hidden' suppresses other borders, while 831 // In the collapsing border model, 'hidden' suppresses other borders, while
834 // 'none' does not, so these style differences can be width differences. 832 // 'none' does not, so these style differences can be width differences.
835 if ((borderCollapse() == EBorderCollapse::kCollapse) && 833 if ((borderCollapse() == EBorderCollapse::kCollapse) &&
836 ((borderTopStyle() == BorderStyleHidden && 834 ((borderTopStyle() == BorderStyleHidden &&
837 other.borderTopStyle() == BorderStyleNone) || 835 other.borderTopStyle() == BorderStyleNone) ||
838 (borderTopStyle() == BorderStyleNone && 836 (borderTopStyle() == BorderStyleNone &&
839 other.borderTopStyle() == BorderStyleHidden) || 837 other.borderTopStyle() == BorderStyleHidden) ||
840 (borderBottomStyle() == BorderStyleHidden && 838 (borderBottomStyle() == BorderStyleHidden &&
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2478 if (value < 0) 2476 if (value < 0)
2479 fvalue -= 0.5f; 2477 fvalue -= 0.5f;
2480 else 2478 else
2481 fvalue += 0.5f; 2479 fvalue += 0.5f;
2482 } 2480 }
2483 2481
2484 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2485 } 2483 }
2486 2484
2487 } // namespace blink 2485 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698