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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin_manager_impl.cc

Issue 11035067: Add loadCommit and loadStop Event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Merge Conflict Created 8 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 5 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
6 6
7 #include "content/common/browser_plugin_messages.h" 7 #include "content/common/browser_plugin_messages.h"
8 #include "content/renderer/browser_plugin/browser_plugin.h" 8 #include "content/renderer/browser_plugin/browser_plugin.h"
9 #include "content/renderer/render_thread_impl.h" 9 #include "content/renderer/render_thread_impl.h"
10 10
(...skipping 19 matching lines...) Expand all
30 return RenderThread::Get()->Send(msg); 30 return RenderThread::Get()->Send(msg);
31 } 31 }
32 32
33 bool BrowserPluginManagerImpl::OnControlMessageReceived( 33 bool BrowserPluginManagerImpl::OnControlMessageReceived(
34 const IPC::Message& message) { 34 const IPC::Message& message) {
35 DCHECK(CalledOnValidThread()); 35 DCHECK(CalledOnValidThread());
36 bool handled = true; 36 bool handled = true;
37 IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message) 37 IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message)
38 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect) 38 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
39 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestCrashed, OnGuestCrashed) 39 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestCrashed, OnGuestCrashed)
40 IPC_MESSAGE_HANDLER(BrowserPluginMsg_DidNavigate, OnDidNavigate)
41 IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus) 40 IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus)
42 IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents, 41 IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
43 OnShouldAcceptTouchEvents) 42 OnShouldAcceptTouchEvents)
44 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart) 43 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart)
45 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort) 44 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort)
46 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect) 45 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect)
46 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit)
47 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStop, OnLoadStop)
47 IPC_MESSAGE_UNHANDLED(handled = false) 48 IPC_MESSAGE_UNHANDLED(handled = false)
48 IPC_END_MESSAGE_MAP() 49 IPC_END_MESSAGE_MAP()
49 return handled; 50 return handled;
50 } 51 }
51 52
52 void BrowserPluginManagerImpl::OnUpdateRect( 53 void BrowserPluginManagerImpl::OnUpdateRect(
53 int instance_id, 54 int instance_id,
54 int message_id, 55 int message_id,
55 const BrowserPluginMsg_UpdateRect_Params& params) { 56 const BrowserPluginMsg_UpdateRect_Params& params) {
56 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 57 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
57 if (plugin) 58 if (plugin)
58 plugin->UpdateRect(message_id, params); 59 plugin->UpdateRect(message_id, params);
59 } 60 }
60 61
61 void BrowserPluginManagerImpl::OnGuestCrashed(int instance_id) { 62 void BrowserPluginManagerImpl::OnGuestCrashed(int instance_id) {
62 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 63 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
63 if (plugin) 64 if (plugin)
64 plugin->GuestCrashed(); 65 plugin->GuestCrashed();
65 } 66 }
66 67
67 void BrowserPluginManagerImpl::OnDidNavigate(
68 int instance_id,
69 const BrowserPluginMsg_DidNavigate_Params& params) {
70 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
71 if (plugin)
72 plugin->DidNavigate(params);
73 }
74
75 void BrowserPluginManagerImpl::OnAdvanceFocus(int instance_id, bool reverse) { 68 void BrowserPluginManagerImpl::OnAdvanceFocus(int instance_id, bool reverse) {
76 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 69 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
77 if (plugin) 70 if (plugin)
78 plugin->AdvanceFocus(reverse); 71 plugin->AdvanceFocus(reverse);
79 } 72 }
80 73
81 void BrowserPluginManagerImpl::OnShouldAcceptTouchEvents(int instance_id, 74 void BrowserPluginManagerImpl::OnShouldAcceptTouchEvents(int instance_id,
82 bool accept) { 75 bool accept) {
83 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 76 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
84 if (plugin) 77 if (plugin)
85 plugin->SetAcceptTouchEvents(accept); 78 plugin->SetAcceptTouchEvents(accept);
86 } 79 }
87 80
88 void BrowserPluginManagerImpl::OnLoadStart(int instance_id, 81 void BrowserPluginManagerImpl::OnLoadStart(int instance_id,
89 const GURL& url, 82 const GURL& url,
90 bool is_top_level) { 83 bool is_top_level) {
91 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 84 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
92 if (plugin) 85 if (plugin)
93 plugin->LoadStart(url, is_top_level); 86 plugin->LoadStart(url, is_top_level);
94 } 87 }
95 88
89 void BrowserPluginManagerImpl::OnLoadCommit(
90 int instance_id,
91 const BrowserPluginMsg_LoadCommit_Params& params) {
92 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
93 if (plugin)
94 plugin->LoadCommit(params);
95 }
96
97 void BrowserPluginManagerImpl::OnLoadStop(int instance_id) {
98 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
99 if (plugin)
100 plugin->LoadStop();
101 }
102
96 void BrowserPluginManagerImpl::OnLoadAbort(int instance_id, 103 void BrowserPluginManagerImpl::OnLoadAbort(int instance_id,
97 const GURL& url, 104 const GURL& url,
98 bool is_top_level, 105 bool is_top_level,
99 const std::string& type) { 106 const std::string& type) {
100 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 107 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
101 if (plugin) 108 if (plugin)
102 plugin->LoadAbort(url, is_top_level, type); 109 plugin->LoadAbort(url, is_top_level, type);
103 } 110 }
104 111
105 void BrowserPluginManagerImpl::OnLoadRedirect(int instance_id, 112 void BrowserPluginManagerImpl::OnLoadRedirect(int instance_id,
106 const GURL& old_url, 113 const GURL& old_url,
107 const GURL& new_url, 114 const GURL& new_url,
108 bool is_top_level) { 115 bool is_top_level) {
109 BrowserPlugin* plugin = GetBrowserPlugin(instance_id); 116 BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
110 if (plugin) 117 if (plugin)
111 plugin->LoadRedirect(old_url, new_url, is_top_level); 118 plugin->LoadRedirect(old_url, new_url, is_top_level);
112 } 119 }
113 120
114 } // namespace content 121 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698