| OLD | NEW |
| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 // The IPC messages which deal with streams are now asynchronous. It is | 259 // The IPC messages which deal with streams are now asynchronous. It is |
| 260 // now possible to receive stream messages from the renderer for streams | 260 // now possible to receive stream messages from the renderer for streams |
| 261 // which may have been cancelled by the plugin. | 261 // which may have been cancelled by the plugin. |
| 262 if (iterator == resource_clients_.end()) { | 262 if (iterator == resource_clients_.end()) { |
| 263 return NULL; | 263 return NULL; |
| 264 } | 264 } |
| 265 | 265 |
| 266 return iterator->second; | 266 return iterator->second; |
| 267 } | 267 } |
| 268 | 268 |
| 269 int WebPluginProxy::GetRendererProcessId() { | 269 int WebPluginProxy::GetRendererId() { |
| 270 if (channel_.get()) | 270 if (channel_.get()) |
| 271 return channel_->peer_pid(); | 271 return channel_->renderer_id(); |
| 272 return 0; | 272 return -1; |
| 273 } | 273 } |
| 274 | 274 |
| 275 void WebPluginProxy::DidPaint() { | 275 void WebPluginProxy::DidPaint() { |
| 276 // If we have an accumulated damaged rect, then check to see if we need to | 276 // If we have an accumulated damaged rect, then check to see if we need to |
| 277 // send out another InvalidateRect message. | 277 // send out another InvalidateRect message. |
| 278 waiting_for_paint_ = false; | 278 waiting_for_paint_ = false; |
| 279 if (!damaged_rect_.IsEmpty()) | 279 if (!damaged_rect_.IsEmpty()) |
| 280 InvalidateRect(damaged_rect_); | 280 InvalidateRect(damaged_rect_); |
| 281 } | 281 } |
| 282 | 282 |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 while (index != resource_clients_.end()) { | 652 while (index != resource_clients_.end()) { |
| 653 WebPluginResourceClient* client = (*index).second; | 653 WebPluginResourceClient* client = (*index).second; |
| 654 | 654 |
| 655 if (client == resource_client) { | 655 if (client == resource_client) { |
| 656 resource_clients_.erase(index++); | 656 resource_clients_.erase(index++); |
| 657 } else { | 657 } else { |
| 658 index++; | 658 index++; |
| 659 } | 659 } |
| 660 } | 660 } |
| 661 } | 661 } |
| OLD | NEW |