Index: third_party/WebKit/Source/core/style/BorderValue.h |
diff --git a/third_party/WebKit/Source/core/style/BorderValue.h b/third_party/WebKit/Source/core/style/BorderValue.h |
index 0c71ba0f4820070fbb9b8a98faf0af6dcd0915b3..2682ced9a910bee2f59f82dd628266644aee489c 100644 |
--- a/third_party/WebKit/Source/core/style/BorderValue.h |
+++ b/third_party/WebKit/Source/core/style/BorderValue.h |
@@ -26,7 +26,7 @@ |
#define BorderValue_h |
#include "core/css/StyleColor.h" |
-#include "core/style/BorderColorAndStyle.h" |
+#include "core/style/BorderStyle.h" |
#include "core/style/ComputedStyleConstants.h" |
#include "platform/graphics/Color.h" |
#include "platform/wtf/Allocator.h" |
@@ -46,9 +46,8 @@ class BorderValue { |
SetWidth(3); |
} |
- BorderValue(const BorderColorAndStyle& data, float width) { |
- SetColor(data.GetColor()); |
- SetColorIsCurrentColor(ColorIsCurrentColor()); |
+ BorderValue(const BorderStyle& data, const StyleColor& color, float width) { |
+ SetColor(color.Resolve(Color())); |
SetStyle(data.Style()); |
SetIsAuto(data.IsAuto()); |
SetWidth(width); |