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

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: ... and without breaking stuff. Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 owner->SetScrollingMode(properties.scrolling_mode); 164 owner->SetScrollingMode(properties.scrolling_mode);
165 owner->SetMarginWidth(properties.margin_width); 165 owner->SetMarginWidth(properties.margin_width);
166 owner->SetMarginHeight(properties.margin_height); 166 owner->SetMarginHeight(properties.margin_height);
167 owner->SetAllowFullscreen(properties.allow_fullscreen); 167 owner->SetAllowFullscreen(properties.allow_fullscreen);
168 owner->SetAllowPaymentRequest(properties.allow_payment_request); 168 owner->SetAllowPaymentRequest(properties.allow_payment_request);
169 owner->SetIsDisplayNone(properties.is_display_none); 169 owner->SetIsDisplayNone(properties.is_display_none);
170 owner->SetCsp(properties.required_csp); 170 owner->SetCsp(properties.required_csp);
171 owner->SetAllowedFeatures(properties.allowed_features); 171 owner->SetAllowedFeatures(properties.allowed_features);
172 } 172 }
173 173
174 void WebFrame::Collapse(bool collapsed) {
175 FrameOwner* owner = ToImplBase()->GetFrame()->Owner();
176 DCHECK(owner->IsLocal());
177 ToHTMLFrameOwnerElement(owner)->SetCollapsedByClient(collapsed);
178 }
179
174 WebFrame* WebFrame::Opener() const { 180 WebFrame* WebFrame::Opener() const {
175 return opener_; 181 return opener_;
176 } 182 }
177 183
178 void WebFrame::SetOpener(WebFrame* opener) { 184 void WebFrame::SetOpener(WebFrame* opener) {
179 if (opener_) 185 if (opener_)
180 opener_->opened_frame_tracker_->Remove(this); 186 opener_->opened_frame_tracker_->Remove(this);
181 if (opener) 187 if (opener)
182 opener->opened_frame_tracker_->Add(this); 188 opener->opened_frame_tracker_->Add(this);
183 opener_ = opener; 189 opener_ = opener;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 for (WebFrame* child = frame->FirstChild(); child; 322 for (WebFrame* child = frame->FirstChild(); child;
317 child = child->NextSibling()) 323 child = child->NextSibling())
318 TraceFrame(visitor, child); 324 TraceFrame(visitor, child);
319 } 325 }
320 326
321 void WebFrame::Close() { 327 void WebFrame::Close() {
322 opened_frame_tracker_->Dispose(); 328 opened_frame_tracker_->Dispose();
323 } 329 }
324 330
325 } // namespace blink 331 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698