OLD | NEW |
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/npapi/webplugin_impl.h" | 5 #include "content/renderer/npapi/webplugin_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/crash_logging.h" | 9 #include "base/debug/crash_logging.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/linked_ptr.h" | 12 #include "base/memory/linked_ptr.h" |
13 #include "base/metrics/user_metrics_action.h" | 13 #include "base/metrics/user_metrics_action.h" |
14 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "base/thread_task_runner_handle.h" | 18 #include "base/thread_task_runner_handle.h" |
19 #include "build/build_config.h" | 19 #include "build/build_config.h" |
20 #include "cc/blink/web_layer_impl.h" | 20 #include "cc/blink/web_layer_impl.h" |
21 #include "cc/layers/io_surface_layer.h" | 21 #include "cc/layers/io_surface_layer.h" |
22 #include "cc/layers/layer_settings.h" | |
23 #include "content/child/appcache/web_application_cache_host_impl.h" | 22 #include "content/child/appcache/web_application_cache_host_impl.h" |
24 #include "content/child/multipart_response_delegate.h" | 23 #include "content/child/multipart_response_delegate.h" |
25 #include "content/child/npapi/plugin_host.h" | 24 #include "content/child/npapi/plugin_host.h" |
26 #include "content/child/npapi/plugin_instance.h" | 25 #include "content/child/npapi/plugin_instance.h" |
27 #include "content/child/npapi/webplugin_delegate_impl.h" | 26 #include "content/child/npapi/webplugin_delegate_impl.h" |
28 #include "content/child/npapi/webplugin_resource_client.h" | 27 #include "content/child/npapi/webplugin_resource_client.h" |
29 #include "content/common/view_messages.h" | 28 #include "content/common/view_messages.h" |
30 #include "content/public/common/content_constants.h" | 29 #include "content/public/common/content_constants.h" |
31 #include "content/public/common/content_switches.h" | 30 #include "content/public/common/content_switches.h" |
32 #include "content/public/renderer/content_renderer_client.h" | 31 #include "content/public/renderer/content_renderer_client.h" |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 // Deferring the call to setBackingIOSurfaceId is an attempt to | 569 // Deferring the call to setBackingIOSurfaceId is an attempt to |
571 // work around garbage occasionally showing up in the plugin's | 570 // work around garbage occasionally showing up in the plugin's |
572 // area during live resizing of Core Animation plugins. The | 571 // area during live resizing of Core Animation plugins. The |
573 // assumption was that by the time this was called, the plugin | 572 // assumption was that by the time this was called, the plugin |
574 // process would have populated the newly allocated IOSurface. It | 573 // process would have populated the newly allocated IOSurface. It |
575 // is not 100% clear at this point why any garbage is getting | 574 // is not 100% clear at this point why any garbage is getting |
576 // through. More investigation is needed. http://crbug.com/105346 | 575 // through. More investigation is needed. http://crbug.com/105346 |
577 if (next_io_surface_allocated_) { | 576 if (next_io_surface_allocated_) { |
578 if (next_io_surface_id_) { | 577 if (next_io_surface_id_) { |
579 if (!io_surface_layer_.get()) { | 578 if (!io_surface_layer_.get()) { |
580 io_surface_layer_ = | 579 io_surface_layer_ = cc::IOSurfaceLayer::Create(); |
581 cc::IOSurfaceLayer::Create(cc::LayerSettings()); | |
582 web_layer_.reset(new cc_blink::WebLayerImpl(io_surface_layer_)); | 580 web_layer_.reset(new cc_blink::WebLayerImpl(io_surface_layer_)); |
583 container_->setWebLayer(web_layer_.get()); | 581 container_->setWebLayer(web_layer_.get()); |
584 } | 582 } |
585 io_surface_layer_->SetIOSurfaceProperties( | 583 io_surface_layer_->SetIOSurfaceProperties( |
586 next_io_surface_id_, | 584 next_io_surface_id_, |
587 gfx::Size(next_io_surface_width_, next_io_surface_height_)); | 585 gfx::Size(next_io_surface_width_, next_io_surface_height_)); |
588 } else { | 586 } else { |
589 container_->setWebLayer(NULL); | 587 container_->setWebLayer(NULL); |
590 web_layer_.reset(); | 588 web_layer_.reset(); |
591 io_surface_layer_ = NULL; | 589 io_surface_layer_ = NULL; |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 case PLUGIN_SRC: | 743 case PLUGIN_SRC: |
746 webframe_->setReferrerForRequest(*request, plugin_url_); | 744 webframe_->setReferrerForRequest(*request, plugin_url_); |
747 break; | 745 break; |
748 | 746 |
749 default: | 747 default: |
750 break; | 748 break; |
751 } | 749 } |
752 } | 750 } |
753 | 751 |
754 } // namespace content | 752 } // namespace content |
OLD | NEW |