Merge 68004 - 2010-09-21 Cosmin Truta <ctruta@chromium.org>...

WebCore/rendering/RenderImage.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) 
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * 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
@@ skipping 43 matching lines @@
 protected:
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
     virtual void paintIntoRect(GraphicsContext*, const IntRect&);
     void paintFocusRings(PaintInfo&, const RenderStyle*);
     virtual void paint(PaintInfo&, int tx, int ty);
 
     bool isWidthSpecified() const;
     bool isHeightSpecified() const;
 
-    virtual void intrinsicSizeChanged() { imageChanged(m_imageResource->imagePtr()); }
+    virtual void intrinsicSizeChanged()
+    {
+        if (m_imageResource)
+            imageChanged(m_imageResource->imagePtr());
+    }
 
 private:
     virtual const char* renderName() const { return "RenderImage"; }
 
     virtual bool isImage() const { return true; }
     virtual bool isRenderImage() const { return true; }
 
     virtual void paintReplaced(PaintInfo&, int tx, int ty);
 
     virtual int minimumReplacedHeight() const;
@@ skipping 28 matching lines @@
     ASSERT(!object || object->isRenderImage());
     return static_cast<const RenderImage*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderImage(const RenderImage*);
 
 } // namespace WebCore
 
 #endif // RenderImage_h