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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 | Annotate | Revision Log
OLDNEW
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/webplugin_delegate_proxy.h" 5 #include "chrome/renderer/webplugin_delegate_proxy.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "app/resource_bundle.h" 13 #include "app/resource_bundle.h"
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/ref_counted.h" 18 #include "base/ref_counted.h"
19 #include "base/string_split.h" 19 #include "base/string_split.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/sys_info.h" 21 #include "base/sys_info.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "chrome/common/child_process_logging.h" 23 #include "chrome/common/child_process_logging.h"
24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/plugin_messages.h" 24 #include "chrome/common/plugin_messages.h"
26 #include "chrome/common/render_messages.h" 25 #include "chrome/common/render_messages.h"
27 #include "chrome/plugin/npobject_proxy.h" 26 #include "chrome/plugin/npobject_proxy.h"
28 #include "chrome/plugin/npobject_stub.h" 27 #include "chrome/plugin/npobject_stub.h"
29 #include "chrome/plugin/npobject_util.h" 28 #include "chrome/plugin/npobject_util.h"
30 #include "chrome/renderer/command_buffer_proxy.h" 29 #include "chrome/renderer/command_buffer_proxy.h"
31 #include "chrome/renderer/plugin_channel_host.h" 30 #include "chrome/renderer/plugin_channel_host.h"
32 #include "chrome/renderer/render_thread.h" 31 #include "chrome/renderer/render_thread.h"
33 #include "chrome/renderer/render_view.h" 32 #include "chrome/renderer/render_view.h"
34 #include "gfx/blit.h" 33 #include "gfx/blit.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 clip_rect_ = clip_rect; 510 clip_rect_ = clip_rect;
512 511
513 bool bitmaps_changed = false; 512 bool bitmaps_changed = false;
514 513
515 PluginMsg_UpdateGeometry_Param param; 514 PluginMsg_UpdateGeometry_Param param;
516 #if defined(OS_MACOSX) 515 #if defined(OS_MACOSX)
517 param.ack_key = -1; 516 param.ack_key = -1;
518 #endif 517 #endif
519 518
520 if (uses_shared_bitmaps_) { 519 if (uses_shared_bitmaps_) {
520 SkDevice* device = backing_store_canvas_->getDevice();
James Hawkins 2010/12/22 21:54:36 Please don't add unrelated changes like this to th
Lei Zhang 2011/01/08 01:51:36 Ok.
521 if (!backing_store_canvas_.get() || 521 if (!backing_store_canvas_.get() ||
522 (window_rect.width() != backing_store_canvas_->getDevice()->width() || 522 (window_rect.width() != device->width() ||
523 window_rect.height() != backing_store_canvas_->getDevice()->height())) 523 window_rect.height() != device->height())) {
524 {
525 bitmaps_changed = true; 524 bitmaps_changed = true;
526 525
527 bool needs_background_store = transparent_; 526 bool needs_background_store = transparent_;
528 #if defined(OS_MACOSX) 527 #if defined(OS_MACOSX)
529 // We don't support transparency under QuickDraw, and CoreGraphics 528 // We don't support transparency under QuickDraw, and CoreGraphics
530 // preserves transparency information (and does the compositing itself) 529 // preserves transparency information (and does the compositing itself)
531 // so plugins don't need access to the page background. 530 // so plugins don't need access to the page background.
532 needs_background_store = false; 531 needs_background_store = false;
533 if (transport_store_.get()) { 532 if (transport_store_.get()) {
534 // ResetWindowlessBitmaps inserts the old TransportDIBs into 533 // ResetWindowlessBitmaps inserts the old TransportDIBs into
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 } 1556 }
1558 #endif 1557 #endif
1559 1558
1560 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow, 1559 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
1561 int resource_id) { 1560 int resource_id) {
1562 if (!plugin_) 1561 if (!plugin_)
1563 return; 1562 return;
1564 1563
1565 plugin_->URLRedirectResponse(allow, resource_id); 1564 plugin_->URLRedirectResponse(allow, resource_id);
1566 } 1565 }
1567
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698