summaryrefslogtreecommitdiffstats
path: root/chrome/test/render_view_test.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 02:53:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 02:53:28 +0000
commit00c39612a3ec84f8d1f26975f3936bffc183591a (patch)
tree92474ab446150f025becaefd3868e02f72bea1fc /chrome/test/render_view_test.h
parent23dd7db09af6da5643e10d839b23d484a5b41eab (diff)
downloadchromium_src-00c39612a3ec84f8d1f26975f3936bffc183591a.zip
chromium_src-00c39612a3ec84f8d1f26975f3936bffc183591a.tar.gz
chromium_src-00c39612a3ec84f8d1f26975f3936bffc183591a.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 Original review URL: http://codereview.chromium.org/661124 Review URL: http://codereview.chromium.org/664001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/render_view_test.h')
-rw-r--r--chrome/test/render_view_test.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index add9d55..6a36097 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -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,7 +13,6 @@
#include "chrome/common/native_web_keyboard_event.h"
#include "chrome/common/sandbox_init_wrapper.h"
#include "chrome/renderer/mock_keyboard.h"
-#include "chrome/renderer/mock_render_process.h"
#include "chrome/renderer/mock_render_thread.h"
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/renderer_main_platform_delegate.h"
@@ -21,10 +20,12 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+class MockRenderProcess;
+
class RenderViewTest : public testing::Test {
public:
- RenderViewTest() {}
- ~RenderViewTest() {}
+ RenderViewTest();
+ ~RenderViewTest();
protected:
// Spins the message loop to process all messages that are currently pending.
@@ -56,7 +57,7 @@ class RenderViewTest : public testing::Test {
MessageLoop msg_loop_;
MockRenderThread render_thread_;
- scoped_ptr<MockProcess> mock_process_;
+ scoped_ptr<MockRenderProcess> mock_process_;
scoped_refptr<RenderView> view_;
RendererWebKitClientImpl webkitclient_;
scoped_ptr<MockKeyboard> mock_keyboard_;