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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 13865008: Fix WebViewInteractiveTest.NewWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Got rid of old comment Created 7 years, 6 months 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
« no previous file with comments | « chrome/browser/extensions/web_view_interactive_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser/browser_plugin/browser_plugin_guest.h" 5 #include "content/browser/browser_plugin/browser_plugin_guest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 #if defined(OS_WIN) 658 #if defined(OS_WIN)
659 base::ProcessHandle handle = 659 base::ProcessHandle handle =
660 embedder_web_contents_->GetRenderProcessHost()->GetHandle(); 660 embedder_web_contents_->GetRenderProcessHost()->GetHandle();
661 scoped_ptr<base::SharedMemory> shared_buf( 661 scoped_ptr<base::SharedMemory> shared_buf(
662 new base::SharedMemory(params.damage_buffer_handle, false, handle)); 662 new base::SharedMemory(params.damage_buffer_handle, false, handle));
663 #elif defined(OS_POSIX) 663 #elif defined(OS_POSIX)
664 scoped_ptr<base::SharedMemory> shared_buf( 664 scoped_ptr<base::SharedMemory> shared_buf(
665 new base::SharedMemory(params.damage_buffer_handle, false)); 665 new base::SharedMemory(params.damage_buffer_handle, false));
666 #endif 666 #endif
667 if (!shared_buf->Map(params.damage_buffer_size)) { 667 if (!shared_buf->Map(params.damage_buffer_size)) {
668 NOTREACHED(); 668 LOG(WARNING) << "Unable to map the embedder's damage buffer.";
669 return NULL; 669 return NULL;
670 } 670 }
671 return shared_buf.release(); 671 return shared_buf.release();
672 } 672 }
673 673
674 void BrowserPluginGuest::SetDamageBuffer( 674 void BrowserPluginGuest::SetDamageBuffer(
675 const BrowserPluginHostMsg_ResizeGuest_Params& params) { 675 const BrowserPluginHostMsg_ResizeGuest_Params& params) {
676 damage_buffer_.reset(GetDamageBufferFromEmbedder(params)); 676 damage_buffer_.reset(GetDamageBufferFromEmbedder(params));
677 // Sanity check: Verify that we've correctly shared the damage buffer memory 677 // Sanity check: Verify that we've correctly shared the damage buffer memory
678 // between the embedder and browser processes. 678 // between the embedder and browser processes.
679 DCHECK(*static_cast<unsigned int*>(damage_buffer_->memory()) == 0xdeadbeef); 679 DCHECK(!damage_buffer_ ||
680 *static_cast<unsigned int*>(damage_buffer_->memory()) == 0xdeadbeef);
680 damage_buffer_sequence_id_ = params.damage_buffer_sequence_id; 681 damage_buffer_sequence_id_ = params.damage_buffer_sequence_id;
681 damage_buffer_size_ = params.damage_buffer_size; 682 damage_buffer_size_ = params.damage_buffer_size;
682 damage_view_size_ = params.view_rect.size(); 683 damage_view_size_ = params.view_rect.size();
683 damage_buffer_scale_factor_ = params.scale_factor; 684 damage_buffer_scale_factor_ = params.scale_factor;
684 } 685 }
685 686
686 gfx::Point BrowserPluginGuest::GetScreenCoordinates( 687 gfx::Point BrowserPluginGuest::GetScreenCoordinates(
687 const gfx::Point& relative_position) const { 688 const gfx::Point& relative_position) const {
688 gfx::Point screen_pos(relative_position); 689 gfx::Point screen_pos(relative_position);
689 screen_pos += guest_window_rect_.OffsetFromOrigin(); 690 screen_pos += guest_window_rect_.OffsetFromOrigin();
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 base::Value::CreateStringValue(request_method)); 1558 base::Value::CreateStringValue(request_method));
1558 request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url)); 1559 request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
1559 1560
1560 SendMessageToEmbedder( 1561 SendMessageToEmbedder(
1561 new BrowserPluginMsg_RequestPermission(instance_id(), 1562 new BrowserPluginMsg_RequestPermission(instance_id(),
1562 BrowserPluginPermissionTypeDownload, permission_request_id, 1563 BrowserPluginPermissionTypeDownload, permission_request_id,
1563 request_info)); 1564 request_info));
1564 } 1565 }
1565 1566
1566 } // namespace content 1567 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/extensions/web_view_interactive_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698