diff options
Diffstat (limited to 'chromium/content/renderer/image_loading_helper.cc')
| -rw-r--r-- | chromium/content/renderer/image_loading_helper.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chromium/content/renderer/image_loading_helper.cc b/chromium/content/renderer/image_loading_helper.cc index 8f403bb9143..1eb98dc57a6 100644 --- a/chromium/content/renderer/image_loading_helper.cc +++ b/chromium/content/renderer/image_loading_helper.cc @@ -8,8 +8,7 @@ #include "base/message_loop/message_loop.h" #include "content/child/image_decoder.h" #include "content/common/image_messages.h" -#include "content/public/common/url_constants.h" -#include "content/public/renderer/render_view.h" +#include "content/public/renderer/render_frame.h" #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h" #include "net/base/data_url.h" #include "skia/ext/image_operations.h" @@ -20,6 +19,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" +#include "url/url_constants.h" using blink::WebFrame; using blink::WebVector; @@ -97,8 +97,8 @@ void FilterAndResizeImagesForMaximalSize( namespace content { -ImageLoadingHelper::ImageLoadingHelper(RenderView* render_view) - : RenderViewObserver(render_view) { +ImageLoadingHelper::ImageLoadingHelper(RenderFrame* render_frame) + : RenderFrameObserver(render_frame) { } ImageLoadingHelper::~ImageLoadingHelper() { @@ -110,7 +110,7 @@ void ImageLoadingHelper::OnDownloadImage(int id, uint32_t max_image_size) { std::vector<SkBitmap> result_images; std::vector<gfx::Size> result_original_image_sizes; - if (image_url.SchemeIs(chrome::kDataScheme)) { + if (image_url.SchemeIs(url::kDataScheme)) { SkBitmap data_image = ImageFromDataUrl(image_url); if (!data_image.empty()) { result_images.push_back(ResizeImage(data_image, max_image_size)); @@ -136,13 +136,10 @@ bool ImageLoadingHelper::DownloadImage(int id, const GURL& image_url, bool is_favicon, uint32_t max_image_size) { - // Make sure webview was not shut down. - if (!render_view()->GetWebView()) - return false; // Create an image resource fetcher and assign it with a call back object. image_fetchers_.push_back(new MultiResolutionImageResourceFetcher( image_url, - render_view()->GetWebView()->mainFrame(), + render_frame()->GetWebFrame(), id, is_favicon ? WebURLRequest::TargetIsFavicon : WebURLRequest::TargetIsImage, |