Changeset 220073 in webkit


Ignore:
Timestamp:
Jul 31, 2017, 1:31:05 PM (8 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r220048.

This revision caused multiple crashes in fast/images. See
webkit.org/b/174990

Reverted changeset:

"RenderImageResourceStyleImage::image() should return the
nullImage() if the image is not available"
​https://bugs.webkit.org/show_bug.cgi?id=174874
​http://trac.webkit.org/changeset/220048

Location:
trunk
Files:
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r220072 r220073  
     12017-07-31  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r220048.
     4
     5        This revision caused multiple crashes in fast/images. See
     6        webkit.org/b/174990
     7
     8        Reverted changeset:
     9
     10        "RenderImageResourceStyleImage::image() should return the
     11        nullImage() if the image is not available"
     12        https://bugs.webkit.org/show_bug.cgi?id=174874
     13        http://trac.webkit.org/changeset/220048
     14
    1152017-07-31  Per Arne Vollan  <pvollan@apple.com>
    216

  • trunk/Source/WebCore/ChangeLog

    r220071 r220073  
     12017-07-31  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r220048.
     4
     5        This revision caused multiple crashes in fast/images. See
     6        webkit.org/b/174990
     7
     8        Reverted changeset:
     9
     10        "RenderImageResourceStyleImage::image() should return the
     11        nullImage() if the image is not available"
     12        https://bugs.webkit.org/show_bug.cgi?id=174874
     13        http://trac.webkit.org/changeset/220048
     14
    1152017-07-31  Sam Weinig  <sam@webkit.org>
    216

  • trunk/Source/WebCore/css/CSSCrossfadeValue.cpp

    r220048 r220073  
    3434#include "CrossfadeGeneratedImage.h"
    3535#include "RenderElement.h"
     36#include "StyleCachedImage.h"
    3637#include <wtf/text/StringBuilder.h>
    3738

  • trunk/Source/WebCore/css/CSSFilterImageValue.cpp

    r220048 r220073  
    3434#include "ImageBuffer.h"
    3535#include "RenderElement.h"
     36#include "StyleCachedImage.h"
    3637#include "StyleResolver.h"
    3738#include <wtf/text/StringBuilder.h>

  • trunk/Source/WebCore/page/EventHandler.cpp

    r220048 r220073  
    8787#include "ShadowRoot.h"
    8888#include "SpatialNavigation.h"
     89#include "StyleCachedImage.h"
    8990#include "TextEvent.h"
    9091#include "TextIterator.h"

  • trunk/Source/WebCore/page/PageSerializer.cpp

    r220048 r220073  
    5353#include "Page.h"
    5454#include "RenderElement.h"
     55#include "StyleCachedImage.h"
    5556#include "StyleImage.h"
    5657#include "StyleProperties.h"

  • trunk/Source/WebCore/rendering/RenderElement.cpp

    r220048 r220073  
    5151#include "RenderFlexibleBox.h"
    5252#include "RenderImage.h"
     53#include "RenderImageResourceStyleImage.h"
    5354#include "RenderInline.h"
    5455#include "RenderIterator.h"

  • trunk/Source/WebCore/rendering/RenderImageResource.cpp

    r220048 r220073  
    3333#include "RenderElement.h"
    3434#include "RenderImage.h"
     35#include "RenderImageResourceStyleImage.h"
    3536
    3637namespace WebCore {

  • trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp

    r220048 r220073  
    3131#include "CachedImage.h"
    3232#include "RenderElement.h"
     33#include "StyleCachedImage.h"
    3334
    3435namespace WebCore {
    … …  
    4849
    4950    if (m_styleImage->isCachedImage())
    50         m_cachedImage = m_styleImage->cachedImage();
     51        m_cachedImage = m_styleImage.get().cachedImage();
    5152
    5253    m_styleImage->addClient(m_renderer);
    … …  
    5657{
    5758    ASSERT(m_renderer);
    58     image()->stopAnimation();
    5959    m_styleImage->removeClient(m_renderer);
    60     m_cachedImage = nullptr;
     60    if (m_cachedImage) {
     61        image()->stopAnimation();
     62        m_cachedImage = nullptr;
     63    }
    6164}
    6265
    … …  
    6467{
    6568    // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
    66     if (m_styleImage->isPending())
    67         return &Image::nullImage();
    68     if (auto image = m_styleImage->image(m_renderer, size))
    69         return image;
    70     return &Image::nullImage();
     69    return !m_styleImage->isPending() ? m_styleImage->image(m_renderer, size) : &Image::nullImage();
    7170}
    7271

  • trunk/Source/WebCore/rendering/style/ContentData.cpp

    r220048 r220073  
    2626#include "RenderImage.h"
    2727#include "RenderImageResource.h"
     28#include "RenderImageResourceStyleImage.h"
    2829#include "RenderQuote.h"
    2930#include "RenderStyle.h"

  • trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp

    r220048 r220073  
    3030#include "CachedImage.h"
    3131#include "RenderElement.h"
     32#include "RenderView.h"
    3233
    3334namespace WebCore {

  • trunk/Source/WebCore/style/StylePendingResources.cpp

    r220048 r220073  
    3535#include "RenderStyle.h"
    3636#include "SVGURIReference.h"
     37#include "StyleCachedImage.h"
    3738#include "StyleGeneratedImage.h"
    3839#include "TransformFunctions.h"
Note: See TracChangeset for help on using the changeset viewer.