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

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

Issue 17846010: <webview>: Move contentload event from content to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@guestview_loadstop
Patch Set: Merge with ToT Created 7 years, 5 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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.h" 5 #include "content/renderer/browser_plugin/browser_plugin.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_string_value_serializer.h" 8 #include "base/json/json_string_value_serializer.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 IPC_MESSAGE_HANDLER(BrowserPluginMsg_Close, OnClose) 162 IPC_MESSAGE_HANDLER(BrowserPluginMsg_Close, OnClose)
163 IPC_MESSAGE_HANDLER_GENERIC(BrowserPluginMsg_CompositorFrameSwapped, 163 IPC_MESSAGE_HANDLER_GENERIC(BrowserPluginMsg_CompositorFrameSwapped,
164 OnCompositorFrameSwapped(message)) 164 OnCompositorFrameSwapped(message))
165 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady, 165 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady,
166 OnGuestContentWindowReady) 166 OnGuestContentWindowReady)
167 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone) 167 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone)
168 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestResponsive, OnGuestResponsive) 168 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestResponsive, OnGuestResponsive)
169 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestUnresponsive, OnGuestUnresponsive) 169 IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestUnresponsive, OnGuestUnresponsive)
170 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort) 170 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort)
171 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit) 171 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit)
172 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadHandlerCalled, OnLoadHandlerCalled)
173 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect) 172 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect)
174 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart) 173 IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart)
175 IPC_MESSAGE_HANDLER(BrowserPluginMsg_RequestPermission, OnRequestPermission) 174 IPC_MESSAGE_HANDLER(BrowserPluginMsg_RequestPermission, OnRequestPermission)
176 IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor) 175 IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor)
177 IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents, 176 IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
178 OnShouldAcceptTouchEvents) 177 OnShouldAcceptTouchEvents)
179 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UnlockMouse, OnUnlockMouse) 178 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UnlockMouse, OnUnlockMouse)
180 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdatedName, OnUpdatedName) 179 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdatedName, OnUpdatedName)
181 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect) 180 IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
182 IPC_MESSAGE_UNHANDLED(handled = false) 181 IPC_MESSAGE_UNHANDLED(handled = false)
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 void BrowserPlugin::OnLoadCommit( 576 void BrowserPlugin::OnLoadCommit(
578 int guest_instance_id, 577 int guest_instance_id,
579 const BrowserPluginMsg_LoadCommit_Params& params) { 578 const BrowserPluginMsg_LoadCommit_Params& params) {
580 // If the guest has just committed a new navigation then it is no longer 579 // If the guest has just committed a new navigation then it is no longer
581 // crashed. 580 // crashed.
582 guest_crashed_ = false; 581 guest_crashed_ = false;
583 if (params.is_top_level) 582 if (params.is_top_level)
584 UpdateDOMAttribute(browser_plugin::kAttributeSrc, params.url.spec()); 583 UpdateDOMAttribute(browser_plugin::kAttributeSrc, params.url.spec());
585 } 584 }
586 585
587 void BrowserPlugin::OnLoadHandlerCalled(int guest_instance_id) {
588 TriggerEvent(browser_plugin::kEventContentLoad, NULL);
lazyboy 2013/06/28 18:55:08 kEventContent can be removed from browser_plugin_c
Fady Samuel 2013/06/28 21:24:35 Done.
589 }
590
591 void BrowserPlugin::OnLoadRedirect(int guest_instance_id, 586 void BrowserPlugin::OnLoadRedirect(int guest_instance_id,
592 const GURL& old_url, 587 const GURL& old_url,
593 const GURL& new_url, 588 const GURL& new_url,
594 bool is_top_level) { 589 bool is_top_level) {
595 std::map<std::string, base::Value*> props; 590 std::map<std::string, base::Value*> props;
596 props[browser_plugin::kOldURL] = new base::StringValue(old_url.spec()); 591 props[browser_plugin::kOldURL] = new base::StringValue(old_url.spec());
597 props[browser_plugin::kNewURL] = new base::StringValue(new_url.spec()); 592 props[browser_plugin::kNewURL] = new base::StringValue(new_url.spec());
598 props[browser_plugin::kIsTopLevel] = new base::FundamentalValue(is_top_level); 593 props[browser_plugin::kIsTopLevel] = new base::FundamentalValue(is_top_level);
599 TriggerEvent(browser_plugin::kEventLoadRedirect, &props); 594 TriggerEvent(browser_plugin::kEventLoadRedirect, &props);
600 } 595 }
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 case BrowserPluginMsg_Attach_ACK::ID: 1284 case BrowserPluginMsg_Attach_ACK::ID:
1290 case BrowserPluginMsg_BuffersSwapped::ID: 1285 case BrowserPluginMsg_BuffersSwapped::ID:
1291 case BrowserPluginMsg_Close::ID: 1286 case BrowserPluginMsg_Close::ID:
1292 case BrowserPluginMsg_CompositorFrameSwapped::ID: 1287 case BrowserPluginMsg_CompositorFrameSwapped::ID:
1293 case BrowserPluginMsg_GuestContentWindowReady::ID: 1288 case BrowserPluginMsg_GuestContentWindowReady::ID:
1294 case BrowserPluginMsg_GuestGone::ID: 1289 case BrowserPluginMsg_GuestGone::ID:
1295 case BrowserPluginMsg_GuestResponsive::ID: 1290 case BrowserPluginMsg_GuestResponsive::ID:
1296 case BrowserPluginMsg_GuestUnresponsive::ID: 1291 case BrowserPluginMsg_GuestUnresponsive::ID:
1297 case BrowserPluginMsg_LoadAbort::ID: 1292 case BrowserPluginMsg_LoadAbort::ID:
1298 case BrowserPluginMsg_LoadCommit::ID: 1293 case BrowserPluginMsg_LoadCommit::ID:
1299 case BrowserPluginMsg_LoadHandlerCalled::ID:
1300 case BrowserPluginMsg_LoadRedirect::ID: 1294 case BrowserPluginMsg_LoadRedirect::ID:
1301 case BrowserPluginMsg_LoadStart::ID: 1295 case BrowserPluginMsg_LoadStart::ID:
1302 case BrowserPluginMsg_RequestPermission::ID: 1296 case BrowserPluginMsg_RequestPermission::ID:
1303 case BrowserPluginMsg_SetCursor::ID: 1297 case BrowserPluginMsg_SetCursor::ID:
1304 case BrowserPluginMsg_ShouldAcceptTouchEvents::ID: 1298 case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
1305 case BrowserPluginMsg_UnlockMouse::ID: 1299 case BrowserPluginMsg_UnlockMouse::ID:
1306 case BrowserPluginMsg_UpdatedName::ID: 1300 case BrowserPluginMsg_UpdatedName::ID:
1307 case BrowserPluginMsg_UpdateRect::ID: 1301 case BrowserPluginMsg_UpdateRect::ID:
1308 return true; 1302 return true;
1309 default: 1303 default:
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 const WebKit::WebMouseEvent& event) { 1586 const WebKit::WebMouseEvent& event) {
1593 browser_plugin_manager()->Send( 1587 browser_plugin_manager()->Send(
1594 new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_, 1588 new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
1595 guest_instance_id_, 1589 guest_instance_id_,
1596 plugin_rect_, 1590 plugin_rect_,
1597 &event)); 1591 &event));
1598 return true; 1592 return true;
1599 } 1593 }
1600 1594
1601 } // namespace content 1595 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698