| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 0189577e4e493ebf96418659b1617418041deedb..92de11000b607262e6e04e7e7fffb630adc7ee82 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -164,6 +164,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| static RenderFrameImpl* FromRoutingID(int routing_id);
|
|
|
| // Just like RenderFrame::FromWebFrame but returns the implementation.
|
| + static const RenderFrameImpl* FromWebFrame(const blink::WebFrame* web_frame);
|
| static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
|
|
|
| // Used by content_layouttest_support to hook into the creation of
|
| @@ -332,7 +333,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
| // RenderFrame implementation:
|
| RenderView* GetRenderView() override;
|
| - int GetRoutingID() override;
|
| + int GetRoutingID() const override;
|
| blink::WebLocalFrame* GetWebFrame() override;
|
| blink::WebElement GetFocusedElement() const override;
|
| WebPreferences& GetWebkitPreferences() override;
|
| @@ -571,10 +572,11 @@ class CONTENT_EXPORT RenderFrameImpl
|
| void PlayerGone(blink::WebMediaPlayer* player) override;
|
|
|
| // WebPageSerializerClient implementation:
|
| - void didSerializeDataForFrame(
|
| - const blink::WebURL& frame_url,
|
| - const blink::WebCString& data,
|
| - blink::WebPageSerializerClient::PageSerializationStatus status) override;
|
| + void writeHtmlFragment(const blink::WebCString& data) override;
|
| + void writeLocalPathForSubFrame(const blink::WebFrame& subframe) override;
|
| + void writeLocalPathForSavableResource(
|
| + const blink::WebURL& savable_resource_url) override;
|
| + void endOfFrame() override;
|
|
|
| // Make this frame show an empty, unscriptable page.
|
| // TODO(nasko): Remove this method once swapped out state is no longer used.
|
| @@ -730,10 +732,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| bool has_stale_copy_in_cache,
|
| int error_code);
|
| void OnGetSavableResourceLinks();
|
| - void OnGetSerializedHtmlWithLocalLinks(
|
| - std::vector<GURL> original_urls,
|
| - std::vector<base::FilePath> equivalent_local_paths,
|
| - base::FilePath local_directory_path);
|
| + void OnGetSerializedHtmlWithLocalLinks();
|
|
|
| // Virtual since overridden by WebTestProxy for layout tests.
|
| virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
|
|
|