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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.h

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move setSandboxFlags call 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 bool selectionStartHasSpellingMarkerFor(int from, int length) const override ; 227 bool selectionStartHasSpellingMarkerFor(int from, int length) const override ;
228 WebString layerTreeAsText(bool showDebugInfo = false) const override; 228 WebString layerTreeAsText(bool showDebugInfo = false) const override;
229 229
230 void registerTestInterface(const WebString& name, WebTestInterfaceFactory*) override; 230 void registerTestInterface(const WebString& name, WebTestInterfaceFactory*) override;
231 231
232 // Creates a test interface by name if available, returns an empty handle 232 // Creates a test interface by name if available, returns an empty handle
233 // for unknown names. 233 // for unknown names.
234 v8::Local<v8::Value> createTestInterface(const AtomicString& name); 234 v8::Local<v8::Value> createTestInterface(const AtomicString& name);
235 235
236 // WebLocalFrame methods: 236 // WebLocalFrame methods:
237 void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags) override; 237 void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags, const WebFrameOwnerProperties&) override;
238 void setAutofillClient(WebAutofillClient*) override; 238 void setAutofillClient(WebAutofillClient*) override;
239 WebAutofillClient* autofillClient() override; 239 WebAutofillClient* autofillClient() override;
240 void setDevToolsAgentClient(WebDevToolsAgentClient*) override; 240 void setDevToolsAgentClient(WebDevToolsAgentClient*) override;
241 WebDevToolsAgent* devToolsAgent() override; 241 WebDevToolsAgent* devToolsAgent() override;
242 void setFrameOwnerProperties(const WebFrameOwnerProperties&) override;
242 void sendPings(const WebNode& contextNode, const WebURL& destinationURL) ove rride; 243 void sendPings(const WebNode& contextNode, const WebURL& destinationURL) ove rride;
243 WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::C achePolicy) 244 WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::C achePolicy)
244 const override; 245 const override;
245 WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const overri de; 246 WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const overri de;
246 void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&, 247 void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&,
247 WebHistoryLoadType) override; 248 WebHistoryLoadType) override;
248 bool isLoading() const override; 249 bool isLoading() const override;
249 bool isResourceLoadInProgress() const override; 250 bool isResourceLoadInProgress() const override;
250 bool isNavigationScheduled() const override; 251 bool isNavigationScheduled() const override;
251 void setCommittedFirstRealLoad() override; 252 void setCommittedFirstRealLoad() override;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // cleared upon close(). 401 // cleared upon close().
401 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive; 402 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
402 #endif 403 #endif
403 }; 404 };
404 405
405 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 406 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
406 407
407 } // namespace blink 408 } // namespace blink
408 409
409 #endif 410 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698