summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-18 16:35:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-18 15:45:54 +0000
commit32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch)
treeeeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc
parent99677208ff3b216fdfec551fbe548da5520cd6fb (diff)
downloadqtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz
BASELINE: Update Chromium to 87.0.4280.67
Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc37
1 files changed, 17 insertions, 20 deletions
diff --git a/chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc b/chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc
index 62e009ec27b..af473686be9 100644
--- a/chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc
+++ b/chromium/third_party/blink/renderer/core/exported/web_settings_impl.cc
@@ -133,7 +133,7 @@ void WebSettingsImpl::SetMinimumLogicalFontSize(int size) {
settings_->SetMinimumLogicalFontSize(size);
}
-void WebSettingsImpl::SetAutoplayPolicy(AutoplayPolicy policy) {
+void WebSettingsImpl::SetAutoplayPolicy(web_pref::AutoplayPolicy policy) {
settings_->SetAutoplayPolicy(
static_cast<blink::AutoplayPolicy::Type>(policy));
}
@@ -234,9 +234,9 @@ void WebSettingsImpl::SetLoadsImagesAutomatically(
settings_->SetLoadsImagesAutomatically(loads_images_automatically);
}
-void WebSettingsImpl::SetImageAnimationPolicy(ImageAnimationPolicy policy) {
- settings_->SetImageAnimationPolicy(
- static_cast<blink::ImageAnimationPolicy>(policy));
+void WebSettingsImpl::SetImageAnimationPolicy(
+ web_pref::ImageAnimationPolicy policy) {
+ settings_->SetImageAnimationPolicy(policy);
}
void WebSettingsImpl::SetImagesEnabled(bool enabled) {
@@ -259,17 +259,16 @@ void WebSettingsImpl::SetAvailablePointerTypes(int pointers) {
dev_tools_emulator_->SetAvailablePointerTypes(pointers);
}
-void WebSettingsImpl::SetPrimaryPointerType(PointerType pointer) {
- dev_tools_emulator_->SetPrimaryPointerType(
- static_cast<blink::PointerType>(pointer));
+void WebSettingsImpl::SetPrimaryPointerType(ui::PointerType pointer) {
+ dev_tools_emulator_->SetPrimaryPointerType(pointer);
}
void WebSettingsImpl::SetAvailableHoverTypes(int types) {
dev_tools_emulator_->SetAvailableHoverTypes(types);
}
-void WebSettingsImpl::SetPrimaryHoverType(HoverType type) {
- dev_tools_emulator_->SetPrimaryHoverType(static_cast<blink::HoverType>(type));
+void WebSettingsImpl::SetPrimaryHoverType(ui::HoverType type) {
+ dev_tools_emulator_->SetPrimaryHoverType(type);
}
void WebSettingsImpl::SetPreferHiddenVolumeControls(bool enabled) {
@@ -465,8 +464,9 @@ void WebSettingsImpl::SetShowContextMenuOnMouseUp(bool enabled) {
settings_->SetShowContextMenuOnMouseUp(enabled);
}
-void WebSettingsImpl::SetEditingBehavior(EditingBehavior behavior) {
- settings_->SetEditingBehaviorType(static_cast<EditingBehaviorType>(behavior));
+void WebSettingsImpl::SetEditingBehavior(
+ web_pref::EditingBehaviorType behavior) {
+ settings_->SetEditingBehaviorType(behavior);
}
void WebSettingsImpl::SetHideScrollbars(bool enabled) {
@@ -660,11 +660,11 @@ void WebSettingsImpl::SetMainFrameResizesAreOrientationChanges(bool enabled) {
dev_tools_emulator_->SetMainFrameResizesAreOrientationChanges(enabled);
}
-void WebSettingsImpl::SetV8CacheOptions(V8CacheOptions options) {
- settings_->SetV8CacheOptions(static_cast<blink::V8CacheOptions>(options));
+void WebSettingsImpl::SetV8CacheOptions(mojom::blink::V8CacheOptions options) {
+ settings_->SetV8CacheOptions(options);
}
-void WebSettingsImpl::SetViewportStyle(WebViewportStyle style) {
+void WebSettingsImpl::SetViewportStyle(web_pref::ViewportStyle style) {
dev_tools_emulator_->SetViewportStyle(style);
}
@@ -792,11 +792,8 @@ void WebSettingsImpl::SetSelectionClipboardBufferAvailable(bool available) {
settings_->SetSelectionClipboardBufferAvailable(available);
}
-STATIC_ASSERT_ENUM(WebSettings::ImageAnimationPolicy::kAllowed,
- kImageAnimationPolicyAllowed);
-STATIC_ASSERT_ENUM(WebSettings::ImageAnimationPolicy::kAnimateOnce,
- kImageAnimationPolicyAnimateOnce);
-STATIC_ASSERT_ENUM(WebSettings::ImageAnimationPolicy::kNoAnimation,
- kImageAnimationPolicyNoAnimation);
+void WebSettingsImpl::SetAccessibilityIncludeSvgGElement(bool include) {
+ settings_->SetAccessibilityIncludeSvgGElement(include);
+}
} // namespace blink