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

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

Issue 2880573002: Store border-*-style on SurroundData in ComputedStyle (Closed)
Patch Set: Merge branch 'enumClass' into borderStyle Created 3 years, 7 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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 return true; 845 return true;
846 } 846 }
847 847
848 return false; 848 return false;
849 } 849 }
850 850
851 bool ComputedStyle::DiffNeedsPaintInvalidationObject( 851 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
852 const ComputedStyle& other) const { 852 const ComputedStyle& other) const {
853 if (Visibility() != other.Visibility() || 853 if (Visibility() != other.Visibility() ||
854 PrintColorAdjust() != other.PrintColorAdjust() || 854 PrintColorAdjust() != other.PrintColorAdjust() ||
855 InsideLink() != other.InsideLink() || 855 InsideLink() != other.InsideLink() || !BorderVisuallyEqual(other) ||
856 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) || 856 !RadiiEqual(other) || *background_data_ != *other.background_data_)
857 !BorderColorVisuallyEquals(other) || !BorderSizeEquals(other) ||
858 *background_data_ != *other.background_data_)
859 return true; 857 return true;
860 858
861 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { 859 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
862 if (rare_inherited_data_->user_modify_ != 860 if (rare_inherited_data_->user_modify_ !=
863 other.rare_inherited_data_->user_modify_ || 861 other.rare_inherited_data_->user_modify_ ||
864 rare_inherited_data_->user_select_ != 862 rare_inherited_data_->user_select_ !=
865 other.rare_inherited_data_->user_select_ || 863 other.rare_inherited_data_->user_select_ ||
866 rare_inherited_data_->image_rendering_ != 864 rare_inherited_data_->image_rendering_ !=
867 other.rare_inherited_data_->image_rendering_) 865 other.rare_inherited_data_->image_rendering_)
868 return true; 866 return true;
(...skipping 1625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2494 if (value < 0) 2492 if (value < 0)
2495 fvalue -= 0.5f; 2493 fvalue -= 0.5f;
2496 else 2494 else
2497 fvalue += 0.5f; 2495 fvalue += 0.5f;
2498 } 2496 }
2499 2497
2500 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2498 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2501 } 2499 }
2502 2500
2503 } // namespace blink 2501 } // 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