summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/html/html_table_element.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 10:22:43 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:36:28 +0000
commit271a6c3487a14599023a9106329505597638d793 (patch)
treee040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/blink/renderer/core/html/html_table_element.cc
parent7b2ffa587235a47d4094787d72f38102089f402a (diff)
downloadqtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/html/html_table_element.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/html/html_table_element.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/html/html_table_element.cc b/chromium/third_party/blink/renderer/core/html/html_table_element.cc
index ab1dbc2a5b9..6f718881568 100644
--- a/chromium/third_party/blink/renderer/core/html/html_table_element.cc
+++ b/chromium/third_party/blink/renderer/core/html/html_table_element.cc
@@ -28,6 +28,7 @@
#include "third_party/blink/renderer/core/css/css_identifier_value.h"
#include "third_party/blink/renderer/core/css/css_image_value.h"
#include "third_party/blink/renderer/core/css/css_inherited_value.h"
+#include "third_party/blink/renderer/core/css/css_numeric_literal_value.h"
#include "third_party/blink/renderer/core/css/css_property_names.h"
#include "third_party/blink/renderer/core/css/css_property_value_set.h"
#include "third_party/blink/renderer/core/css/style_change_reason.h"
@@ -35,7 +36,6 @@
#include "third_party/blink/renderer/core/dom/attribute.h"
#include "third_party/blink/renderer/core/dom/element_traversal.h"
#include "third_party/blink/renderer/core/dom/node_lists_node_data.h"
-#include "third_party/blink/renderer/core/frame/use_counter.h"
#include "third_party/blink/renderer/core/html/html_table_caption_element.h"
#include "third_party/blink/renderer/core/html/html_table_cell_element.h"
#include "third_party/blink/renderer/core/html/html_table_row_element.h"
@@ -45,6 +45,7 @@
#include "third_party/blink/renderer/core/html_names.h"
#include "third_party/blink/renderer/platform/bindings/exception_state.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
+#include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
#include "third_party/blink/renderer/platform/weborigin/referrer.h"
#include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
@@ -329,7 +330,8 @@ void HTMLTableElement::CollectStyleForPresentationAttribute(
CSSImageValue* image_value =
CSSImageValue::Create(url, GetDocument().CompleteURL(url),
Referrer(GetDocument().OutgoingReferrer(),
- GetDocument().GetReferrerPolicy()));
+ GetDocument().GetReferrerPolicy()),
+ OriginClean::kTrue);
style->SetProperty(
CSSPropertyValue(GetCSSPropertyBackgroundImage(), *image_value));
}
@@ -531,18 +533,18 @@ CSSPropertyValueSet* HTMLTableElement::CreateSharedCellStyle() {
*CSSInheritedValue::Create());
break;
case kSolidBorders:
- style->SetProperty(
- CSSPropertyID::kBorderWidth,
- *CSSPrimitiveValue::Create(1, CSSPrimitiveValue::UnitType::kPixels));
+ style->SetProperty(CSSPropertyID::kBorderWidth,
+ *CSSNumericLiteralValue::Create(
+ 1, CSSPrimitiveValue::UnitType::kPixels));
style->SetProperty(CSSPropertyID::kBorderStyle,
*CSSIdentifierValue::Create(CSSValueID::kSolid));
style->SetProperty(CSSPropertyID::kBorderColor,
*CSSInheritedValue::Create());
break;
case kInsetBorders:
- style->SetProperty(
- CSSPropertyID::kBorderWidth,
- *CSSPrimitiveValue::Create(1, CSSPrimitiveValue::UnitType::kPixels));
+ style->SetProperty(CSSPropertyID::kBorderWidth,
+ *CSSNumericLiteralValue::Create(
+ 1, CSSPrimitiveValue::UnitType::kPixels));
style->SetProperty(CSSPropertyID::kBorderStyle,
*CSSIdentifierValue::Create(CSSValueID::kInset));
style->SetProperty(CSSPropertyID::kBorderColor,
@@ -556,7 +558,7 @@ CSSPropertyValueSet* HTMLTableElement::CreateSharedCellStyle() {
if (padding_)
style->SetProperty(CSSPropertyID::kPadding,
- *CSSPrimitiveValue::Create(
+ *CSSNumericLiteralValue::Create(
padding_, CSSPrimitiveValue::UnitType::kPixels));
return style;