зеркало из https://github.com/electron/electron.git
feat: add new imageAnimationPolicy webpref and webContents setter (#29095)
This commit is contained in:
Родитель
79cb5144ae
Коммит
8446ce1fc7
|
@ -294,6 +294,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
|
||||||
* `allowRunningInsecureContent` Boolean (optional) - Allow an https page to run
|
* `allowRunningInsecureContent` Boolean (optional) - Allow an https page to run
|
||||||
JavaScript, CSS or plugins from http URLs. Default is `false`.
|
JavaScript, CSS or plugins from http URLs. Default is `false`.
|
||||||
* `images` Boolean (optional) - Enables image support. Default is `true`.
|
* `images` Boolean (optional) - Enables image support. Default is `true`.
|
||||||
|
* `imageAnimationPolicy` String (optional) - Specifies how to run image animations (E.g. GIFs). Can be `animate`, `animateOnce` or `noAnimation`. Default is `animate`.
|
||||||
* `textAreasAreResizable` Boolean (optional) - Make TextArea elements resizable. Default
|
* `textAreasAreResizable` Boolean (optional) - Make TextArea elements resizable. Default
|
||||||
is `true`.
|
is `true`.
|
||||||
* `webgl` Boolean (optional) - Enables WebGL support. Default is `true`.
|
* `webgl` Boolean (optional) - Enables WebGL support. Default is `true`.
|
||||||
|
|
|
@ -1923,6 +1923,20 @@ when the page becomes backgrounded. This also affects the Page Visibility API.
|
||||||
|
|
||||||
Returns `String` - the type of the webContent. Can be `backgroundPage`, `window`, `browserView`, `remote`, `webview` or `offscreen`.
|
Returns `String` - the type of the webContent. Can be `backgroundPage`, `window`, `browserView`, `remote`, `webview` or `offscreen`.
|
||||||
|
|
||||||
|
#### `contents.setImageAnimationPolicy(policy)`
|
||||||
|
|
||||||
|
* `policy` String - Can be `animate`, `animateOnce` or `noAnimation`.
|
||||||
|
|
||||||
|
Sets the image animation policy for this webContents. The policy only affects
|
||||||
|
_new_ images, existing images that are currently being animated are unaffected.
|
||||||
|
This is a known limitation in Chromium, you can force image animation to be
|
||||||
|
recalculated with `img.src = img.src` which will result in no network traffic
|
||||||
|
but will update the animation policy.
|
||||||
|
|
||||||
|
This corresponds to the [animationPolicy][] accessibility feature in Chromium.
|
||||||
|
|
||||||
|
[animationPolicy]: https://developer.chrome.com/docs/extensions/reference/accessibilityFeatures/#property-animationPolicy
|
||||||
|
|
||||||
### Instance Properties
|
### Instance Properties
|
||||||
|
|
||||||
#### `contents.audioMuted`
|
#### `contents.audioMuted`
|
||||||
|
|
|
@ -3142,6 +3142,13 @@ void WebContents::NotifyUserActivation() {
|
||||||
blink::mojom::UserActivationNotificationType::kInteraction);
|
blink::mojom::UserActivationNotificationType::kInteraction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WebContents::SetImageAnimationPolicy(const std::string& new_policy) {
|
||||||
|
auto* web_preferences = WebContentsPreferences::From(web_contents());
|
||||||
|
web_preferences->preference()->SetKey(options::kImageAnimationPolicy,
|
||||||
|
base::Value(new_policy));
|
||||||
|
web_contents()->OnWebPreferencesChanged();
|
||||||
|
}
|
||||||
|
|
||||||
v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
|
v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
|
||||||
v8::Isolate* isolate,
|
v8::Isolate* isolate,
|
||||||
const base::FilePath& file_path) {
|
const base::FilePath& file_path) {
|
||||||
|
@ -3689,6 +3696,8 @@ v8::Local<v8::ObjectTemplate> WebContents::FillObjectTemplate(
|
||||||
&WebContents::GetWebRTCIPHandlingPolicy)
|
&WebContents::GetWebRTCIPHandlingPolicy)
|
||||||
.SetMethod("_grantOriginAccess", &WebContents::GrantOriginAccess)
|
.SetMethod("_grantOriginAccess", &WebContents::GrantOriginAccess)
|
||||||
.SetMethod("takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
|
.SetMethod("takeHeapSnapshot", &WebContents::TakeHeapSnapshot)
|
||||||
|
.SetMethod("setImageAnimationPolicy",
|
||||||
|
&WebContents::SetImageAnimationPolicy)
|
||||||
.SetProperty("id", &WebContents::ID)
|
.SetProperty("id", &WebContents::ID)
|
||||||
.SetProperty("session", &WebContents::Session)
|
.SetProperty("session", &WebContents::Session)
|
||||||
.SetProperty("hostWebContents", &WebContents::HostWebContents)
|
.SetProperty("hostWebContents", &WebContents::HostWebContents)
|
||||||
|
|
|
@ -419,6 +419,7 @@ class WebContents : public gin::Wrappable<WebContents>,
|
||||||
void SetTemporaryZoomLevel(double level);
|
void SetTemporaryZoomLevel(double level);
|
||||||
void DoGetZoomLevel(
|
void DoGetZoomLevel(
|
||||||
electron::mojom::ElectronBrowser::DoGetZoomLevelCallback callback);
|
electron::mojom::ElectronBrowser::DoGetZoomLevelCallback callback);
|
||||||
|
void SetImageAnimationPolicy(const std::string& new_policy);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Does not manage lifetime of |web_contents|.
|
// Does not manage lifetime of |web_contents|.
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "shell/common/process_util.h"
|
#include "shell/common/process_util.h"
|
||||||
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
||||||
#include "third_party/blink/public/mojom/v8_cache_options.mojom.h"
|
#include "third_party/blink/public/mojom/v8_cache_options.mojom.h"
|
||||||
|
#include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom-blink.h" // nogncheck
|
||||||
|
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
#include "ui/gfx/switches.h"
|
#include "ui/gfx/switches.h"
|
||||||
|
@ -109,6 +110,26 @@ bool GetAsAutoplayPolicy(const base::Value* val,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool GetImageAnimationPolicy(const base::Value* val,
|
||||||
|
blink::mojom::ImageAnimationPolicy* out) {
|
||||||
|
std::string policy;
|
||||||
|
if (GetAsString(val, electron::options::kImageAnimationPolicy, &policy)) {
|
||||||
|
if (policy == "animate") {
|
||||||
|
*out = blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAllowed;
|
||||||
|
return true;
|
||||||
|
} else if (policy == "animateOnce") {
|
||||||
|
*out =
|
||||||
|
blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAnimateOnce;
|
||||||
|
return true;
|
||||||
|
} else if (policy == "noAnimation") {
|
||||||
|
*out =
|
||||||
|
blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyNoAnimation;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
namespace electron {
|
namespace electron {
|
||||||
|
@ -367,6 +388,7 @@ void WebContentsPreferences::OverrideWebkitPrefs(
|
||||||
prefs->javascript_enabled =
|
prefs->javascript_enabled =
|
||||||
IsEnabled(options::kJavaScript, true /* default_value */);
|
IsEnabled(options::kJavaScript, true /* default_value */);
|
||||||
prefs->images_enabled = IsEnabled(options::kImages, true /* default_value */);
|
prefs->images_enabled = IsEnabled(options::kImages, true /* default_value */);
|
||||||
|
GetImageAnimationPolicy(&preference_, &prefs->animation_policy);
|
||||||
prefs->text_areas_are_resizable =
|
prefs->text_areas_are_resizable =
|
||||||
IsEnabled(options::kTextAreasAreResizable, true /* default_value */);
|
IsEnabled(options::kTextAreasAreResizable, true /* default_value */);
|
||||||
prefs->navigate_on_drag_drop =
|
prefs->navigate_on_drag_drop =
|
||||||
|
|
|
@ -171,6 +171,9 @@ const char kJavaScript[] = "javascript";
|
||||||
// Enables image support.
|
// Enables image support.
|
||||||
const char kImages[] = "images";
|
const char kImages[] = "images";
|
||||||
|
|
||||||
|
// Image animation policy.
|
||||||
|
const char kImageAnimationPolicy[] = "imageAnimationPolicy";
|
||||||
|
|
||||||
// Make TextArea elements resizable.
|
// Make TextArea elements resizable.
|
||||||
const char kTextAreasAreResizable[] = "textAreasAreResizable";
|
const char kTextAreasAreResizable[] = "textAreasAreResizable";
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,7 @@ extern const char kNodeIntegrationInSubFrames[];
|
||||||
extern const char kDisableHtmlFullscreenWindowResize[];
|
extern const char kDisableHtmlFullscreenWindowResize[];
|
||||||
extern const char kJavaScript[];
|
extern const char kJavaScript[];
|
||||||
extern const char kImages[];
|
extern const char kImages[];
|
||||||
|
extern const char kImageAnimationPolicy[];
|
||||||
extern const char kTextAreasAreResizable[];
|
extern const char kTextAreasAreResizable[];
|
||||||
extern const char kWebGL[];
|
extern const char kWebGL[];
|
||||||
extern const char kNavigateOnDragDrop[];
|
extern const char kNavigateOnDragDrop[];
|
||||||
|
|
Загрузка…
Ссылка в новой задаче