Changeset 181114 in webkit

Timestamp:

Mar 5, 2015 4:34:25 PM (9 years ago)

Author:

timothy_horton@apple.com

Message:

<attachment> should support indication of download progress
​https://bugs.webkit.org/show_bug.cgi?id=142336
<rdar://problem/19982504>

Reviewed by Anders Carlsson.

• html/HTMLAttachmentElement.cpp:

(WebCore::HTMLAttachmentElement::parseAttribute):
Invalidate the attachment if the progress attribute changes.

• platform/graphics/FloatRoundedRect.h:

(WebCore::FloatRoundedRect::Radii::Radii):
Add a Radii constructor that takes a single argument that is used
as the radius for all corners, for convenience.

• rendering/RenderThemeMac.mm:

(WebCore::attachmentProgressBarBackgroundColor):
(WebCore::attachmentProgressBarFillColor):
(WebCore::attachmentProgressBarBorderColor):
Add a bunch of constants for the progress bar.

(WebCore::paintAttachmentIconBackground):
Make use of fillRoundedRect instead of creating a path.

(WebCore::paintAttachmentProgress):
(WebCore::RenderThemeMac::paintAttachment):
Paint a progress bar if the progress attribute exists and
is a valid floating point number.

• fast/attachment/attachment-progress.html: Added.
• platform/mac/fast/attachment/attachment-progress-expected.png: Added.
• platform/mac/fast/attachment/attachment-progress-expected.txt: Added.
• platform/mac-mavericks/fast/attachment/attachment-progress-expected.txt: Added.

Add a test for the <attachment> progress attribute.

• platform/mac/fast/attachment/attachment-rendering-expected.png:

