Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: Source/core/platform/graphics/GraphicsLayer.h

Issue 15663005: Expand tap highlight to allow multiple highlights for touch disambiguation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 23 matching lines...) Expand all
34 #include "core/platform/graphics/GraphicsLayerClient.h" 34 #include "core/platform/graphics/GraphicsLayerClient.h"
35 #include "core/platform/graphics/IntRect.h" 35 #include "core/platform/graphics/IntRect.h"
36 #include "core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate .h" 36 #include "core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate .h"
37 #include "core/platform/graphics/filters/FilterOperations.h" 37 #include "core/platform/graphics/filters/FilterOperations.h"
38 #include "core/platform/graphics/transforms/TransformOperations.h" 38 #include "core/platform/graphics/transforms/TransformOperations.h"
39 #include "core/platform/graphics/transforms/TransformationMatrix.h" 39 #include "core/platform/graphics/transforms/TransformationMatrix.h"
40 40
41 #include "wtf/HashMap.h" 41 #include "wtf/HashMap.h"
42 #include "wtf/OwnPtr.h" 42 #include "wtf/OwnPtr.h"
43 #include "wtf/PassOwnPtr.h" 43 #include "wtf/PassOwnPtr.h"
44 #include "wtf/Vector.h"
44 45
45 #include "public/platform/WebAnimationDelegate.h" 46 #include "public/platform/WebAnimationDelegate.h"
46 #include "public/platform/WebCompositingReasons.h" 47 #include "public/platform/WebCompositingReasons.h"
47 #include "public/platform/WebContentLayer.h" 48 #include "public/platform/WebContentLayer.h"
48 #include "public/platform/WebImageLayer.h" 49 #include "public/platform/WebImageLayer.h"
49 #include "public/platform/WebLayerScrollClient.h" 50 #include "public/platform/WebLayerScrollClient.h"
50 #include "public/platform/WebSolidColorLayer.h" 51 #include "public/platform/WebSolidColorLayer.h"
51 52
52 enum LayerTreeAsTextBehaviorFlags { 53 enum LayerTreeAsTextBehaviorFlags {
53 LayerTreeAsTextBehaviorNormal = 0, 54 LayerTreeAsTextBehaviorNormal = 0,
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 double backingStoreMemoryEstimate() const; 424 double backingStoreMemoryEstimate() const;
424 425
425 void resetTrackedRepaints(); 426 void resetTrackedRepaints();
426 void addRepaintRect(const FloatRect&); 427 void addRepaintRect(const FloatRect&);
427 428
428 static bool supportsBackgroundColorContent() 429 static bool supportsBackgroundColorContent()
429 { 430 {
430 return false; 431 return false;
431 } 432 }
432 433
433 void setLinkHighlight(LinkHighlightClient*); 434 void addLinkHighlight(LinkHighlightClient*);
435 void removeLinkHighlight(LinkHighlightClient*);
434 // Exposed for tests 436 // Exposed for tests
435 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } 437 LinkHighlightClient* linkHighlight(int i) { return m_linkHighlights[i]; }
436 438
437 void setScrollableArea(ScrollableArea* scrollableArea) { m_scrollableArea = scrollableArea; } 439 void setScrollableArea(ScrollableArea* scrollableArea) { m_scrollableArea = scrollableArea; }
438 ScrollableArea* scrollableArea() const { return m_scrollableArea; } 440 ScrollableArea* scrollableArea() const { return m_scrollableArea; }
439 441
440 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); } 442 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); }
441 443
442 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er ror prone. 444 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er ror prone.
443 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; } 445 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; }
444 446
445 void updateDebugIndicators(); 447 void updateDebugIndicators();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 OwnPtr<WebKit::WebContentLayer> m_layer; 561 OwnPtr<WebKit::WebContentLayer> m_layer;
560 OwnPtr<WebKit::WebImageLayer> m_imageLayer; 562 OwnPtr<WebKit::WebImageLayer> m_imageLayer;
561 OwnPtr<WebKit::WebSolidColorLayer> m_contentsSolidColorLayer; 563 OwnPtr<WebKit::WebSolidColorLayer> m_contentsSolidColorLayer;
562 WebKit::WebLayer* m_contentsLayer; 564 WebKit::WebLayer* m_contentsLayer;
563 // We don't have ownership of m_contentsLayer, but we do want to know if a g iven layer is the 565 // We don't have ownership of m_contentsLayer, but we do want to know if a g iven layer is the
564 // same as our current layer in setContentsTo(). Since m_contentsLayer may b e deleted at this point, 566 // same as our current layer in setContentsTo(). Since m_contentsLayer may b e deleted at this point,
565 // we stash an ID away when we know m_contentsLayer is alive and use that fo r comparisons from that point 567 // we stash an ID away when we know m_contentsLayer is alive and use that fo r comparisons from that point
566 // on. 568 // on.
567 int m_contentsLayerId; 569 int m_contentsLayerId;
568 570
569 LinkHighlightClient* m_linkHighlight; 571 Vector<LinkHighlightClient*> m_linkHighlights;
570 572
571 OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLa yerDelegate; 573 OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLa yerDelegate;
572 574
573 ContentsLayerPurpose m_contentsLayerPurpose; 575 ContentsLayerPurpose m_contentsLayerPurpose;
574 bool m_inSetChildren; 576 bool m_inSetChildren;
575 577
576 typedef HashMap<String, int> AnimationIdMap; 578 typedef HashMap<String, int> AnimationIdMap;
577 AnimationIdMap m_animationIdMap; 579 AnimationIdMap m_animationIdMap;
578 580
579 ScrollableArea* m_scrollableArea; 581 ScrollableArea* m_scrollableArea;
580 }; 582 };
581 583
582 584
583 } // namespace WebCore 585 } // namespace WebCore
584 586
585 #ifndef NDEBUG 587 #ifndef NDEBUG
586 // Outside the WebCore namespace for ease of invocation from gdb. 588 // Outside the WebCore namespace for ease of invocation from gdb.
587 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); 589 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
588 #endif 590 #endif
589 591
590 #endif // GraphicsLayer_h 592 #endif // GraphicsLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698