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

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

Issue 2223133004: Removed Wrap-Flow and Wrap-Through from ComputedStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 || borderRightWidth() != other.borderRightWidth()) 527 || borderRightWidth() != other.borderRightWidth())
528 return true; 528 return true;
529 } 529 }
530 530
531 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { 531 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) {
532 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance 532 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance
533 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse 533 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse
534 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse 534 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse
535 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp 535 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp
536 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow 536 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow
537 || m_rareNonInheritedData->m_wrapFlow != other.m_rareNonInheritedDat a->m_wrapFlow
538 || m_rareNonInheritedData->m_wrapThrough != other.m_rareNonInherited Data->m_wrapThrough
539 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin 537 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin
540 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order 538 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order
541 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get() 539 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get()
542 || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri tedData->m_gridItem.get() 540 || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri tedData->m_gridItem.get()
543 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters()) 541 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters())
544 return true; 542 return true;
545 543
546 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get() 544 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get()
547 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) 545 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get())
548 return true; 546 return true;
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 if (value < 0) 1956 if (value < 0)
1959 fvalue -= 0.5f; 1957 fvalue -= 0.5f;
1960 else 1958 else
1961 fvalue += 0.5f; 1959 fvalue += 0.5f;
1962 } 1960 }
1963 1961
1964 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 1962 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
1965 } 1963 }
1966 1964
1967 } // namespace blink 1965 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698