| Index: chrome/renderer/printing/print_web_view_helper.h
|
| diff --git a/chrome/renderer/printing/print_web_view_helper.h b/chrome/renderer/printing/print_web_view_helper.h
|
| index 368ed08bf0a6b81b562df8c464b4a0e5628818fa..e63a0a382160e671b13fc91203b023f31be90dd0 100644
|
| --- a/chrome/renderer/printing/print_web_view_helper.h
|
| +++ b/chrome/renderer/printing/print_web_view_helper.h
|
| @@ -43,18 +43,18 @@ class PrepareFrameAndViewForPrint;
|
| // If WebFrame someday supports WeakPtr, we should use it here.
|
| class FrameReference {
|
| public:
|
| - explicit FrameReference(blink::WebFrame* frame);
|
| + explicit FrameReference(blink::WebLocalFrame* frame);
|
| FrameReference();
|
| ~FrameReference();
|
|
|
| - void Reset(blink::WebFrame* frame);
|
| + void Reset(blink::WebLocalFrame* frame);
|
|
|
| - blink::WebFrame* GetFrame();
|
| + blink::WebLocalFrame* GetFrame();
|
| blink::WebView* view();
|
|
|
| private:
|
| blink::WebView* view_;
|
| - blink::WebFrame* frame_;
|
| + blink::WebLocalFrame* frame_;
|
| };
|
|
|
| // PrintWebViewHelper handles most of the printing grunt work for RenderView.
|
| @@ -113,7 +113,8 @@ class PrintWebViewHelper
|
|
|
| // RenderViewObserver implementation.
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| - virtual void PrintPage(blink::WebFrame* frame, bool user_initiated) OVERRIDE;
|
| + virtual void PrintPage(blink::WebLocalFrame* frame,
|
| + bool user_initiated) OVERRIDE;
|
| virtual void DidStartLoading() OVERRIDE;
|
| virtual void DidStopLoading() OVERRIDE;
|
|
|
| @@ -161,7 +162,7 @@ class PrintWebViewHelper
|
|
|
| // Main printing code -------------------------------------------------------
|
|
|
| - void Print(blink::WebFrame* frame, const blink::WebNode& node);
|
| + void Print(blink::WebLocalFrame* frame, const blink::WebNode& node);
|
|
|
| // Notification when printing is done - signal tear-down/free resources.
|
| void DidFinishPrinting(PrintingResult result);
|
| @@ -173,14 +174,14 @@ class PrintWebViewHelper
|
| bool InitPrintSettings(bool fit_to_paper_size);
|
|
|
| // Calculate number of pages in source document.
|
| - bool CalculateNumberOfPages(blink::WebFrame* frame,
|
| + bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
| const blink::WebNode& node,
|
| int* number_of_pages);
|
|
|
| // Update the current print settings with new |passed_job_settings|.
|
| // |passed_job_settings| dictionary contains print job details such as printer
|
| // name, number of copies, page range, etc.
|
| - bool UpdatePrintSettings(blink::WebFrame* frame,
|
| + bool UpdatePrintSettings(blink::WebLocalFrame* frame,
|
| const blink::WebNode& node,
|
| const base::DictionaryValue& passed_job_settings);
|
|
|
| @@ -212,7 +213,7 @@ class PrintWebViewHelper
|
| #endif
|
|
|
| // Render the frame for printing.
|
| - bool RenderPagesForPrint(blink::WebFrame* frame,
|
| + bool RenderPagesForPrint(blink::WebLocalFrame* frame,
|
| const blink::WebNode& node);
|
|
|
| // Platform specific helper function for rendering page(s) to |metafile|.
|
| @@ -271,7 +272,7 @@ class PrintWebViewHelper
|
| const base::DictionaryValue& header_footer_info,
|
| const PrintMsg_Print_Params& params);
|
|
|
| - bool GetPrintFrame(blink::WebFrame** frame);
|
| + bool GetPrintFrame(blink::WebLocalFrame** frame);
|
|
|
| // Script Initiated Printing ------------------------------------------------
|
|
|
| @@ -344,7 +345,7 @@ class PrintWebViewHelper
|
|
|
| // Initializes the print preview context. Need to be called to set
|
| // the |web_frame| / |web_node| to generate the print preview for.
|
| - void InitWithFrame(blink::WebFrame* web_frame);
|
| + void InitWithFrame(blink::WebLocalFrame* web_frame);
|
| void InitWithNode(const blink::WebNode& web_node);
|
|
|
| // Does bookkeeping at the beginning of print preview.
|
| @@ -385,13 +386,13 @@ class PrintWebViewHelper
|
|
|
| // Getters
|
| // Original frame for which preview was requested.
|
| - blink::WebFrame* source_frame();
|
| + blink::WebLocalFrame* source_frame();
|
| // Original node for which preview was requested.
|
| const blink::WebNode& source_node() const;
|
|
|
| // Frame to be use to render preview. May be the same as source_frame(), or
|
| // generated from it, e.g. copy of selected block.
|
| - blink::WebFrame* prepared_frame();
|
| + blink::WebLocalFrame* prepared_frame();
|
| // Node to be use to render preview. May be the same as source_node(), or
|
| // generated from it, e.g. copy of selected block.
|
| const blink::WebNode& prepared_node() const;
|
|
|