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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: 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 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 110 }
111 111
112 if (!LoadOrRedirectSubframe(url, frame_name_, replace_current_item)) 112 if (!LoadOrRedirectSubframe(url, frame_name_, replace_current_item))
113 return; 113 return;
114 if (!ContentFrame() || script_url.IsEmpty() || 114 if (!ContentFrame() || script_url.IsEmpty() ||
115 !ContentFrame()->IsLocalFrame()) 115 !ContentFrame()->IsLocalFrame())
116 return; 116 return;
117 if (ContentFrame()->Owner()->GetSandboxFlags() & kSandboxOrigin) 117 if (ContentFrame()->Owner()->GetSandboxFlags() & kSandboxOrigin)
118 return; 118 return;
119 ToLocalFrame(ContentFrame()) 119 ToLocalFrame(ContentFrame())
120 ->Script() 120 ->GetScriptController()
121 .ExecuteScriptIfJavaScriptURL(script_url, this); 121 .ExecuteScriptIfJavaScriptURL(script_url, this);
122 } 122 }
123 123
124 void HTMLFrameElementBase::ParseAttribute( 124 void HTMLFrameElementBase::ParseAttribute(
125 const AttributeModificationParams& params) { 125 const AttributeModificationParams& params) {
126 const QualifiedName& name = params.name; 126 const QualifiedName& name = params.name;
127 const AtomicString& value = params.new_value; 127 const AtomicString& value = params.new_value;
128 if (name == srcdocAttr) { 128 if (name == srcdocAttr) {
129 if (!value.IsNull()) { 129 if (!value.IsNull()) {
130 SetLocation(SrcdocURL().GetString()); 130 SetLocation(SrcdocURL().GetString());
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 if (contentDocument()) { 272 if (contentDocument()) {
273 contentDocument()->WillChangeFrameOwnerProperties( 273 contentDocument()->WillChangeFrameOwnerProperties(
274 margin_width_, margin_height, scrolling_mode_, IsDisplayNone()); 274 margin_width_, margin_height, scrolling_mode_, IsDisplayNone());
275 } 275 }
276 margin_height_ = margin_height; 276 margin_height_ = margin_height;
277 FrameOwnerPropertiesChanged(); 277 FrameOwnerPropertiesChanged();
278 } 278 }
279 279
280 } // namespace blink 280 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFormElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698