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

Unified Diff: ppapi/tests/test_printing.cc

Issue 11098034: Fix print settings units conversion for PPB_Printing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 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 | « content/browser/renderer_host/pepper/pepper_print_settings_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_printing.cc
diff --git a/ppapi/tests/test_printing.cc b/ppapi/tests/test_printing.cc
index 6a82ebbe242a0805d646895ea713d5d8bb6f6463..64ce0cea25d95131df372d977b6f36acd778b4c8 100644
--- a/ppapi/tests/test_printing.cc
+++ b/ppapi/tests/test_printing.cc
@@ -9,8 +9,9 @@
#include "ppapi/tests/testing_instance.h"
namespace {
- bool g_callback_triggered;
- int32_t g_callback_result;
+bool g_callback_triggered;
+int32_t g_callback_result;
+PP_PrintSettings_Dev g_print_settings;
} // namespace
REGISTER_TEST_CASE(Printing);
@@ -53,12 +54,30 @@ std::string TestPrinting::TestGetDefaultPrintSettings() {
ASSERT_EQ(PP_OK, g_callback_result);
ASSERT_TRUE(g_callback_triggered);
+ // Sanity check the |printable_area|, |content_area| and |paper_size| members.
+ // It is possible these values are outside these ranges but it shouldn't
+ // happen in practice and probably means there is an error in computing
+ // the default print settings. These values are in points.
+ ASSERT_TRUE(g_print_settings.printable_area.point.x < 200);
+ ASSERT_TRUE(g_print_settings.printable_area.point.y < 200);
+ ASSERT_TRUE(g_print_settings.printable_area.size.width < 2000);
+ ASSERT_TRUE(g_print_settings.printable_area.size.height < 2000);
+
+ ASSERT_TRUE(g_print_settings.content_area.point.x < 200);
+ ASSERT_TRUE(g_print_settings.content_area.point.y < 200);
+ ASSERT_TRUE(g_print_settings.content_area.size.width < 2000);
+ ASSERT_TRUE(g_print_settings.content_area.size.height< 2000);
+
+ ASSERT_TRUE(g_print_settings.paper_size.width < 2000);
+ ASSERT_TRUE(g_print_settings.paper_size.height < 2000);
+
PASS();
}
void TestPrinting::Callback(int32_t result,
- PP_PrintSettings_Dev& /* unused */) {
+ PP_PrintSettings_Dev& print_settings) {
g_callback_triggered = true;
g_callback_result = result;
+ g_print_settings = print_settings;
nested_event_.Signal();
}
« no previous file with comments | « content/browser/renderer_host/pepper/pepper_print_settings_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698