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

Side by Side Diff: chrome/plugin/webplugin_proxy.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 | « chrome/plugin/webplugin_delegate_stub.cc ('k') | chrome/renderer/devtools_agent.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/plugin/webplugin_proxy.h" 5 #include "chrome/plugin/webplugin_proxy.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "app/gfx/canvas.h" 9 #include "app/gfx/canvas.h"
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 10 matching lines...) Expand all
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "chrome/common/child_process_logging.h" 22 #include "chrome/common/child_process_logging.h"
23 #include "chrome/common/plugin_messages.h" 23 #include "chrome/common/plugin_messages.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "chrome/plugin/npobject_proxy.h" 25 #include "chrome/plugin/npobject_proxy.h"
26 #include "chrome/plugin/npobject_util.h" 26 #include "chrome/plugin/npobject_util.h"
27 #include "chrome/plugin/plugin_channel.h" 27 #include "chrome/plugin/plugin_channel.h"
28 #include "chrome/plugin/plugin_thread.h" 28 #include "chrome/plugin/plugin_thread.h"
29 #include "chrome/plugin/webplugin_delegate_stub.h" 29 #include "chrome/plugin/webplugin_delegate_stub.h"
30 #include "skia/ext/platform_device.h" 30 #include "skia/ext/platform_device.h"
31 #include "webkit/api/public/WebBindings.h" 31 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
32 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 32 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
33 33
34 using WebKit::WebBindings; 34 using WebKit::WebBindings;
35 using webkit_glue::WebPluginResourceClient; 35 using webkit_glue::WebPluginResourceClient;
36 36
37 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap; 37 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
38 static ContextMap& GetContextMap() { 38 static ContextMap& GetContextMap() {
39 return *Singleton<ContextMap>::get(); 39 return *Singleton<ContextMap>::get();
40 } 40 }
41 41
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 while (index != resource_clients_.end()) { 589 while (index != resource_clients_.end()) {
590 WebPluginResourceClient* client = (*index).second; 590 WebPluginResourceClient* client = (*index).second;
591 591
592 if (client == resource_client) { 592 if (client == resource_client) {
593 resource_clients_.erase(index++); 593 resource_clients_.erase(index++);
594 } else { 594 } else {
595 index++; 595 index++;
596 } 596 }
597 } 597 }
598 } 598 }
OLDNEW
« no previous file with comments | « chrome/plugin/webplugin_delegate_stub.cc ('k') | chrome/renderer/devtools_agent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698