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

Side by Side Diff: sky/engine/core/loader/ImageLoader.cpp

Issue 709213002: Remove ContentData. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 loadEventSender().dispatchEventSoon(this); 357 loadEventSender().dispatchEventSoon(this);
358 } 358 }
359 359
360 RenderImageResource* ImageLoader::renderImageResource() 360 RenderImageResource* ImageLoader::renderImageResource()
361 { 361 {
362 RenderObject* renderer = m_element->renderer(); 362 RenderObject* renderer = m_element->renderer();
363 363
364 if (!renderer) 364 if (!renderer)
365 return 0; 365 return 0;
366 366
367 // We don't return style generated image because it doesn't belong to the Im ageLoader. 367 if (renderer->isImage())
368 // See <https://bugs.webkit.org/show_bug.cgi?id=42840>
369 if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGenerated Content())
370 return toRenderImage(renderer)->imageResource(); 368 return toRenderImage(renderer)->imageResource();
371 369
372 return 0; 370 return 0;
373 } 371 }
374 372
375 void ImageLoader::updateRenderer() 373 void ImageLoader::updateRenderer()
376 { 374 {
377 RenderImageResource* imageResource = renderImageResource(); 375 RenderImageResource* imageResource = renderImageResource();
378 376
379 if (!imageResource) 377 if (!imageResource)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 void ImageLoader::sourceImageChanged() 498 void ImageLoader::sourceImageChanged()
501 { 499 {
502 HashSet<ImageLoaderClient*>::iterator end = m_clients.end(); 500 HashSet<ImageLoaderClient*>::iterator end = m_clients.end();
503 for (HashSet<ImageLoaderClient*>::iterator it = m_clients.begin(); it != end ; ++it) { 501 for (HashSet<ImageLoaderClient*>::iterator it = m_clients.begin(); it != end ; ++it) {
504 ImageLoaderClient* handle = *it; 502 ImageLoaderClient* handle = *it;
505 handle->notifyImageSourceChanged(); 503 handle->notifyImageSourceChanged();
506 } 504 }
507 } 505 }
508 506
509 } 507 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResourceLoader.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698