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

Unified Diff: components/html_viewer/html_frame.cc

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_unittests compile fix Created 5 years, 1 month 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 | « components/html_viewer/html_frame.h ('k') | components/printing/renderer/print_web_view_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index dea99e980c37e8884883faae06f38ae825a33a29..17cfb34e71f9d74814adc17272eee6dad80c5db0 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -52,6 +52,7 @@
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebFindOptions.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -190,7 +191,9 @@ HTMLFrame::HTMLFrame(CreateParams* params)
CHECK(!parent_->IsLocal());
web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createLocalChild(
state_.tree_scope, state_.name, state_.sandbox_flags, this,
- previous_web_frame);
+ previous_web_frame,
+ // TODO(lazyboy): Replicate WebFrameOwnerProperties where needed.
+ blink::WebFrameOwnerProperties());
CreateLocalRootWebWidget(web_frame_->toWebLocalFrame());
} else if (!parent_->IsLocal()) {
web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createRemoteChild(
@@ -324,7 +327,8 @@ blink::WebFrame* HTMLFrame::createChildFrame(
blink::WebLocalFrame* parent,
blink::WebTreeScopeType scope,
const blink::WebString& frame_name,
- blink::WebSandboxFlags sandbox_flags) {
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties) {
DCHECK(IsLocal()); // Can't create children of remote frames.
DCHECK_EQ(parent, web_frame_);
DCHECK(window_); // If we're local we have to have a window.
@@ -681,7 +685,9 @@ void HTMLFrame::SwapToLocal(
blink::WebLocalFrame* local_web_frame =
blink::WebLocalFrame::create(state_.tree_scope, this);
local_web_frame->initializeToReplaceRemoteFrame(
- web_frame_->toWebRemoteFrame(), state_.name, state_.sandbox_flags);
+ web_frame_->toWebRemoteFrame(), state_.name, state_.sandbox_flags,
+ // TODO(lazyboy): Figure out replicating WebFrameOwnerProperties.
+ blink::WebFrameOwnerProperties());
// The swap() ends up calling to frameDetached() and deleting the old.
web_frame_->swap(local_web_frame);
web_frame_ = local_web_frame;
« no previous file with comments | « components/html_viewer/html_frame.h ('k') | components/printing/renderer/print_web_view_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698