Expand tap highlight to allow multiple highlights for touch disambiguation.

Source/core/platform/graphics/GraphicsLayer.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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 24 matching lines @@
 #include "core/platform/graphics/FloatSize.h"
 #include "core/platform/graphics/GraphicsLayerClient.h"
 #include "core/platform/graphics/IntRect.h"
 #include "core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h"
 #include "core/platform/graphics/filters/FilterOperations.h"
 #include "core/platform/graphics/transforms/TransformationMatrix.h"
 
 #include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
+#include "wtf/Vector.h"
 
 #include "public/platform/WebAnimationDelegate.h"
 #include "public/platform/WebCompositingReasons.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebImageLayer.h"
 #include "public/platform/WebLayerClient.h"
 #include "public/platform/WebLayerScrollClient.h"
 #include "public/platform/WebNinePatchLayer.h"
 #include "public/platform/WebSolidColorLayer.h"
 
@@ skipping 226 matching lines @@
     double backingStoreMemoryEstimate() const;
 
     void resetTrackedRepaints();
     void addRepaintRect(const FloatRect&);
 
     static bool supportsBackgroundColorContent()
     {
         return false;
     }
 
-    void setLinkHighlight(LinkHighlightClient*);
+    void addLinkHighlight(LinkHighlightClient*);
+    void removeLinkHighlight(LinkHighlightClient*);
     // Exposed for tests
-    LinkHighlightClient* linkHighlight() { return m_linkHighlight; }
+    unsigned numLinkHighlights() { return m_linkHighlights.size(); }
+    LinkHighlightClient* linkHighlight(int i) { return m_linkHighlights[i]; }
 
     void setScrollableArea(ScrollableArea*, bool isMainFrame);
     ScrollableArea* scrollableArea() const { return m_scrollableArea; }
 
     WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); }
 
     // Exposed for tests. FIXME - name is too similar to contentLayer(), very error prone.
     WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; }
 
     static void registerContentsLayer(WebKit::WebLayer*);
@@ skipping 90 matching lines @@
     OwnPtr<WebKit::WebContentLayer> m_layer;
     OwnPtr<WebKit::WebImageLayer> m_imageLayer;
     OwnPtr<WebKit::WebNinePatchLayer> m_ninePatchLayer;
     WebKit::WebLayer* m_contentsLayer;
     // We don't have ownership of m_contentsLayer, but we do want to know if a given layer is the
     // same as our current layer in setContentsTo(). Since m_contentsLayer may be deleted at this point,
     // we stash an ID away when we know m_contentsLayer is alive and use that for comparisons from that point
     // on.
     int m_contentsLayerId;
 
-    LinkHighlightClient* m_linkHighlight;
+    Vector<LinkHighlightClient*> m_linkHighlights;
 
     OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLayerDelegate;
 
     ContentsLayerPurpose m_contentsLayerPurpose;
 
     typedef HashMap<String, int> AnimationIdMap;
     AnimationIdMap m_animationIdMap;
 
     ScrollableArea* m_scrollableArea;
     WebKit::WebCompositingReasons m_compositingReasons;
 };
 
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
 #endif
 
 #endif // GraphicsLayer_h