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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2640143005: Support subpixel layout for borders. (Closed)
Patch Set: Rebaselined tests. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 60568dbb9c73833d2c8826f4b5e160f0e7f250b6..efcd7c32dc485c84690ba3699af214e344131bf6 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -63,7 +63,7 @@ namespace blink {
struct SameSizeAsBorderValue {
RGBA32 m_color;
- unsigned m_width;
+ unsigned m_bitfield;
};
ASSERT_SIZE(BorderValue, SameSizeAsBorderValue);
@@ -1496,12 +1496,13 @@ FloatRoundedRect ComputedStyle::getRoundedInnerBorderFor(
bool horizontal = isHorizontalWritingMode();
int leftWidth =
- (!horizontal || includeLogicalLeftEdge) ? borderLeftWidth() : 0;
+ (!horizontal || includeLogicalLeftEdge) ? roundf(borderLeftWidth()) : 0;
int rightWidth =
- (!horizontal || includeLogicalRightEdge) ? borderRightWidth() : 0;
- int topWidth = (horizontal || includeLogicalLeftEdge) ? borderTopWidth() : 0;
+ (!horizontal || includeLogicalRightEdge) ? roundf(borderRightWidth()) : 0;
+ int topWidth =
+ (horizontal || includeLogicalLeftEdge) ? roundf(borderTopWidth()) : 0;
int bottomWidth =
- (horizontal || includeLogicalRightEdge) ? borderBottomWidth() : 0;
+ (horizontal || includeLogicalRightEdge) ? roundf(borderBottomWidth()) : 0;
return getRoundedInnerBorderFor(
borderRect,
@@ -2218,7 +2219,7 @@ const BorderValue& ComputedStyle::borderEnd() const {
return isLeftToRightDirection() ? borderBottom() : borderTop();
}
-int ComputedStyle::borderBeforeWidth() const {
+float ComputedStyle::borderBeforeWidth() const {
switch (getWritingMode()) {
case WritingMode::kHorizontalTb:
return borderTopWidth();
@@ -2231,7 +2232,7 @@ int ComputedStyle::borderBeforeWidth() const {
return borderTopWidth();
}
-int ComputedStyle::borderAfterWidth() const {
+float ComputedStyle::borderAfterWidth() const {
switch (getWritingMode()) {
case WritingMode::kHorizontalTb:
return borderBottomWidth();
@@ -2244,23 +2245,23 @@ int ComputedStyle::borderAfterWidth() const {
return borderBottomWidth();
}
-int ComputedStyle::borderStartWidth() const {
+float ComputedStyle::borderStartWidth() const {
if (isHorizontalWritingMode())
return isLeftToRightDirection() ? borderLeftWidth() : borderRightWidth();
return isLeftToRightDirection() ? borderTopWidth() : borderBottomWidth();
}
-int ComputedStyle::borderEndWidth() const {
+float ComputedStyle::borderEndWidth() const {
if (isHorizontalWritingMode())
return isLeftToRightDirection() ? borderRightWidth() : borderLeftWidth();
return isLeftToRightDirection() ? borderBottomWidth() : borderTopWidth();
}
-int ComputedStyle::borderOverWidth() const {
+float ComputedStyle::borderOverWidth() const {
return isHorizontalWritingMode() ? borderTopWidth() : borderRightWidth();
}
-int ComputedStyle::borderUnderWidth() const {
+float ComputedStyle::borderUnderWidth() const {
return isHorizontalWritingMode() ? borderBottomWidth() : borderLeftWidth();
}
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/platform/text/TextStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698