Changeset 249507 in webkit

Timestamp:

Sep 4, 2019 6:02:17 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Line artifacts in note body after viewing note with <attachment>s
​https://bugs.webkit.org/show_bug.cgi?id=201474
<rdar://problem/51306108>

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/attachment/attachment-border-should-stay-inside-attachment.html

• rendering/RenderThemeIOS.mm:

(WebCore::attachmentBorderPath):
(WebCore::paintAttachmentBorder):
Inset the border rect by half the width, so that <attachment> doesn't
paint out-of-bounds.

LayoutTests:

• fast/attachment/attachment-border-should-stay-inside-attachment-expected.html: Added.
• fast/attachment/attachment-border-should-stay-inside-attachment.html: Added.

Add a test that ensures that <attachment> stays inside its bounds.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/attachment/attachment-border-should-stay-inside-attachment-expected.html (added)
• LayoutTests/fast/attachment/attachment-border-should-stay-inside-attachment.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeIOS.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-09-04  Tim Horton  <timothy_horton@apple.com>
+
+        Line artifacts in note body after viewing note with <attachment>s
+        https://bugs.webkit.org/show_bug.cgi?id=201474
+        <rdar://problem/51306108>
+
+        Reviewed by Simon Fraser.
+
+        * fast/attachment/attachment-border-should-stay-inside-attachment-expected.html: Added.
+        * fast/attachment/attachment-border-should-stay-inside-attachment.html: Added.
+        Add a test that ensures that <attachment> stays inside its bounds.
+
 2019-09-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-04  Tim Horton  <timothy_horton@apple.com>
+
+        Line artifacts in note body after viewing note with <attachment>s
+        https://bugs.webkit.org/show_bug.cgi?id=201474
+        <rdar://problem/51306108>
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/attachment/attachment-border-should-stay-inside-attachment.html
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::attachmentBorderPath):
+        (WebCore::paintAttachmentBorder):
+        Inset the border rect by half the width, so that <attachment> doesn't
+        paint out-of-bounds.
+
 2019-09-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1530 +1530 @@
 const CGFloat attachmentBorderRadius = 16;
 static Color attachmentBorderColor() { return Color(204, 204, 204); }
+static CGFloat attachmentBorderThickness = 1;
 
 static Color attachmentProgressColor() { return Color(222, 222, 222); }
@@ -1840 +1841 @@
 static Path attachmentBorderPath(RenderAttachmentInfo& info)
 {
+    auto insetAttachmentRect = info.attachmentRect;
+    insetAttachmentRect.inflate(-attachmentBorderThickness / 2);
+
     Path borderPath;
-    borderPath.addRoundedRect(info.attachmentRect, FloatSize(attachmentBorderRadius, attachmentBorderRadius));
+    borderPath.addRoundedRect(insetAttachmentRect, FloatSize(attachmentBorderRadius, attachmentBorderRadius));
     return borderPath;
 }
@@ -1848 +1852 @@
 {
     context.setStrokeColor(attachmentBorderColor());
-    context.setStrokeThickness(1);
+    context.setStrokeThickness(attachmentBorderThickness);
     context.strokePath(borderPath);
 }