| 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 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1244 | 1244 |
| 1245 last_page_id_sent_to_browser_ = | 1245 last_page_id_sent_to_browser_ = |
| 1246 std::max(last_page_id_sent_to_browser_, page_id_); | 1246 std::max(last_page_id_sent_to_browser_, page_id_); |
| 1247 | 1247 |
| 1248 // If we end up reusing this WebRequest (for example, due to a #ref click), | 1248 // If we end up reusing this WebRequest (for example, due to a #ref click), |
| 1249 // we don't want the transition type to persist. Just clear it. | 1249 // we don't want the transition type to persist. Just clear it. |
| 1250 navigation_state->set_transition_type(PageTransition::LINK); | 1250 navigation_state->set_transition_type(PageTransition::LINK); |
| 1251 | 1251 |
| 1252 #if defined(OS_WIN) | 1252 #if defined(OS_WIN) |
| 1253 if (accessibility_.get()) { | 1253 if (accessibility_.get()) { |
| 1254 // Clear accessibility info cache. | 1254 // Remove accessibility info cache. |
| 1255 accessibility_->clear(); | 1255 accessibility_.reset(); |
| 1256 } | 1256 } |
| 1257 #else | 1257 #else |
| 1258 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288. | 1258 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288. |
| 1259 #endif | 1259 #endif |
| 1260 } | 1260 } |
| 1261 | 1261 |
| 1262 // Tell the embedding application that the title of the active page has changed | 1262 // Tell the embedding application that the title of the active page has changed |
| 1263 void RenderView::UpdateTitle(WebFrame* frame, const string16& title) { | 1263 void RenderView::UpdateTitle(WebFrame* frame, const string16& title) { |
| 1264 // Ignore all but top level navigations... | 1264 // Ignore all but top level navigations... |
| 1265 if (!frame->parent()) { | 1265 if (!frame->parent()) { |
| (...skipping 2282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3548 const webkit_glue::WebAccessibility::InParams& in_params, | 3548 const webkit_glue::WebAccessibility::InParams& in_params, |
| 3549 webkit_glue::WebAccessibility::OutParams* out_params) { | 3549 webkit_glue::WebAccessibility::OutParams* out_params) { |
| 3550 #if defined(OS_WIN) | 3550 #if defined(OS_WIN) |
| 3551 if (!accessibility_.get()) { | 3551 if (!accessibility_.get()) { |
| 3552 // TODO(dglazkov): Once implemented for all ports, remove lazy | 3552 // TODO(dglazkov): Once implemented for all ports, remove lazy |
| 3553 // instantiation of accessibility_. | 3553 // instantiation of accessibility_. |
| 3554 accessibility_.reset(WebAccessibilityCache::create()); | 3554 accessibility_.reset(WebAccessibilityCache::create()); |
| 3555 accessibility_->initialize(webview()); | 3555 accessibility_->initialize(webview()); |
| 3556 } | 3556 } |
| 3557 | 3557 |
| 3558 webkit_glue::WebAccessibility::GetAccObjInfo(accessibility_.get(), | 3558 out_params->return_code = |
| 3559 in_params, | 3559 webkit_glue::WebAccessibility::GetAccObjInfo(accessibility_.get(), |
| 3560 out_params); | 3560 in_params, |
| 3561 out_params); |
| 3561 | 3562 |
| 3562 #else // defined(OS_WIN) | 3563 #else // defined(OS_WIN) |
| 3563 // TODO(port): accessibility not yet implemented | 3564 // TODO(port): accessibility not yet implemented |
| 3564 NOTIMPLEMENTED(); | 3565 NOTIMPLEMENTED(); |
| 3565 #endif | 3566 #endif |
| 3566 } | 3567 } |
| 3567 | 3568 |
| 3568 void RenderView::OnClearAccessibilityInfo(int acc_obj_id, bool clear_all) { | 3569 void RenderView::OnClearAccessibilityInfo(int acc_obj_id, bool clear_all) { |
| 3569 #if defined(OS_WIN) | 3570 #if defined(OS_WIN) |
| 3570 if (!accessibility_.get()) { | 3571 if (!accessibility_.get()) { |
| (...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4417 int32 height, | 4418 int32 height, |
| 4418 uint64 io_surface_identifier) { | 4419 uint64 io_surface_identifier) { |
| 4419 Send(new ViewHostMsg_GPUPluginSetIOSurface( | 4420 Send(new ViewHostMsg_GPUPluginSetIOSurface( |
| 4420 routing_id(), window, width, height, io_surface_identifier)); | 4421 routing_id(), window, width, height, io_surface_identifier)); |
| 4421 } | 4422 } |
| 4422 | 4423 |
| 4423 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { | 4424 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { |
| 4424 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); | 4425 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); |
| 4425 } | 4426 } |
| 4426 #endif | 4427 #endif |
| OLD | NEW |