diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebCore/wml | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebCore/wml')
| -rw-r--r-- | WebCore/wml/WMLImageElement.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/wml/WMLImageElement.cpp b/WebCore/wml/WMLImageElement.cpp index d47868a..e577218 100644 --- a/WebCore/wml/WMLImageElement.cpp +++ b/WebCore/wml/WMLImageElement.cpp @@ -94,13 +94,12 @@ void WMLImageElement::attach() { WMLElement::attach(); - if (renderer() && renderer()->isImage()) { + if (renderer() && renderer()->isImage() && m_imageLoader.haveFiredBeforeLoadEvent()) { RenderImage* imageObj = toRenderImage(renderer()); if (imageObj->hasImage()) return; - imageObj->setCachedImage(m_imageLoader.image()); - + // If we have no image at all because we have no src attribute, set // image height and width for the alt text instead. if (!m_imageLoader.image() && !imageObj->cachedImage()) |