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

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

Issue 2627563002: Generated unicode-bidi in ComputedStyleBase (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_clear = other.m_nonInheritedData.m_clear; 375 m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear;
376 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position; 376 m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
377 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout; 377 m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
378 m_nonInheritedData.m_unicodeBidi = other.m_nonInheritedData.m_unicodeBidi;
379 m_nonInheritedData.m_hasViewportUnits = 378 m_nonInheritedData.m_hasViewportUnits =
380 other.m_nonInheritedData.m_hasViewportUnits; 379 other.m_nonInheritedData.m_hasViewportUnits;
381 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore; 380 m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
382 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter; 381 m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
383 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside; 382 m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
384 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits; 383 m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
385 384
386 // Correctly set during selector matching: 385 // Correctly set during selector matching:
387 // m_nonInheritedData.m_styleType 386 // m_nonInheritedData.m_styleType
388 // m_nonInheritedData.m_pseudoBits 387 // m_nonInheritedData.m_pseudoBits
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering || 811 m_inheritedData.m_rtlOrdering != other.m_inheritedData.m_rtlOrdering ||
813 textAlign() != other.textAlign() || 812 textAlign() != other.textAlign() ||
814 textTransform() != other.textTransform() || 813 textTransform() != other.textTransform() ||
815 direction() != other.direction() || whiteSpace() != other.whiteSpace() || 814 direction() != other.direction() || whiteSpace() != other.whiteSpace() ||
816 getWritingMode() != other.getWritingMode()) 815 getWritingMode() != other.getWritingMode())
817 return true; 816 return true;
818 817
819 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX || 818 if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX ||
820 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY || 819 m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY ||
821 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear || 820 m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear ||
822 m_nonInheritedData.m_unicodeBidi != 821 getUnicodeBidi() != other.getUnicodeBidi() ||
823 other.m_nonInheritedData.m_unicodeBidi ||
824 floating() != other.floating() || 822 floating() != other.floating() ||
825 m_nonInheritedData.m_originalDisplay != 823 m_nonInheritedData.m_originalDisplay !=
826 other.m_nonInheritedData.m_originalDisplay) 824 other.m_nonInheritedData.m_originalDisplay)
827 return true; 825 return true;
828 826
829 if (isDisplayTableType(display())) { 827 if (isDisplayTableType(display())) {
830 if (borderCollapse() != other.borderCollapse() || 828 if (borderCollapse() != other.borderCollapse() ||
831 emptyCells() != other.emptyCells() || 829 emptyCells() != other.emptyCells() ||
832 captionSide() != other.captionSide() || 830 captionSide() != other.captionSide() ||
833 m_nonInheritedData.m_tableLayout != 831 m_nonInheritedData.m_tableLayout !=
(...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
2463 if (value < 0) 2461 if (value < 0)
2464 fvalue -= 0.5f; 2462 fvalue -= 0.5f;
2465 else 2463 else
2466 fvalue += 0.5f; 2464 fvalue += 0.5f;
2467 } 2465 }
2468 2466
2469 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2467 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2470 } 2468 }
2471 2469
2472 } // namespace blink 2470 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698