| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1492 // the new render view (we don't need the browser to send the URL back down). | 1492 // the new render view (we don't need the browser to send the URL back down). |
| 1493 view->alternate_error_page_url_ = alternate_error_page_url_; | 1493 view->alternate_error_page_url_ = alternate_error_page_url_; |
| 1494 | 1494 |
| 1495 return view->webview(); | 1495 return view->webview(); |
| 1496 } | 1496 } |
| 1497 | 1497 |
| 1498 WebWidget* RenderView::createPopupMenu(bool activatable) { | 1498 WebWidget* RenderView::createPopupMenu(bool activatable) { |
| 1499 RenderWidget* widget = RenderWidget::Create(routing_id_, | 1499 RenderWidget* widget = RenderWidget::Create(routing_id_, |
| 1500 render_thread_, | 1500 render_thread_, |
| 1501 activatable); | 1501 activatable); |
| 1502 showing_popup_menu_ = true; |
| 1503 widget->SetPopupMenuOwnerWidget(this); |
| 1504 |
| 1502 return widget->webwidget(); | 1505 return widget->webwidget(); |
| 1503 } | 1506 } |
| 1504 | 1507 |
| 1505 WebWidget* RenderView::createPopupMenu(const WebPopupMenuInfo& info) { | 1508 WebWidget* RenderView::createPopupMenu(const WebPopupMenuInfo& info) { |
| 1506 RenderWidget* widget = RenderWidget::Create(routing_id_, | 1509 RenderWidget* widget = RenderWidget::Create(routing_id_, |
| 1507 render_thread_, | 1510 render_thread_, |
| 1508 true); | 1511 true); |
| 1512 showing_popup_menu_ = true; |
| 1513 widget->SetPopupMenuOwnerWidget(this); |
| 1514 |
| 1509 widget->ConfigureAsExternalPopupMenu(info); | 1515 widget->ConfigureAsExternalPopupMenu(info); |
| 1510 return widget->webwidget(); | 1516 return widget->webwidget(); |
| 1511 } | 1517 } |
| 1512 | 1518 |
| 1513 WebStorageNamespace* RenderView::createSessionStorageNamespace() { | 1519 WebStorageNamespace* RenderView::createSessionStorageNamespace() { |
| 1514 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) | 1520 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
| 1515 return WebStorageNamespace::createSessionStorageNamespace(); | 1521 return WebStorageNamespace::createSessionStorageNamespace(); |
| 1516 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId); | 1522 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId); |
| 1517 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION, | 1523 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION, |
| 1518 session_storage_namespace_id_); | 1524 session_storage_namespace_id_); |
| (...skipping 2898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4417 int32 height, | 4423 int32 height, |
| 4418 uint64 io_surface_identifier) { | 4424 uint64 io_surface_identifier) { |
| 4419 Send(new ViewHostMsg_GPUPluginSetIOSurface( | 4425 Send(new ViewHostMsg_GPUPluginSetIOSurface( |
| 4420 routing_id(), window, width, height, io_surface_identifier)); | 4426 routing_id(), window, width, height, io_surface_identifier)); |
| 4421 } | 4427 } |
| 4422 | 4428 |
| 4423 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { | 4429 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { |
| 4424 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); | 4430 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); |
| 4425 } | 4431 } |
| 4426 #endif | 4432 #endif |
| OLD | NEW |