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

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

Issue 2895933004: Pass the correct BorderWidth value when creating BorderValues (Closed)
Patch Set: add computedstyle unit tes 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2761 matching lines...) Expand 10 before | Expand all | Expand 10 after
2772 bool HasBorderImageOutsets() const { 2772 bool HasBorderImageOutsets() const {
2773 return BorderImage().HasImage() && BorderImage().Outset().NonZero(); 2773 return BorderImage().HasImage() && BorderImage().Outset().NonZero();
2774 } 2774 }
2775 LayoutRectOutsets BorderImageOutsets() const { 2775 LayoutRectOutsets BorderImageOutsets() const {
2776 return ImageOutsets(BorderImage()); 2776 return ImageOutsets(BorderImage());
2777 } 2777 }
2778 bool BorderImageSlicesFill() const { return BorderImage().Fill(); } 2778 bool BorderImageSlicesFill() const { return BorderImage().Fill(); }
2779 2779
2780 void SetBorderImageSlicesFill(bool); 2780 void SetBorderImageSlicesFill(bool);
2781 const BorderValue BorderLeft() const { 2781 const BorderValue BorderLeft() const {
2782 return BorderValue(BorderLeftStyle(), BorderLeftColor(), BorderLeftWidth(), 2782 return BorderValue(
2783 OutlineStyleIsAuto()); 2783 BorderLeftStyle(), BorderLeftColor(),
2784 static_cast<float>(BorderLeftWidthInternal()) / kBorderWidthDenominator,
2785 OutlineStyleIsAuto());
2784 } 2786 }
2785 const BorderValue BorderRight() const { 2787 const BorderValue BorderRight() const {
2786 return BorderValue(BorderRightStyle(), BorderRightColor(), 2788 return BorderValue(BorderRightStyle(), BorderRightColor(),
2787 BorderRightWidth(), OutlineStyleIsAuto()); 2789 static_cast<float>(BorderRightWidthInternal()) /
2790 kBorderWidthDenominator,
2791 OutlineStyleIsAuto());
2788 } 2792 }
2789 const BorderValue BorderTop() const { 2793 const BorderValue BorderTop() const {
2790 return BorderValue(BorderTopStyle(), BorderTopColor(), BorderTopWidth(), 2794 return BorderValue(
2791 OutlineStyleIsAuto()); 2795 BorderTopStyle(), BorderTopColor(),
2796 static_cast<float>(BorderTopWidthInternal()) / kBorderWidthDenominator,
2797 OutlineStyleIsAuto());
2792 } 2798 }
2793 const BorderValue BorderBottom() const { 2799 const BorderValue BorderBottom() const {
2794 return BorderValue(BorderBottomStyle(), BorderBottomColor(), 2800 return BorderValue(BorderBottomStyle(), BorderBottomColor(),
2795 BorderBottomWidth(), OutlineStyleIsAuto()); 2801 static_cast<float>(BorderBottomWidthInternal()) /
2802 kBorderWidthDenominator,
2803 OutlineStyleIsAuto());
2796 } 2804 }
2797 2805
2798 bool BorderSizeEquals(const ComputedStyle& o) const { 2806 bool BorderSizeEquals(const ComputedStyle& o) const {
2799 return BorderWidthEquals(BorderLeftWidth(), o.BorderLeftWidth()) && 2807 return BorderWidthEquals(BorderLeftWidth(), o.BorderLeftWidth()) &&
2800 BorderWidthEquals(BorderTopWidth(), o.BorderTopWidth()) && 2808 BorderWidthEquals(BorderTopWidth(), o.BorderTopWidth()) &&
2801 BorderWidthEquals(BorderRightWidth(), o.BorderRightWidth()) && 2809 BorderWidthEquals(BorderRightWidth(), o.BorderRightWidth()) &&
2802 BorderWidthEquals(BorderBottomWidth(), o.BorderBottomWidth()); 2810 BorderWidthEquals(BorderBottomWidth(), o.BorderBottomWidth());
2803 } 2811 }
2804 2812
2805 BorderValue BorderBefore() const; 2813 BorderValue BorderBefore() const;
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
3766 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3774 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3767 } 3775 }
3768 3776
3769 inline bool ComputedStyle::HasPseudoElementStyle() const { 3777 inline bool ComputedStyle::HasPseudoElementStyle() const {
3770 return PseudoBitsInternal() & kElementPseudoIdMask; 3778 return PseudoBitsInternal() & kElementPseudoIdMask;
3771 } 3779 }
3772 3780
3773 } // namespace blink 3781 } // namespace blink
3774 3782
3775 #endif // ComputedStyle_h 3783 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698