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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 593503003: Support error handling for Surface readbacks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use content namespace to resolve readback params. Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 76
77 ~MockScreenshotManager() override {} 77 ~MockScreenshotManager() override {}
78 78
79 void TakeScreenshotFor(content::NavigationEntryImpl* entry) { 79 void TakeScreenshotFor(content::NavigationEntryImpl* entry) {
80 SkBitmap bitmap; 80 SkBitmap bitmap;
81 bitmap.allocPixels(SkImageInfo::Make( 81 bitmap.allocPixels(SkImageInfo::Make(
82 1, 1, kAlpha_8_SkColorType, kPremul_SkAlphaType)); 82 1, 1, kAlpha_8_SkColorType, kPremul_SkAlphaType));
83 bitmap.eraseARGB(0, 0, 0, 0); 83 bitmap.eraseARGB(0, 0, 0, 0);
84 encoding_screenshot_in_progress_ = true; 84 encoding_screenshot_in_progress_ = true;
85 OnScreenshotTaken(entry->GetUniqueID(), true, bitmap); 85 OnScreenshotTaken(entry->GetUniqueID(), bitmap, content::READBACK_SUCCESS);
86 WaitUntilScreenshotIsReady(); 86 WaitUntilScreenshotIsReady();
87 } 87 }
88 88
89 int GetScreenshotCount() { 89 int GetScreenshotCount() {
90 return content::NavigationEntryScreenshotManager::GetScreenshotCount(); 90 return content::NavigationEntryScreenshotManager::GetScreenshotCount();
91 } 91 }
92 92
93 void WaitUntilScreenshotIsReady() { 93 void WaitUntilScreenshotIsReady() {
94 if (!encoding_screenshot_in_progress_) 94 if (!encoding_screenshot_in_progress_)
95 return; 95 return;
(...skipping 4294 matching lines...) Expand 10 before | Expand all | Expand 10 after
4390 params.post_id = -1; 4390 params.post_id = -1;
4391 contents()->GetMainFrame()->SendNavigateWithParams(&params); 4391 contents()->GetMainFrame()->SendNavigateWithParams(&params);
4392 4392
4393 // Now reload. replaceState overrides the POST, so we should not show a 4393 // Now reload. replaceState overrides the POST, so we should not show a
4394 // repost warning dialog. 4394 // repost warning dialog.
4395 controller_impl().Reload(true); 4395 controller_impl().Reload(true);
4396 EXPECT_EQ(0, delegate->repost_form_warning_count()); 4396 EXPECT_EQ(0, delegate->repost_form_warning_count());
4397 } 4397 }
4398 4398
4399 } // namespace content 4399 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698