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

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, 3 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/WebLayerClient.h" 50 #include "public/platform/WebLayerClient.h"
50 #include "public/platform/WebLayerScrollClient.h" 51 #include "public/platform/WebLayerScrollClient.h"
51 #include "public/platform/WebNinePatchLayer.h" 52 #include "public/platform/WebNinePatchLayer.h"
52 #include "public/platform/WebSolidColorLayer.h" 53 #include "public/platform/WebSolidColorLayer.h"
53 54
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 double backingStoreMemoryEstimate() const; 402 double backingStoreMemoryEstimate() const;
402 403
403 void resetTrackedRepaints(); 404 void resetTrackedRepaints();
404 void addRepaintRect(const FloatRect&); 405 void addRepaintRect(const FloatRect&);
405 406
406 static bool supportsBackgroundColorContent() 407 static bool supportsBackgroundColorContent()
407 { 408 {
408 return false; 409 return false;
409 } 410 }
410 411
411 void setLinkHighlight(LinkHighlightClient*); 412 void addLinkHighlight(LinkHighlightClient*);
413 void removeLinkHighlight(LinkHighlightClient*);
412 // Exposed for tests 414 // Exposed for tests
413 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } 415 LinkHighlightClient* linkHighlight(int i) { return m_linkHighlights[i]; }
414 416
415 void setScrollableArea(ScrollableArea*, bool isMainFrame); 417 void setScrollableArea(ScrollableArea*, bool isMainFrame);
416 ScrollableArea* scrollableArea() const { return m_scrollableArea; } 418 ScrollableArea* scrollableArea() const { return m_scrollableArea; }
417 419
418 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); } 420 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); }
419 421
420 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er ror prone. 422 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er ror prone.
421 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; } 423 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; }
422 424
423 static void registerContentsLayer(WebKit::WebLayer*); 425 static void registerContentsLayer(WebKit::WebLayer*);
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 OwnPtr<WebKit::WebImageLayer> m_imageLayer; 528 OwnPtr<WebKit::WebImageLayer> m_imageLayer;
527 OwnPtr<WebKit::WebNinePatchLayer> m_ninePatchLayer; 529 OwnPtr<WebKit::WebNinePatchLayer> m_ninePatchLayer;
528 OwnPtr<WebKit::WebSolidColorLayer> m_contentsSolidColorLayer; 530 OwnPtr<WebKit::WebSolidColorLayer> m_contentsSolidColorLayer;
529 WebKit::WebLayer* m_contentsLayer; 531 WebKit::WebLayer* m_contentsLayer;
530 // We don't have ownership of m_contentsLayer, but we do want to know if a g iven layer is the 532 // We don't have ownership of m_contentsLayer, but we do want to know if a g iven layer is the
531 // same as our current layer in setContentsTo(). Since m_contentsLayer may b e deleted at this point, 533 // same as our current layer in setContentsTo(). Since m_contentsLayer may b e deleted at this point,
532 // we stash an ID away when we know m_contentsLayer is alive and use that fo r comparisons from that point 534 // we stash an ID away when we know m_contentsLayer is alive and use that fo r comparisons from that point
533 // on. 535 // on.
534 int m_contentsLayerId; 536 int m_contentsLayerId;
535 537
536 LinkHighlightClient* m_linkHighlight; 538 Vector<LinkHighlightClient*> m_linkHighlights;
537 539
538 OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLa yerDelegate; 540 OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLa yerDelegate;
539 541
540 ContentsLayerPurpose m_contentsLayerPurpose; 542 ContentsLayerPurpose m_contentsLayerPurpose;
541 bool m_inSetChildren; 543 bool m_inSetChildren;
542 544
543 typedef HashMap<String, int> AnimationIdMap; 545 typedef HashMap<String, int> AnimationIdMap;
544 AnimationIdMap m_animationIdMap; 546 AnimationIdMap m_animationIdMap;
545 547
546 ScrollableArea* m_scrollableArea; 548 ScrollableArea* m_scrollableArea;
547 WebKit::WebCompositingReasons m_compositingReasons; 549 WebKit::WebCompositingReasons m_compositingReasons;
548 }; 550 };
549 551
550 552
551 } // namespace WebCore 553 } // namespace WebCore
552 554
553 #ifndef NDEBUG 555 #ifndef NDEBUG
554 // Outside the WebCore namespace for ease of invocation from gdb. 556 // Outside the WebCore namespace for ease of invocation from gdb.
555 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); 557 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
556 #endif 558 #endif
557 559
558 #endif // GraphicsLayer_h 560 #endif // GraphicsLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698