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

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

Issue 2673533002: Moved overflow-x and overflow-y 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 m_surround = other.m_surround; 360 m_surround = other.m_surround;
361 m_rareNonInheritedData = other.m_rareNonInheritedData; 361 m_rareNonInheritedData = other.m_rareNonInheritedData;
362 362
363 // The flags are copied one-by-one because m_nonInheritedData.m_contains a 363 // The flags are copied one-by-one because m_nonInheritedData.m_contains a
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;
371 m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY;
372 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign; 370 m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
373 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; 371 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
374 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout; 372 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
375 m_nonInheritedData.m_hasViewportUnits = 373 m_nonInheritedData.m_hasViewportUnits =
376 other.m_nonInheritedData.m_hasViewportUnits; 374 other.m_nonInheritedData.m_hasViewportUnits;
377 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; 375 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
378 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; 376 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
379 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; 377 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
380 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 378 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
381 379
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 } 803 }
806 804
807 if (boxDirection() != other.boxDirection() || 805 if (boxDirection() != other.boxDirection() ||
808 rtlOrdering() != other.rtlOrdering() || 806 rtlOrdering() != other.rtlOrdering() ||
809 textAlign() != other.textAlign() || 807 textAlign() != other.textAlign() ||
810 textTransform() != other.textTransform() || 808 textTransform() != other.textTransform() ||
811 direction() != other.direction() || whiteSpace() != other.whiteSpace() || 809 direction() != other.direction() || whiteSpace() != other.whiteSpace() ||
812 getWritingMode() != other.getWritingMode()) 810 getWritingMode() != other.getWritingMode())
813 return true; 811 return true;
814 812
815 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX || 813 if (overflowX() != other.overflowX() || overflowY() != other.overflowY() ||
816 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
817 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() || 814 clear() != other.clear() || getUnicodeBidi() != other.getUnicodeBidi() ||
818 floating() != other.floating() || 815 floating() != other.floating() ||
819 m_nonInheritedData.m_originalDisplay != 816 m_nonInheritedData.m_originalDisplay !=
820 other.m_nonInheritedData.m_originalDisplay) 817 other.m_nonInheritedData.m_originalDisplay)
821 return true; 818 return true;
822 819
823 if (isDisplayTableType(display())) { 820 if (isDisplayTableType(display())) {
824 if (borderCollapse() != other.borderCollapse() || 821 if (borderCollapse() != other.borderCollapse() ||
825 emptyCells() != other.emptyCells() || 822 emptyCells() != other.emptyCells() ||
826 captionSide() != other.captionSide() || 823 captionSide() != other.captionSide() ||
(...skipping 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 if (value < 0) 2473 if (value < 0)
2477 fvalue -= 0.5f; 2474 fvalue -= 0.5f;
2478 else 2475 else
2479 fvalue += 0.5f; 2476 fvalue += 0.5f;
2480 } 2477 }
2481 2478
2482 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2479 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2483 } 2480 }
2484 2481
2485 } // namespace blink 2482 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698