Changeset 180455 in webkit

Timestamp:

Feb 20, 2015, 2:24:31 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

<attachment> turns the wrong blue when you highlight it
​https://bugs.webkit.org/show_bug.cgi?id=141853

Reviewed by Simon Fraser.

• rendering/RenderAttachment.h:
• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::shouldDrawSelectionTint):
(WebCore::RenderReplaced::paint):

• rendering/RenderReplaced.h:

Don't draw the selection tint for RenderAttachment.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderAttachment.h (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (2 diffs)
• rendering/RenderReplaced.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-20  Tim Horton  <timothy_horton@apple.com>
+
+        <attachment> turns the wrong blue when you highlight it
+        https://bugs.webkit.org/show_bug.cgi?id=141853
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderAttachment.h:
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::shouldDrawSelectionTint):
+        (WebCore::RenderReplaced::paint):
+        * rendering/RenderReplaced.h:
+        Don't draw the selection tint for RenderAttachment.
+
 2015-02-20  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderAttachment.h

@@ -48 +48 @@
     virtual const char* renderName() const override { return "RenderAttachment"; }
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
+
+    virtual bool shouldDrawSelectionTint() const override { return false; }
 };
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -131 +131 @@
 }
 
+bool RenderReplaced::shouldDrawSelectionTint() const
+{
+    return selectionState() != SelectionNone && !document().printing();
+}
+
 void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
@@ -156 +161 @@
         return;
     
-    bool drawSelectionTint = selectionState() != SelectionNone && !document().printing();
+    bool drawSelectionTint = shouldDrawSelectionTint();
     if (paintInfo.phase == PaintPhaseSelection) {
         if (selectionState() == SelectionNone)

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -87 +87 @@
     void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio) const;
 
+    virtual bool shouldDrawSelectionTint() const;
+
     mutable LayoutSize m_intrinsicSize;
 };