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

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: Removed stale comment and rebase 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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 || borderRightWidth() != other.borderRightWidth()) 528 || borderRightWidth() != other.borderRightWidth())
529 return true; 529 return true;
530 } 530 }
531 531
532 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) { 532 if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) {
533 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance 533 if (m_rareNonInheritedData->m_appearance != other.m_rareNonInheritedData ->m_appearance
534 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse 534 || m_rareNonInheritedData->marginBeforeCollapse != other.m_rareNonIn heritedData->marginBeforeCollapse
535 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse 535 || m_rareNonInheritedData->marginAfterCollapse != other.m_rareNonInh eritedData->marginAfterCollapse
536 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp 536 || m_rareNonInheritedData->lineClamp != other.m_rareNonInheritedData ->lineClamp
537 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow 537 || m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedD ata->textOverflow
538 || m_rareNonInheritedData->m_wrapFlow != other.m_rareNonInheritedDat a->m_wrapFlow
539 || m_rareNonInheritedData->m_wrapThrough != other.m_rareNonInherited Data->m_wrapThrough
540 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin 538 || m_rareNonInheritedData->m_shapeMargin != other.m_rareNonInherited Data->m_shapeMargin
541 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order 539 || m_rareNonInheritedData->m_order != other.m_rareNonInheritedData-> m_order
542 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get() 540 || m_rareNonInheritedData->m_grid.get() != other.m_rareNonInheritedD ata->m_grid.get()
543 || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri tedData->m_gridItem.get() 541 || m_rareNonInheritedData->m_gridItem.get() != other.m_rareNonInheri tedData->m_gridItem.get()
544 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters()) 542 || m_rareNonInheritedData->hasFilters() != other.m_rareNonInheritedD ata->hasFilters())
545 return true; 543 return true;
546 544
547 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get() 545 if (m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.m_rar eNonInheritedData->m_deprecatedFlexibleBox.get()
548 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get()) 546 && *m_rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other. m_rareNonInheritedData->m_deprecatedFlexibleBox.get())
549 return true; 547 return true;
(...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1966 if (value < 0) 1964 if (value < 0)
1967 fvalue -= 0.5f; 1965 fvalue -= 0.5f;
1968 else 1966 else
1969 fvalue += 0.5f; 1967 fvalue += 0.5f;
1970 } 1968 }
1971 1969
1972 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 1970 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
1973 } 1971 }
1974 1972
1975 } // namespace blink 1973 } // 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