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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 258093002: Revert of Limit renderer saved frames to avoid running out of fds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/renderer_frame_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 0754337ca83fb89ef00b89aac580e7dfa25b6643..81137d9eeba78ff21a5e049618c72b4acd5282bb 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -17,7 +17,6 @@
#include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/common/gpu/gpu_messages.h"
-#include "content/common/host_shared_bitmap_manager.h"
#include "content/common/input_messages.h"
#include "content/common/view_messages.h"
#include "content/port/browser/render_widget_host_view_frame_subscriber.h"
@@ -1066,7 +1065,6 @@
size_t renderer_count = max_renderer_frames + 1;
gfx::Rect view_rect(100, 100);
gfx::Size frame_size = view_rect.size();
- DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount());
scoped_ptr<RenderWidgetHostImpl * []> hosts(
new RenderWidgetHostImpl* [renderer_count]);
@@ -1153,33 +1151,6 @@
views[0]->WasHidden();
EXPECT_FALSE(views[0]->frame_provider_);
- for (size_t i = 0; i < renderer_count - 1; ++i)
- views[i]->WasHidden();
-
- // Allocate enough bitmaps so that two frames (proportionally) would be
- // enough hit the handle limit.
- int handles_per_frame = 5;
- RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2);
-
- for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) {
- HostSharedBitmapManager::current()->ChildAllocatedSharedBitmap(
- 1,
- base::SharedMemory::NULLHandle(),
- base::GetCurrentProcessHandle(),
- cc::SharedBitmap::GenerateId());
- }
-
- // Hiding this last bitmap should evict all but two frames.
- views[renderer_count - 1]->WasHidden();
- for (size_t i = 0; i < renderer_count; ++i) {
- if (i + 2 < renderer_count)
- EXPECT_FALSE(views[i]->frame_provider_);
- else
- EXPECT_TRUE(views[i]->frame_provider_);
- }
- HostSharedBitmapManager::current()->ProcessRemoved(
- base::GetCurrentProcessHandle());
-
for (size_t i = 0; i < renderer_count; ++i) {
views[i]->Destroy();
delete hosts[i];
@@ -1193,7 +1164,6 @@
size_t renderer_count = max_renderer_frames + 1;
gfx::Rect view_rect(100, 100);
gfx::Size frame_size = view_rect.size();
- DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount());
scoped_ptr<RenderWidgetHostImpl * []> hosts(
new RenderWidgetHostImpl* [renderer_count]);
« no previous file with comments | « no previous file | content/browser/renderer_host/renderer_frame_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698