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

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

Issue 2880573002: Store border-*-style on SurroundData in ComputedStyle (Closed)
Patch Set: Store border-*-style on SurroundData 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 return true; 863 return true;
864 } 864 }
865 865
866 return false; 866 return false;
867 } 867 }
868 868
869 bool ComputedStyle::DiffNeedsPaintInvalidationObject( 869 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
870 const ComputedStyle& other) const { 870 const ComputedStyle& other) const {
871 if (Visibility() != other.Visibility() || 871 if (Visibility() != other.Visibility() ||
872 PrintColorAdjust() != other.PrintColorAdjust() || 872 PrintColorAdjust() != other.PrintColorAdjust() ||
873 InsideLink() != other.InsideLink() || 873 InsideLink() != other.InsideLink() || !BorderVisuallyEqual(other) ||
874 !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) || 874 !RadiiEqual(other) || *background_data_ != *other.background_data_)
875 !BorderColorVisuallyEquals(other) || !BorderSizeEquals(other) ||
876 *background_data_ != *other.background_data_)
877 return true; 875 return true;
878 876
879 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) { 877 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
880 if (rare_inherited_data_->user_modify_ != 878 if (rare_inherited_data_->user_modify_ !=
881 other.rare_inherited_data_->user_modify_ || 879 other.rare_inherited_data_->user_modify_ ||
882 rare_inherited_data_->user_select_ != 880 rare_inherited_data_->user_select_ !=
883 other.rare_inherited_data_->user_select_ || 881 other.rare_inherited_data_->user_select_ ||
884 rare_inherited_data_->image_rendering_ != 882 rare_inherited_data_->image_rendering_ !=
885 other.rare_inherited_data_->image_rendering_) 883 other.rare_inherited_data_->image_rendering_)
886 return true; 884 return true;
(...skipping 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after
2510 if (value < 0) 2508 if (value < 0)
2511 fvalue -= 0.5f; 2509 fvalue -= 0.5f;
2512 else 2510 else
2513 fvalue += 0.5f; 2511 fvalue += 0.5f;
2514 } 2512 }
2515 2513
2516 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2514 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2517 } 2515 }
2518 2516
2519 } // namespace blink 2517 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698