Commit 7cfa204e authored by japhet@chromium.org's avatar japhet@chromium.org
Browse files

2012-02-17 Nate Chapin <japhet@chromium.org>

        [Chromium mac] Cursors and background images disappear.
        https://bugs.webkit.org/show_bug.cgi?id=78834

        The issue occurs because a CachedImage sees that it has no clients
        and decide it is safe to purge its m_data buffer. However,
        StyleCachedImage is holding a CachedResourceHandle to the
        CachedImage, and it can still add a client later. If it does so,
        the CachedImage says everything is loaded but has no data.

        Reviewed by Adam Barth.

        No new tests, since the known repros have resisted reduction.
        Tested manually with chrome.angrybirds.com, redfin.com and a
        couple of other sites.

        * rendering/style/StyleCachedImage.cpp:
        * rendering/style/StyleCachedImage.h: Ensure the underlying
            CachedImage has a client for the lifetime of the
            StyleCachedImage and doesn't purge its buffer. Call
            addClient(this) in the constructor and removeClient(this) in
            the destructor, then ignore all cache callbacks.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108100 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 55d1e1b7
2012-02-17 Nate Chapin <japhet@chromium.org>
[Chromium mac] Cursors and background images disappear.
https://bugs.webkit.org/show_bug.cgi?id=78834
The issue occurs because a CachedImage sees that it has no clients
and decide it is safe to purge its m_data buffer. However,
StyleCachedImage is holding a CachedResourceHandle to the
CachedImage, and it can still add a client later. If it does so,
the CachedImage says everything is loaded but has no data.
Reviewed by Adam Barth.
No new tests, since the known repros have resisted reduction.
Tested manually with chrome.angrybirds.com, redfin.com and a
couple of other sites.
* rendering/style/StyleCachedImage.cpp:
* rendering/style/StyleCachedImage.h: Ensure the underlying
CachedImage has a client for the lifetime of the
StyleCachedImage and doesn't purge its buffer. Call
addClient(this) in the constructor and removeClient(this) in
the destructor, then ignore all cache callbacks.
2012-02-17 Julien Chaffraix <jchaffraix@webkit.org>
 
Table cell's anonymous wrappers are left in the tree, impacting our layout
......@@ -24,11 +24,22 @@
#include "config.h"
#include "StyleCachedImage.h"
#include "CachedImage.h"
#include "RenderObject.h"
namespace WebCore {
StyleCachedImage::StyleCachedImage(CachedImage* image)
: m_image(image)
{
m_isCachedImage = true;
m_image->addClient(this);
}
StyleCachedImage::~StyleCachedImage()
{
m_image->removeClient(this);
}
PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
{
return CSSPrimitiveValue::create(m_image->url(), CSSPrimitiveValue::CSS_URI);
......
......@@ -24,16 +24,18 @@
#ifndef StyleCachedImage_h
#define StyleCachedImage_h
#include "CachedImage.h"
#include "CachedResourceHandle.h"
#include "StyleImage.h"
namespace WebCore {
class CachedImage;
class StyleCachedImage : public StyleImage {
class StyleCachedImage : public StyleImage, private CachedImageClient {
WTF_MAKE_FAST_ALLOCATED;
public:
static PassRefPtr<StyleCachedImage> create(CachedImage* image) { return adoptRef(new StyleCachedImage(image)); }
virtual ~StyleCachedImage();
virtual WrappedImagePtr data() const { return m_image.get(); }
virtual PassRefPtr<CSSValue> cssValue() const;
......@@ -54,11 +56,7 @@ public:
virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
private:
StyleCachedImage(CachedImage* image)
: m_image(image)
{
m_isCachedImage = true;
}
explicit StyleCachedImage(CachedImage*);
CachedResourceHandle<CachedImage> m_image;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment