summaryrefslogtreecommitdiffstats
path: root/chrome/test/render_view_test.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 05:03:22 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 05:03:22 +0000
commit396c3a461549b02dcb830a287ac4656b2ca181e7 (patch)
treedfd70c68c3fc4aa501a8f1bf13bf4853d2f7faef /chrome/test/render_view_test.cc
parent29a694916746e366724f7ac6f9aa0d103894f4a9 (diff)
downloadchromium_src-396c3a461549b02dcb830a287ac4656b2ca181e7.zip
chromium_src-396c3a461549b02dcb830a287ac4656b2ca181e7.tar.gz
chromium_src-396c3a461549b02dcb830a287ac4656b2ca181e7.tar.bz2
Make the pepper 2D flush callback actually function as advertised. It will now
get called asynchronously when the bits are actually copied to the screen, rather than synchronously from inside the paint function. This makes it useful for plugins to use the callback for rate limiting. This also adds a lot of infrastructure for running tests on pepper devices, and includes a unit test for the new flush behavior. I made the existing RenderProcess object an abstract interface and made the existing MockProcess (renamed to be more clear) implement that. This avoids a static cast that would actually crash during a unit test because some code was hardcoded to expect a RenderProcess object. This fixes base's IDMap iterator which has apparently never been used for an IDMap with ownership semantics. TEST=Unit test included BUG=none Review URL: http://codereview.chromium.org/661124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/render_view_test.cc')
-rw-r--r--chrome/test/render_view_test.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 001e7b1..f920a2f 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,6 +13,7 @@
#include "chrome/renderer/extensions/extension_process_bindings.h"
#include "chrome/renderer/extensions/js_only_v8_extensions.h"
#include "chrome/renderer/extensions/renderer_extension_bindings.h"
+#include "chrome/renderer/mock_render_process.h"
#include "chrome/renderer/renderer_main_platform_delegate.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
@@ -34,6 +35,12 @@ const int32 kRouteId = 5;
const int32 kOpenerId = 7;
} // namespace
+RenderViewTest::RenderViewTest() {
+}
+
+RenderViewTest::~RenderViewTest() {
+}
+
void RenderViewTest::ProcessPendingMessages() {
msg_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask());
msg_loop_.Run();
@@ -89,7 +96,7 @@ void RenderViewTest::SetUp() {
Extension::kPermissionNames + Extension::kNumPermissions);
ExtensionProcessBindings::SetAPIPermissions("", permissions);
- mock_process_.reset(new MockProcess());
+ mock_process_.reset(new MockRenderProcess);
render_thread_.set_routing_id(kRouteId);
@@ -102,6 +109,7 @@ void RenderViewTest::SetUp() {
// Attach a pseudo keyboard device to this object.
mock_keyboard_.reset(new MockKeyboard());
}
+
void RenderViewTest::TearDown() {
// Try very hard to collect garbage before shutting down.
GetMainFrame()->collectGarbage();