Rebaseline a test that changed in r181058 (and will change again!), but
which didn't start failing because the pixel test tolerance is such that
it only fails the hash check and not the test itself.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/attachment/attachment-progress.html (added)
• LayoutTests/platform/mac-mavericks/fast/attachment/attachment-progress-expected.txt (added)
• LayoutTests/platform/mac/fast/attachment/attachment-progress-expected.png (added)
• LayoutTests/platform/mac/fast/attachment/attachment-progress-expected.txt (added)
• LayoutTests/platform/mac/fast/attachment/attachment-rendering-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLAttachmentElement.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/FloatRoundedRect.h (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeMac.mm (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-05  Timothy Horton  <timothy_horton@apple.com>
+
+        <attachment> should support indication of download progress
+        https://bugs.webkit.org/show_bug.cgi?id=142336
+        <rdar://problem/19982504>
+
+        Reviewed by Anders Carlsson.
+
+        * fast/attachment/attachment-progress.html: Added.
+        * platform/mac/fast/attachment/attachment-progress-expected.png: Added.
+        * platform/mac/fast/attachment/attachment-progress-expected.txt: Added.
+        * platform/mac-mavericks/fast/attachment/attachment-progress-expected.txt: Added.
+        Add a test for the <attachment> progress attribute.
+
+        * platform/mac/fast/attachment/attachment-rendering-expected.png:
+        Rebaseline a test that changed in r181058 (and will change again!), but
+        which didn't start failing because the pixel test tolerance is such that
+        it only fails the hash check and not the test itself.
+
 2015-03-05  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-05  Timothy Horton  <timothy_horton@apple.com>
+
+        <attachment> should support indication of download progress
+        https://bugs.webkit.org/show_bug.cgi?id=142336
+        <rdar://problem/19982504>
+
+        Reviewed by Anders Carlsson.
+
+        * html/HTMLAttachmentElement.cpp:
+        (WebCore::HTMLAttachmentElement::parseAttribute):
+        Invalidate the attachment if the progress attribute changes.
+
+        * platform/graphics/FloatRoundedRect.h:
+        (WebCore::FloatRoundedRect::Radii::Radii):
+        Add a Radii constructor that takes a single argument that is used
+        as the radius for all corners, for convenience.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::attachmentProgressBarBackgroundColor):
+        (WebCore::attachmentProgressBarFillColor):
+        (WebCore::attachmentProgressBarBorderColor):
+        Add a bunch of constants for the progress bar.
+
+        (WebCore::paintAttachmentIconBackground):
+        Make use of fillRoundedRect instead of creating a path.
+
+        (WebCore::paintAttachmentProgress):
+        (WebCore::RenderThemeMac::paintAttachment):
+        Paint a progress bar if the progress attribute exists and
+        is a valid floating point number.
+
 2015-03-05  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/html/HTMLAttachmentElement.cpp

@@ -75 +75 @@
 void HTMLAttachmentElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    if (name == subtitleAttr && is<RenderAttachment>(renderer())) {
+    if ((name == progressAttr || name == subtitleAttr) && is<RenderAttachment>(renderer())) {
         downcast<RenderAttachment>(*renderer()).invalidate();
         return;

trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h

@@ -55 +55 @@
             , m_bottomLeft(intRadii.bottomLeft())
             , m_bottomRight(intRadii.bottomRight())
+        {
+        }
+
+        explicit Radii(float uniformRadius)
+            : m_topLeft(uniformRadius, uniformRadius)
+            , m_topRight(uniformRadius, uniformRadius)
+            , m_bottomLeft(uniformRadius, uniformRadius)
+            , m_bottomRight(uniformRadius, uniformRadius)
         {
         }

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -2095 +2095 @@
 static Color attachmentSubtitleTextColor() { return Color(82, 145, 214, 255); }
 
+const CGFloat attachmentProgressBarWidth = 30;
+const CGFloat attachmentProgressBarHeight = 5;
+const CGFloat attachmentProgressBarOffset = -9;
+const CGFloat attachmentProgressBarBorderWidth = 1;
+static Color attachmentProgressBarBackgroundColor() { return Color(0, 0, 0, 89); }
+static Color attachmentProgressBarFillColor() { return Color(Color::white); }
+static Color attachmentProgressBarBorderColor() { return Color(0, 0, 0, 128); }
+
 const CGFloat attachmentMargin = 3;
 
@@ -2301 +2309 @@
         backgroundRect.inflate(-attachmentIconSelectionBorderThickness);
 
-    FloatSize iconBackgroundRadiusSize(attachmentIconBackgroundRadius, attachmentIconBackgroundRadius);
-
-    Path backgroundPath;
-    backgroundPath.addRoundedRect(backgroundRect, iconBackgroundRadiusSize);
-    context.setFillColor(attachmentIconBackgroundColor(), ColorSpaceDeviceRGB);
-    context.fillPath(backgroundPath);
+    context.fillRoundedRect(FloatRoundedRect(backgroundRect, FloatRoundedRect::Radii(attachmentIconBackgroundRadius)), attachmentIconBackgroundColor(), ColorSpaceDeviceRGB);
 
     if (paintBorder) {
@@ -2312 +2315 @@
         borderRect.inflate(-attachmentIconSelectionBorderThickness / 2);
 
+        FloatSize iconBackgroundRadiusSize(attachmentIconBackgroundRadius, attachmentIconBackgroundRadius);
         Path borderPath;
         borderPath.addRoundedRect(borderRect, iconBackgroundRadiusSize);
@@ -2495 +2499 @@
 }
 
+static void paintAttachmentProgress(const RenderAttachment& attachment, GraphicsContext& context, AttachmentLayout& layout)
+{
+    String progressString = attachment.attachmentElement().fastGetAttribute(progressAttr);
+    if (progressString.isEmpty())
+        return;
+    bool validProgress;
+    float progress = progressString.toFloat(&validProgress);
+    if (!validProgress)
+        return;
+
+    GraphicsContextStateSaver saver(context);
+
+    FloatRect progressBounds((attachmentIconBackgroundSize - attachmentProgressBarWidth) / 2, layout.iconBackgroundRect.maxY() + attachmentProgressBarOffset - attachmentProgressBarHeight, attachmentProgressBarWidth, attachmentProgressBarHeight);
+
+    FloatRect borderRect = progressBounds;
+    borderRect.inflate(-0.5);
+    FloatRect backgroundRect = borderRect;
+    backgroundRect.inflate(-attachmentProgressBarBorderWidth / 2);
+
+    FloatRoundedRect backgroundRoundedRect(backgroundRect, FloatRoundedRect::Radii(backgroundRect.height() / 2));
+    context.fillRoundedRect(backgroundRoundedRect, attachmentProgressBarBackgroundColor(), ColorSpaceDeviceRGB);
+
+    {
+        GraphicsContextStateSaver clipSaver(context);
+        context.clipRoundedRect(backgroundRoundedRect);
+
+        FloatRect progressRect = progressBounds;
+        progressRect.setWidth(progressRect.width() * progress);
+        progressRect = encloseRectToDevicePixels(progressRect, attachment.document().deviceScaleFactor());
+
+        context.fillRect(progressRect, attachmentProgressBarFillColor(), ColorSpaceDeviceRGB);
+    }
+
+    Path borderPath;
+    float borderRadius = borderRect.height() / 2;
+    borderPath.addRoundedRect(borderRect, FloatSize(borderRadius, borderRadius));
+    context.setStrokeColor(attachmentProgressBarBorderColor(), ColorSpaceDeviceRGB);
+    context.setStrokeThickness(attachmentProgressBarBorderWidth);
+    context.strokePath(borderPath);
+}
+
 bool RenderThemeMac::paintAttachment(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& paintRect)
 {
@@ -2520 +2565 @@
     paintAttachmentTitle(attachment, context, layout);
     paintAttachmentSubtitle(attachment, context, layout);
+    paintAttachmentProgress(attachment, context, layout);
 
     return true;