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

Side by Side Diff: components/html_viewer/html_document.h

Issue 1149793002: Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing Daniel's comments Created 5 years, 6 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 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 blink::WebLocalFrame* frame, 82 blink::WebLocalFrame* frame,
83 const blink::WebURL& url, 83 const blink::WebURL& url,
84 blink::WebMediaPlayerClient* client, 84 blink::WebMediaPlayerClient* client,
85 blink::WebContentDecryptionModule* initial_cdm); 85 blink::WebContentDecryptionModule* initial_cdm);
86 virtual blink::WebFrame* createChildFrame( 86 virtual blink::WebFrame* createChildFrame(
87 blink::WebLocalFrame* parent, 87 blink::WebLocalFrame* parent,
88 blink::WebTreeScopeType scope, 88 blink::WebTreeScopeType scope,
89 const blink::WebString& frameName, 89 const blink::WebString& frameName,
90 blink::WebSandboxFlags sandboxFlags); 90 blink::WebSandboxFlags sandboxFlags);
91 virtual void frameDetached(blink::WebFrame*); 91 virtual void frameDetached(blink::WebFrame*);
92 virtual void frameDetached(blink::WebFrame*, DetachType);
dcheng 2015/06/01 21:41:11 Nit: name these parameters to follow Chrome style.
lfg 2015/06/01 21:46:04 Done.
92 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 93 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
93 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 94 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
94 const NavigationPolicyInfo& info); 95 const NavigationPolicyInfo& info);
95 96
96 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 97 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
97 const blink::WebString& source_name, 98 const blink::WebString& source_name,
98 unsigned source_line, 99 unsigned source_line,
99 const blink::WebString& stack_trace); 100 const blink::WebString& stack_trace);
100 virtual void didFinishLoad(blink::WebLocalFrame* frame); 101 virtual void didFinishLoad(blink::WebLocalFrame* frame);
101 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, 102 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 Setup* setup_; 149 Setup* setup_;
149 150
150 scoped_ptr<TouchHandler> touch_handler_; 151 scoped_ptr<TouchHandler> touch_handler_;
151 152
152 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 153 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
153 }; 154 };
154 155
155 } // namespace html_viewer 156 } // namespace html_viewer
156 157
157 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 158 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_document.cc » ('j') | components/html_viewer/html_document.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698