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

Unified Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 2507023002: Support script modify iframe scrolling, marginWidth and marginHeight attr (Closed)
Patch Set: bokan@ comment#19 addressed Created 4 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
Index: third_party/WebKit/Source/web/WebFrame.cpp
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index 79ce1ac6b9979b00595c6cfcf32f373238e62f1c..7d20d611c090bd74ce0447ebe915433de133d9d9 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -5,6 +5,7 @@
#include "public/web/WebFrame.h"
#include "bindings/core/v8/WindowProxyManager.h"
+#include "core/HTMLNames.h"
#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
@@ -25,6 +26,8 @@
namespace blink {
+using namespace HTMLNames;
+
bool WebFrame::swap(WebFrame* frame) {
using std::swap;
Frame* oldFrame = toImplBase()->frame();
@@ -138,6 +141,19 @@ void WebFrame::setFrameOwnerProperties(
// for frames with a remote owner.
RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner());
DCHECK(owner);
+
+ Frame* frame = toImplBase()->frame();
+ DCHECK(frame);
+
+ if (frame->isLocalFrame()) {
+ LocalFrame* localFrame = toLocalFrame(frame);
+ if (localFrame->document()) {
alexmos 2016/11/21 17:56:56 I don't think you need this null check.
+ localFrame->document()->willChangeFrameOwnerProperties(
+ properties.marginWidth, properties.marginHeight,
+ static_cast<ScrollbarMode>(properties.scrollingMode));
+ }
+ }
+
owner->setScrollingMode(properties.scrollingMode);
owner->setMarginWidth(properties.marginWidth);
owner->setMarginHeight(properties.marginHeight);

Powered by Google App Engine
This is Rietveld 408576698