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

Side by Side Diff: Source/core/loader/ImageLoader.cpp

Issue 927583002: Moving RenderSVG* files from rendering/ to layout/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | « Source/core/layout/svg/SVGTextQuery.cpp ('k') | Source/core/paint/SVGForeignObjectPainter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 19 matching lines...) Expand all
30 #include "core/events/Event.h" 30 #include "core/events/Event.h"
31 #include "core/events/EventSender.h" 31 #include "core/events/EventSender.h"
32 #include "core/fetch/FetchRequest.h" 32 #include "core/fetch/FetchRequest.h"
33 #include "core/fetch/MemoryCache.h" 33 #include "core/fetch/MemoryCache.h"
34 #include "core/fetch/ResourceFetcher.h" 34 #include "core/fetch/ResourceFetcher.h"
35 #include "core/frame/LocalFrame.h" 35 #include "core/frame/LocalFrame.h"
36 #include "core/html/HTMLImageElement.h" 36 #include "core/html/HTMLImageElement.h"
37 #include "core/html/parser/HTMLParserIdioms.h" 37 #include "core/html/parser/HTMLParserIdioms.h"
38 #include "core/layout/LayoutImage.h" 38 #include "core/layout/LayoutImage.h"
39 #include "core/layout/LayoutVideo.h" 39 #include "core/layout/LayoutVideo.h"
40 #include "core/rendering/svg/RenderSVGImage.h" 40 #include "core/layout/svg/LayoutSVGImage.h"
41 #include "platform/Logging.h" 41 #include "platform/Logging.h"
42 #include "platform/weborigin/SecurityOrigin.h" 42 #include "platform/weborigin/SecurityOrigin.h"
43 #include "public/platform/WebURLRequest.h" 43 #include "public/platform/WebURLRequest.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 static ImageEventSender& loadEventSender() 47 static ImageEventSender& loadEventSender()
48 { 48 {
49 DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load)); 49 DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load));
50 return sender; 50 return sender;
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 444
445 if (!renderer) 445 if (!renderer)
446 return 0; 446 return 0;
447 447
448 // We don't return style generated image because it doesn't belong to the Im ageLoader. 448 // We don't return style generated image because it doesn't belong to the Im ageLoader.
449 // See <https://bugs.webkit.org/show_bug.cgi?id=42840> 449 // See <https://bugs.webkit.org/show_bug.cgi?id=42840>
450 if (renderer->isImage() && !static_cast<LayoutImage*>(renderer)->isGenerated Content()) 450 if (renderer->isImage() && !static_cast<LayoutImage*>(renderer)->isGenerated Content())
451 return toLayoutImage(renderer)->imageResource(); 451 return toLayoutImage(renderer)->imageResource();
452 452
453 if (renderer->isSVGImage()) 453 if (renderer->isSVGImage())
454 return toRenderSVGImage(renderer)->imageResource(); 454 return toLayoutSVGImage(renderer)->imageResource();
455 455
456 if (renderer->isVideo()) 456 if (renderer->isVideo())
457 return toLayoutVideo(renderer)->imageResource(); 457 return toLayoutVideo(renderer)->imageResource();
458 458
459 return 0; 459 return 0;
460 } 460 }
461 461
462 void ImageLoader::updateRenderer() 462 void ImageLoader::updateRenderer()
463 { 463 {
464 LayoutImageResource* imageResource = layoutImageResource(); 464 LayoutImageResource* imageResource = layoutImageResource();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 #endif 601 #endif
602 } 602 }
603 603
604 #if ENABLE(OILPAN) 604 #if ENABLE(OILPAN)
605 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 605 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
606 { 606 {
607 m_loader.willRemoveClient(m_client); 607 m_loader.willRemoveClient(m_client);
608 } 608 }
609 #endif 609 #endif
610 } 610 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/SVGTextQuery.cpp ('k') | Source/core/paint/SVGForeignObjectPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698