Fix link highlights on links that contain images.

Source/web/LinkHighlight.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 31 matching lines @@
 #include "core/rendering/style/ShadowData.h"
 #include "platform/graphics/Color.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAnimationCurve.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFloatAnimationCurve.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebSize.h"
 #include "wtf/CurrentTime.h"
+#include "wtf/Vector.h"
 
 using namespace WebCore;
 
 namespace blink {
 
 class WebViewImpl;
 
 PassOwnPtr<LinkHighlight> LinkHighlight::create(Node* node, WebViewImpl* owningWebViewImpl)
 {
     return adoptPtr(new LinkHighlight(node, owningWebViewImpl));
@@ skipping 115 matching lines @@
 static void addQuadToPath(const FloatQuad& quad, Path& path)
 {
     // FIXME: Make this create rounded quad-paths, just like the axis-aligned case.
     path.moveTo(quad.p1());
     path.addLineTo(quad.p2());
     path.addLineTo(quad.p3());
     path.addLineTo(quad.p4());
     path.closeSubpath();
 }
 
+void LinkHighlight::computeQuads(RenderObject* renderer, Vector<FloatQuad>& outQuads) const
+{
+    if (!renderer)
+        return;
+
+    Vector<FloatQuad> newQuads;
+    renderer->absoluteQuads(newQuads);
+
+    // As an optimization and to ensure we draw a rounded highlight, ensure we don't add
+    // any quads that are contained in an existing quad. If there is more than one
+    // quad returned they won't get rounded (see FIXME in computeHighlightLayerPathAndPosition).
+    for (unsigned i = 0; i < outQuads.size(); ++i) {

[aelias_OOO_until_Jul13, 2014/01/11 00:22:45]

Nit: use size_t instead of unsigned

+        for (unsigned newIx = newQuads.size(); newIx > 0; --newIx) {
+            if (outQuads[i].containsQuad(newQuads[newIx - 1]))
+                newQuads.remove(newIx - 1);

[aelias_OOO_until_Jul13, 2014/01/11 00:22:45]

removal is an O(n) operation on a Vector.  In addition this is within two loops
inside a recursive call.  I'm concerned the running time of this algorithm may
become pathological.  Could you give some thought about how this could be done
more efficiently?

+        }
+    }
+
+    outQuads.append(newQuads);
+
+    // For inline elements, absoluteQuads will return a line box based on the line-height
+    // and font metrics, which is technically incorrect as replaced elements like images
+    // should use their intristic height and expand the linebox  as needed. To get an
+    // appropriately sized highlight we descend into the children and have them add their
+    // boxes.
+    if (renderer->isInline()) {
+        for (RenderObject* child = renderer->firstChild(); child; child = child->nextSibling())
+            computeQuads(child, outQuads);
+    }
+
+}
+
 bool LinkHighlight::computeHighlightLayerPathAndPosition(RenderLayer* compositingLayer)
 {
     if (!m_node || !m_node->renderer() || !m_currentGraphicsLayer)
         return false;
 
     ASSERT(compositingLayer);
 
     // Get quads for node in absolute coordinates.
     Vector<FloatQuad> quads;
-    m_node->renderer()->absoluteQuads(quads);
+    computeQuads(m_node->renderer(), quads);
     ASSERT(quads.size());
 
     // Adjust for offset between target graphics layer and the node's renderer.
     FloatPoint positionAdjust = IntPoint(m_currentGraphicsLayer->offsetFromRenderer());
 
     Path newPath;
     for (unsigned quadIndex = 0; quadIndex < quads.size(); ++quadIndex) {
         FloatQuad absoluteQuad = quads[quadIndex];
         absoluteQuad.move(-positionAdjust.x(), -positionAdjust.y());
 
@@ skipping 126 matching lines @@
     // Make sure we update geometry on the next callback from WebViewImpl::layout().
     m_geometryNeedsUpdate = true;
 }
 
 WebLayer* LinkHighlight::layer()
 {
     return clipLayer();
 }
 
 } // namespace WeKit