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

Side by Side Diff: webkit/glue/webplugin_impl.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 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
« no previous file with comments | « webkit/glue/webplugin_impl.h ('k') | webkit/glue/webplugin_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 "base/gfx/rect.h" 5 #include "base/gfx/rect.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "net/base/escape.h" 10 #include "net/base/escape.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "skia/ext/platform_canvas.h" 12 #include "skia/ext/platform_canvas.h"
13 #include "webkit/api/public/WebConsoleMessage.h" 13 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
14 #include "webkit/api/public/WebCString.h" 14 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
15 #include "webkit/api/public/WebCursorInfo.h" 15 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
16 #include "webkit/api/public/WebData.h" 16 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
17 #include "webkit/api/public/WebFrame.h" 17 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
18 #include "webkit/api/public/WebHTTPBody.h" 18 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h"
19 #include "webkit/api/public/WebHTTPHeaderVisitor.h" 19 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h"
20 #include "webkit/api/public/WebInputEvent.h" 20 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
21 #include "webkit/api/public/WebKit.h" 21 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
22 #include "webkit/api/public/WebKitClient.h" 22 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
23 #include "webkit/api/public/WebPluginContainer.h" 23 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
24 #include "webkit/api/public/WebPluginParams.h" 24 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
25 #include "webkit/api/public/WebRect.h" 25 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
26 #include "webkit/api/public/WebURL.h" 26 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
27 #include "webkit/api/public/WebURLError.h" 27 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
28 #include "webkit/api/public/WebURLLoader.h" 28 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h"
29 #include "webkit/api/public/WebURLLoaderClient.h" 29 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h"
30 #include "webkit/api/public/WebURLResponse.h" 30 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
31 #include "webkit/api/public/WebView.h" 31 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
32 #include "webkit/glue/multipart_response_delegate.h" 32 #include "webkit/glue/multipart_response_delegate.h"
33 #include "webkit/glue/webplugin_impl.h" 33 #include "webkit/glue/webplugin_impl.h"
34 #include "webkit/glue/plugins/plugin_host.h" 34 #include "webkit/glue/plugins/plugin_host.h"
35 #include "webkit/glue/plugins/plugin_instance.h" 35 #include "webkit/glue/plugins/plugin_instance.h"
36 #include "webkit/glue/webplugin_delegate.h" 36 #include "webkit/glue/webplugin_delegate.h"
37 #include "webkit/glue/webplugin_page_delegate.h" 37 #include "webkit/glue/webplugin_page_delegate.h"
38 #include "googleurl/src/gurl.h" 38 #include "googleurl/src/gurl.h"
39 39
40 using WebKit::WebCanvas; 40 using WebKit::WebCanvas;
41 using WebKit::WebConsoleMessage; 41 using WebKit::WebConsoleMessage;
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 client_index = clients_.erase(client_index); 1051 client_index = clients_.erase(client_index);
1052 } 1052 }
1053 1053
1054 // This needs to be called now and not in the destructor since the 1054 // This needs to be called now and not in the destructor since the
1055 // webframe_ might not be valid anymore. 1055 // webframe_ might not be valid anymore.
1056 webframe_ = NULL; 1056 webframe_ = NULL;
1057 method_factory_.RevokeAll(); 1057 method_factory_.RevokeAll();
1058 } 1058 }
1059 1059
1060 } // namespace webkit_glue 1060 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webplugin_impl.h ('k') | webkit/glue/webplugin_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698