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

Unified Diff: content/renderer/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/renderer/frame_owner_properties.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/frame_owner_properties.cc
diff --git a/content/renderer/frame_owner_properties.cc b/content/renderer/frame_owner_properties.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d885fa1b426b5aaad26fdb66ffd57800336e95f9
--- /dev/null
+++ b/content/renderer/frame_owner_properties.cc
@@ -0,0 +1,51 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/renderer/frame_owner_properties.h"
+
+#include <algorithm>
+#include <iterator>
+
+#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
+
+namespace content {
+
+FrameOwnerProperties ConvertWebFrameOwnerPropertiesToFrameOwnerProperties(
+ const blink::WebFrameOwnerProperties& web_frame_owner_properties) {
+ FrameOwnerProperties result;
+
+ result.name = web_frame_owner_properties.name.utf8();
+ result.scrolling_mode = web_frame_owner_properties.scrollingMode;
+ result.margin_width = web_frame_owner_properties.marginWidth;
+ result.margin_height = web_frame_owner_properties.marginHeight;
+ result.allow_fullscreen = web_frame_owner_properties.allowFullscreen;
+ result.allow_payment_request = web_frame_owner_properties.allowPaymentRequest;
+ result.required_csp = web_frame_owner_properties.requiredCsp.utf8();
+ std::copy(web_frame_owner_properties.delegatedPermissions.begin(),
+ web_frame_owner_properties.delegatedPermissions.end(),
+ std::back_inserter(result.delegated_permissions));
+
+ return result;
+}
+
+blink::WebFrameOwnerProperties
+ConvertFrameOwnerPropertiesToWebFrameOwnerProperties(
+ const FrameOwnerProperties& frame_owner_properties) {
+ blink::WebFrameOwnerProperties result;
+
+ result.name = blink::WebString::fromUTF8(frame_owner_properties.name);
+ result.scrollingMode = frame_owner_properties.scrolling_mode;
+ result.marginWidth = frame_owner_properties.margin_width;
+ result.marginHeight = frame_owner_properties.margin_height;
+ result.allowFullscreen = frame_owner_properties.allow_fullscreen;
+ result.allowPaymentRequest = frame_owner_properties.allow_payment_request;
+ result.requiredCsp =
+ blink::WebString::fromUTF8(frame_owner_properties.required_csp);
+ result.delegatedPermissions = blink::WebVector<blink::mojom::PermissionName>(
+ frame_owner_properties.delegated_permissions);
+
+ return result;
+}
+
+} // namespace content
« no previous file with comments | « content/renderer/frame_owner_properties.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698