Changeset 26591 in webkit

Timestamp:

Oct 14, 2007 4:59:35 AM (17 years ago)

Author:

bdash

Message:

2007-10-14 Peter Kasting <​zerodpx@gmail.com>

Reviewed by Maciej.

​http://bugs.webkit.org/show_bug.cgi?id=15210
Draw the image outline even for broken images.

• rendering/RenderImage.cpp: (WebCore::RenderImage::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderImage.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-14  Peter Kasting  <zerodpx@gmail.com>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15210
+        Draw the image outline even for broken images.
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::paint):
+
 2007-10-14  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/rendering/RenderImage.cpp

@@ -224 +224 @@
 
         if (cWidth > 2 && cHeight > 2) {
-            if (!errorOccurred()) {
-                context->setStrokeStyle(SolidStroke);
-                context->setStrokeColor(Color::lightGray);
-                context->setFillColor(Color::transparent);
-                context->drawRect(IntRect(tx + leftBorder + leftPad, ty + topBorder + topPad, cWidth, cHeight));
-            }
+            // Draw an outline rect where the image should be.
+            context->setStrokeStyle(SolidStroke);
+            context->setStrokeColor(Color::lightGray);
+            context->setFillColor(Color::transparent);
+            context->drawRect(IntRect(tx + leftBorder + leftPad, ty + topBorder + topPad, cWidth, cHeight));
 
             bool errorPictureDrawn = false;
             int imageX = 0;
             int imageY = 0;
-            int usableWidth = cWidth;
-            int usableHeight = cHeight;
+            // When calculating the usable dimensions, exclude the pixels of
+            // the ouline rect so the error image/alt text doesn't draw on it.
+            int usableWidth = cWidth - 2;
+            int usableHeight = cHeight - 2;
 
             if (errorOccurred() && !image()->isNull() && (usableWidth >= image()->width()) && (usableHeight >= image()->height())) {