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

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

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change page popup plumbing, remove vestigal bits related to failing security context init Created 4 years, 10 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) 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void setContentSettingsClient(WebContentSettingsClient*) override; 85 void setContentSettingsClient(WebContentSettingsClient*) override;
86 void setSharedWorkerRepositoryClient(WebSharedWorkerRepositoryClient*) overr ide; 86 void setSharedWorkerRepositoryClient(WebSharedWorkerRepositoryClient*) overr ide;
87 WebSize scrollOffset() const override; 87 WebSize scrollOffset() const override;
88 void setScrollOffset(const WebSize&) override; 88 void setScrollOffset(const WebSize&) override;
89 WebSize contentsSize() const override; 89 WebSize contentsSize() const override;
90 bool hasVisibleContent() const override; 90 bool hasVisibleContent() const override;
91 WebRect visibleContentRect() const override; 91 WebRect visibleContentRect() const override;
92 bool hasHorizontalScrollbar() const override; 92 bool hasHorizontalScrollbar() const override;
93 bool hasVerticalScrollbar() const override; 93 bool hasVerticalScrollbar() const override;
94 WebView* view() const override; 94 WebView* view() const override;
95 void setOpener(WebFrame*) override;
96 WebDocument document() const override; 95 WebDocument document() const override;
97 WebPerformance performance() const override; 96 WebPerformance performance() const override;
98 bool dispatchBeforeUnloadEvent() override; 97 bool dispatchBeforeUnloadEvent() override;
99 void dispatchUnloadEvent() override; 98 void dispatchUnloadEvent() override;
100 NPObject* windowObject() const override; 99 NPObject* windowObject() const override;
101 void bindToWindowObject(const WebString& name, NPObject*) override; 100 void bindToWindowObject(const WebString& name, NPObject*) override;
102 void bindToWindowObject(const WebString& name, NPObject*, void*) override; 101 void bindToWindowObject(const WebString& name, NPObject*, void*) override;
103 void executeScript(const WebScriptSource&) override; 102 void executeScript(const WebScriptSource&) override;
104 void executeScriptInIsolatedWorld( 103 void executeScriptInIsolatedWorld(
105 int worldID, const WebScriptSource* sources, unsigned numSources, 104 int worldID, const WebScriptSource* sources, unsigned numSources,
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect) ove rride; 252 int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect) ove rride;
254 void setTickmarks(const WebVector<WebRect>&) override; 253 void setTickmarks(const WebVector<WebRect>&) override;
255 254
256 // WebFrameImplBase methods: 255 // WebFrameImplBase methods:
257 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override; 256 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override;
258 LocalFrame* frame() const override { return m_frame.get(); } 257 LocalFrame* frame() const override { return m_frame.get(); }
259 258
260 void willBeDetached(); 259 void willBeDetached();
261 void willDetachParent(); 260 void willDetachParent();
262 261
263 static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*); 262 static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame * opener);
264 static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame* , WebSandboxFlags, const WebFrameOwnerProperties&); 263 static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame* , WebSandboxFlags, const WebFrameOwnerProperties&);
265 ~WebLocalFrameImpl() override; 264 ~WebLocalFrameImpl() override;
266 265
267 PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*); 266 PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*);
268 267
269 void didChangeContentsSize(const IntSize&); 268 void didChangeContentsSize(const IntSize&);
270 269
271 void createFrameView(); 270 void createFrameView();
272 271
273 static WebLocalFrameImpl* fromFrame(LocalFrame*); 272 static WebLocalFrameImpl* fromFrame(LocalFrame*);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 // cleared upon close(). 409 // cleared upon close().
411 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive; 410 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
412 #endif 411 #endif
413 }; 412 };
414 413
415 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 414 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
416 415
417 } // namespace blink 416 } // namespace blink
418 417
419 #endif 418 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698