Have srcset respond to viewport changes

Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 54 matching lines @@
     ASSERT(loader);
     ASSERT(loader->element());
     ASSERT(loader->element()->document().frame());
     if (loader->element()->document().frame()->script().shouldBypassMainWorldCSP())
         return ImageLoader::BypassMainWorldCSP;
     return ImageLoader::DoNotBypassMainWorldCSP;
 }
 
 class ImageLoader::Task : public blink::WebThread::Task {
 public:
-    static PassOwnPtr<Task> create(ImageLoader* loader)
+    static PassOwnPtr<Task> create(ImageLoader* loader, UpdateFromElementBehavior updateBehavior)
     {
-        return adoptPtr(new Task(loader));
+        return adoptPtr(new Task(loader, updateBehavior));
     }
 
-    Task(ImageLoader* loader)
+    Task(ImageLoader* loader, UpdateFromElementBehavior updateBehavior)
         : m_loader(loader)
         , m_shouldBypassMainWorldCSP(shouldBypassMainWorldCSP(loader))
         , m_weakFactory(this)
+        , m_updateBehavior(updateBehavior)
     {
     }
 
     virtual void run() OVERRIDE
     {
         if (m_loader) {
-            m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP);
+            m_loader->doUpdateFromElement(m_shouldBypassMainWorldCSP, m_updateBehavior);
         }
     }
 
     void clearLoader()
     {
         m_loader = 0;
     }
 
     WeakPtr<Task> createWeakPtr()
     {
         return m_weakFactory.createWeakPtr();
     }
 
 private:
     ImageLoader* m_loader;
     BypassMainWorldBehavior m_shouldBypassMainWorldCSP;
     WeakPtrFactory<Task> m_weakFactory;
+    UpdateFromElementBehavior m_updateBehavior;
 };
 
 ImageLoader::ImageLoader(Element* element)
     : m_element(element)
     , m_image(0)
     , m_derefElementTimer(this, &ImageLoader::timerFired)
     , m_hasPendingLoadEvent(false)
     , m_hasPendingErrorEvent(false)
     , m_imageComplete(true)
     , m_loadingImageDocument(false)
@@ skipping 85 matching lines @@
     m_failedLoadURL = imageSourceURL;
     m_hasPendingErrorEvent = true;
     errorEventSender().dispatchEventSoon(this);
 }
 
 inline void ImageLoader::clearFailedLoadURL()
 {
     m_failedLoadURL = AtomicString();
 }
 
-inline void ImageLoader::enqueueImageLoadingMicroTask()
+inline void ImageLoader::enqueueImageLoadingMicroTask(UpdateFromElementBehavior updateBehavior)
 {
-    OwnPtr<Task> task = Task::create(this);
+    OwnPtr<Task> task = Task::create(this, updateBehavior);
     m_pendingTask = task->createWeakPtr();
     Microtask::enqueueMicrotask(task.release());
     m_loadDelayCounter = IncrementLoadEventDelayCount::create(m_element->document());
 }
 
-void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior)
+void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, UpdateFromElementBehavior updateBehavior)
 {
     // We don't need to call clearLoader here: Either we were called from the
     // task, or our caller updateFromElement cleared the task's loader (and set
     // m_pendingTask to null).
     m_pendingTask.clear();
     // Make sure to only decrement the count when we exit this function
     OwnPtr<IncrementLoadEventDelayCount> loadDelayCounter;
     loadDelayCounter.swap(m_loadDelayCounter);
 
     Document& document = m_element->document();
@@ skipping 49 matching lines @@
         m_imageComplete = !newImage;
 
         updateRenderer();
         // If newImage exists and is cached, addClient() will result in the load event
         // being queued to fire. Ensure this happens after beforeload is dispatched.
         if (newImage)
             newImage->addClient(this);
 
         if (oldImage)
             oldImage->removeClient(this);
+    } else if (updateBehavior == UpdateForce) {
+        if (m_element->renderer() && m_element->renderer()->isImage())

[esprehn, 2014/07/25 23:51:56]

combine with the other ifs?

if (updateBehavior == UpdateForce && m_element->renderer() &&
m_element->renderer()->isImage()) {
  ...
}

+            toRenderImage(m_element->renderer())->intrinsicSizeChanged();
     }
 
     if (RenderImageResource* imageResource = renderImageResource())
         imageResource->resetAnimation();
 
     // Only consider updating the protection ref-count of the Element immediately before returning
     // from this function as doing so might result in the destruction of this ImageLoader.
     updatedHasPendingEvent();
 }
 
-void ImageLoader::updateFromElement(UpdateFromElementBehavior behavior, LoadType loadType)
+void ImageLoader::updateFromElement(UpdateFromElementBehavior updateBehavior, LoadType loadType)
 {
     AtomicString imageSourceURL = m_element->imageSourceURL();
 
-    if (behavior == UpdateIgnorePreviousError)
+    if (updateBehavior == UpdateIgnorePreviousError)
         clearFailedLoadURL();
 
     if (!m_failedLoadURL.isEmpty() && imageSourceURL == m_failedLoadURL)
         return;
 
     // If we have a pending task, we have to clear it -- either we're
     // now loading immediately, or we need to reset the task's state.
     if (m_pendingTask) {
         m_pendingTask->clearLoader();
         m_pendingTask.clear();
     }
 
     KURL url = imageSourceToKURL(imageSourceURL);
     if (imageSourceURL.isNull() || url.isNull() || shouldLoadImmediately(url, loadType)) {
-        doUpdateFromElement(DoNotBypassMainWorldCSP);
+        doUpdateFromElement(DoNotBypassMainWorldCSP, updateBehavior);
         return;
     }
-    enqueueImageLoadingMicroTask();
+    enqueueImageLoadingMicroTask(updateBehavior);
 }
 
 KURL ImageLoader::imageSourceToKURL(AtomicString imageSourceURL) const
 {
     KURL url;
 
     // Don't load images for inactive documents. We don't want to slow down the
     // raw HTML parsing case by loading images we don't intend to display.
     Document& document = m_element->document();
     if (!document.isActive())
@@ skipping 215 matching lines @@
 }
 
 #if ENABLE(OILPAN)
 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
 {
     m_loader.willRemoveClient(m_client);
 }
 #endif
 
 }