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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (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
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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 // Only consider updating the protection ref-count of the Element immedi ately before returning 421 // Only consider updating the protection ref-count of the Element immedi ately before returning
422 // from this function as doing so might result in the destruction of thi s ImageLoader. 422 // from this function as doing so might result in the destruction of thi s ImageLoader.
423 updatedHasPendingEvent(); 423 updatedHasPendingEvent();
424 return; 424 return;
425 } 425 }
426 loadEventSender().dispatchEventSoon(this); 426 loadEventSender().dispatchEventSoon(this);
427 } 427 }
428 428
429 RenderImageResource* ImageLoader::renderImageResource() 429 RenderImageResource* ImageLoader::renderImageResource()
430 { 430 {
431 RenderObject* renderer = m_element->renderer(); 431 LayoutObject* renderer = m_element->renderer();
432 432
433 if (!renderer) 433 if (!renderer)
434 return 0; 434 return 0;
435 435
436 // We don't return style generated image because it doesn't belong to the Im ageLoader. 436 // We don't return style generated image because it doesn't belong to the Im ageLoader.
437 // See <https://bugs.webkit.org/show_bug.cgi?id=42840> 437 // See <https://bugs.webkit.org/show_bug.cgi?id=42840>
438 if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGenerated Content()) 438 if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGenerated Content())
439 return toRenderImage(renderer)->imageResource(); 439 return toRenderImage(renderer)->imageResource();
440 440
441 if (renderer->isSVGImage()) 441 if (renderer->isSVGImage())
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 #endif 589 #endif
590 } 590 }
591 591
592 #if ENABLE(OILPAN) 592 #if ENABLE(OILPAN)
593 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() 593 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
594 { 594 {
595 m_loader.willRemoveClient(m_client); 595 m_loader.willRemoveClient(m_client);
596 } 596 }
597 #endif 597 #endif
598 } 598 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/line/SVGInlineTextBox.cpp ('k') | Source/core/page/AutoscrollController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698