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

Unified Diff: content/common/frame_owner_properties.cc

Issue 2688803004: Move usage of WebString methods into renderer for FrameOwnerProperties (Closed)
Patch Set: fix rebase 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
« no previous file with comments | « content/common/frame_owner_properties.h ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/frame_owner_properties.cc
diff --git a/content/common/frame_owner_properties.cc b/content/common/frame_owner_properties.cc
index fb6c0d3acaf9360d3f8217210fbb4192d6087ae4..ef7dac1351ffe9c497944152533c1ffa8afaa858 100644
--- a/content/common/frame_owner_properties.cc
+++ b/content/common/frame_owner_properties.cc
@@ -16,38 +16,8 @@ FrameOwnerProperties::FrameOwnerProperties()
FrameOwnerProperties::FrameOwnerProperties(const FrameOwnerProperties& other) =
default;
-FrameOwnerProperties::FrameOwnerProperties(
- const blink::WebFrameOwnerProperties& web_frame_owner_properties)
- : name(web_frame_owner_properties.name.utf8()),
- scrolling_mode(web_frame_owner_properties.scrollingMode),
- margin_width(web_frame_owner_properties.marginWidth),
- margin_height(web_frame_owner_properties.marginHeight),
- allow_fullscreen(web_frame_owner_properties.allowFullscreen),
- allow_payment_request(web_frame_owner_properties.allowPaymentRequest),
- required_csp(web_frame_owner_properties.requiredCsp.utf8()),
- delegated_permissions(
- web_frame_owner_properties.delegatedPermissions.begin(),
- web_frame_owner_properties.delegatedPermissions.end()) {}
-
FrameOwnerProperties::~FrameOwnerProperties() {}
-blink::WebFrameOwnerProperties FrameOwnerProperties::ToWebFrameOwnerProperties()
- const {
- blink::WebFrameOwnerProperties result;
-
- result.name = blink::WebString::fromUTF8(name);
- result.scrollingMode = scrolling_mode;
- result.marginWidth = margin_width;
- result.marginHeight = margin_height;
- result.allowFullscreen = allow_fullscreen;
- result.allowPaymentRequest = allow_payment_request;
- result.requiredCsp = blink::WebString::fromUTF8(required_csp);
- result.delegatedPermissions =
- blink::WebVector<blink::mojom::PermissionName>(delegated_permissions);
-
- return result;
-}
-
bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const {
return name == other.name &&
scrolling_mode == other.scrolling_mode &&
« no previous file with comments | « content/common/frame_owner_properties.h ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698