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

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

Issue 2861773004: Move border-*-width out of BorderValue and store on SurroundData in ComputedStyle instead (Closed)
Patch Set: 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 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 889
890 return false; 890 return false;
891 } 891 }
892 892
893 bool ComputedStyle::DiffNeedsPaintInvalidationObject( 893 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
894 const ComputedStyle& other) const { 894 const ComputedStyle& other) const {
895 if (Visibility() != other.Visibility() || 895 if (Visibility() != other.Visibility() ||
896 PrintColorAdjust() != other.PrintColorAdjust() || 896 PrintColorAdjust() != other.PrintColorAdjust() ||
897 InsideLink() != other.InsideLink() || 897 InsideLink() != other.InsideLink() ||
898 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) || 898 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) ||
899 *background_data_ != *other.background_data_) 899 !BorderSizeEquals(other) || *background_data_ != *other.background_data_)
900 return true; 900 return true;
901 901
902 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { 902 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
903 if (rare_inherited_data_->user_modify != 903 if (rare_inherited_data_->user_modify !=
904 other.rare_inherited_data_->user_modify || 904 other.rare_inherited_data_->user_modify ||
905 rare_inherited_data_->user_select != 905 rare_inherited_data_->user_select !=
906 other.rare_inherited_data_->user_select || 906 other.rare_inherited_data_->user_select ||
907 rare_inherited_data_->image_rendering_ != 907 rare_inherited_data_->image_rendering_ !=
908 other.rare_inherited_data_->image_rendering_) 908 other.rare_inherited_data_->image_rendering_)
909 return true; 909 return true;
(...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after
2497 if (value < 0) 2497 if (value < 0)
2498 fvalue -= 0.5f; 2498 fvalue -= 0.5f;
2499 else 2499 else
2500 fvalue += 0.5f; 2500 fvalue += 0.5f;
2501 } 2501 }
2502 2502
2503 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2503 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2504 } 2504 }
2505 2505
2506 } // namespace blink 2506 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698