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

Side by Side Diff: chrome/renderer/print_web_view_helper.cc

Issue 8344016: Fix print media page size by using the value we compute. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/renderer/print_web_view_helper.h" 5 #include "chrome/renderer/print_web_view_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 DCHECK_EQ(INITIALIZED, state_); 1374 DCHECK_EQ(INITIALIZED, state_);
1375 ClearContext(); 1375 ClearContext();
1376 } 1376 }
1377 1377
1378 bool PrintWebViewHelper::PrintPreviewContext::CreatePreviewDocument( 1378 bool PrintWebViewHelper::PrintPreviewContext::CreatePreviewDocument(
1379 PrintMsg_Print_Params* print_params, 1379 PrintMsg_Print_Params* print_params,
1380 const std::vector<int>& pages) { 1380 const std::vector<int>& pages) {
1381 DCHECK_EQ(INITIALIZED, state_); 1381 DCHECK_EQ(INITIALIZED, state_);
1382 state_ = RENDERING; 1382 state_ = RENDERING;
1383 1383
1384 print_params_.reset(new PrintMsg_Print_Params(*print_params));
1385
1386 metafile_.reset(new printing::PreviewMetafile); 1384 metafile_.reset(new printing::PreviewMetafile);
1387 if (!metafile_->Init()) { 1385 if (!metafile_->Init()) {
1388 set_error(PREVIEW_ERROR_METAFILE_INIT_FAILED); 1386 set_error(PREVIEW_ERROR_METAFILE_INIT_FAILED);
1389 LOG(ERROR) << "PreviewMetafile Init failed"; 1387 LOG(ERROR) << "PreviewMetafile Init failed";
1390 return false; 1388 return false;
1391 } 1389 }
1392 1390
1393 // Need to make sure old object gets destroyed first. 1391 // Need to make sure old object gets destroyed first.
1394 prep_frame_view_.reset(new PrepareFrameAndViewForPrint(*print_params, frame(), 1392 prep_frame_view_.reset(new PrepareFrameAndViewForPrint(*print_params, frame(),
1395 node())); 1393 node()));
1396 UpdatePrintableSizeInPrintParameters(frame_, node_, 1394 UpdatePrintableSizeInPrintParameters(frame_, node_,
1397 prep_frame_view_.get(), print_params); 1395 prep_frame_view_.get(), print_params);
1398 1396
1397 print_params_.reset(new PrintMsg_Print_Params(*print_params));
1398
1399 total_page_count_ = prep_frame_view_->GetExpectedPageCount(); 1399 total_page_count_ = prep_frame_view_->GetExpectedPageCount();
1400 if (total_page_count_ == 0) { 1400 if (total_page_count_ == 0) {
1401 LOG(ERROR) << "CreatePreviewDocument got 0 page count"; 1401 LOG(ERROR) << "CreatePreviewDocument got 0 page count";
1402 set_error(PREVIEW_ERROR_ZERO_PAGES); 1402 set_error(PREVIEW_ERROR_ZERO_PAGES);
1403 return false; 1403 return false;
1404 } 1404 }
1405 1405
1406 int selected_page_count = pages.size(); 1406 int selected_page_count = pages.size();
1407 current_page_index_ = 0; 1407 current_page_index_ = 0;
1408 print_ready_metafile_page_count_ = selected_page_count; 1408 print_ready_metafile_page_count_ = selected_page_count;
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 DCHECK(IsRendering()); 1558 DCHECK(IsRendering());
1559 return prep_frame_view_->GetPrintCanvasSize(); 1559 return prep_frame_view_->GetPrintCanvasSize();
1560 } 1560 }
1561 1561
1562 void PrintWebViewHelper::PrintPreviewContext::ClearContext() { 1562 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
1563 prep_frame_view_.reset(); 1563 prep_frame_view_.reset();
1564 metafile_.reset(); 1564 metafile_.reset();
1565 pages_to_render_.clear(); 1565 pages_to_render_.clear();
1566 error_ = PREVIEW_ERROR_NONE; 1566 error_ = PREVIEW_ERROR_NONE;
1567 } 1567 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698