OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 | 43 |
44 #ifndef PaintLayerScrollableArea_h | 44 #ifndef PaintLayerScrollableArea_h |
45 #define PaintLayerScrollableArea_h | 45 #define PaintLayerScrollableArea_h |
46 | 46 |
47 #include "core/CoreExport.h" | 47 #include "core/CoreExport.h" |
48 #include "core/layout/ScrollAnchor.h" | 48 #include "core/layout/ScrollAnchor.h" |
49 #include "core/layout/ScrollEnums.h" | 49 #include "core/layout/ScrollEnums.h" |
50 #include "core/paint/PaintInvalidationCapableScrollableArea.h" | 50 #include "core/paint/PaintInvalidationCapableScrollableArea.h" |
51 #include "core/paint/PaintLayerFragment.h" | 51 #include "core/paint/PaintLayerFragment.h" |
52 #include "platform/heap/Handle.h" | 52 #include "platform/heap/Handle.h" |
| 53 #include "wtf/PtrUtil.h" |
| 54 #include <memory> |
53 | 55 |
54 namespace blink { | 56 namespace blink { |
55 | 57 |
56 enum ResizerHitTestType { | 58 enum ResizerHitTestType { |
57 ResizerForPointer, | 59 ResizerForPointer, |
58 ResizerForTouch | 60 ResizerForTouch |
59 }; | 61 }; |
60 | 62 |
61 class ComputedStyle; | 63 class ComputedStyle; |
62 class HitTestResult; | 64 class HitTestResult; |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 void updateCompositingLayersAfterScroll(); | 452 void updateCompositingLayersAfterScroll(); |
451 | 453 |
452 PaintLayerScrollableAreaRareData* rareData() | 454 PaintLayerScrollableAreaRareData* rareData() |
453 { | 455 { |
454 return m_rareData.get(); | 456 return m_rareData.get(); |
455 } | 457 } |
456 | 458 |
457 PaintLayerScrollableAreaRareData& ensureRareData() | 459 PaintLayerScrollableAreaRareData& ensureRareData() |
458 { | 460 { |
459 if (!m_rareData) | 461 if (!m_rareData) |
460 m_rareData = adoptPtr(new PaintLayerScrollableAreaRareData()); | 462 m_rareData = wrapUnique(new PaintLayerScrollableAreaRareData()); |
461 return *m_rareData.get(); | 463 return *m_rareData.get(); |
462 } | 464 } |
463 | 465 |
464 // PaintInvalidationCapableScrollableArea | 466 // PaintInvalidationCapableScrollableArea |
465 LayoutBox& boxForScrollControlPaintInvalidation() const { return box(); } | 467 LayoutBox& boxForScrollControlPaintInvalidation() const { return box(); } |
466 | 468 |
467 PaintLayer& m_layer; | 469 PaintLayer& m_layer; |
468 | 470 |
469 // Keeps track of whether the layer is currently resizing, so events can cau
se resizing to start and stop. | 471 // Keeps track of whether the layer is currently resizing, so events can cau
se resizing to start and stop. |
470 unsigned m_inResizeMode : 1; | 472 unsigned m_inResizeMode : 1; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 IntPoint m_cachedOverlayScrollbarOffset; | 504 IntPoint m_cachedOverlayScrollbarOffset; |
503 | 505 |
504 // LayoutObject to hold our custom scroll corner. | 506 // LayoutObject to hold our custom scroll corner. |
505 LayoutScrollbarPart* m_scrollCorner; | 507 LayoutScrollbarPart* m_scrollCorner; |
506 | 508 |
507 // LayoutObject to hold our custom resizer. | 509 // LayoutObject to hold our custom resizer. |
508 LayoutScrollbarPart* m_resizer; | 510 LayoutScrollbarPart* m_resizer; |
509 | 511 |
510 ScrollAnchor m_scrollAnchor; | 512 ScrollAnchor m_scrollAnchor; |
511 | 513 |
512 OwnPtr<PaintLayerScrollableAreaRareData> m_rareData; | 514 std::unique_ptr<PaintLayerScrollableAreaRareData> m_rareData; |
513 | 515 |
514 #if ENABLE(ASSERT) | 516 #if ENABLE(ASSERT) |
515 bool m_hasBeenDisposed; | 517 bool m_hasBeenDisposed; |
516 #endif | 518 #endif |
517 }; | 519 }; |
518 | 520 |
519 DEFINE_TYPE_CASTS(PaintLayerScrollableArea, ScrollableArea, scrollableArea, | 521 DEFINE_TYPE_CASTS(PaintLayerScrollableArea, ScrollableArea, scrollableArea, |
520 scrollableArea->isPaintLayerScrollableArea(), | 522 scrollableArea->isPaintLayerScrollableArea(), |
521 scrollableArea.isPaintLayerScrollableArea()); | 523 scrollableArea.isPaintLayerScrollableArea()); |
522 | 524 |
523 } // namespace blink | 525 } // namespace blink |
524 | 526 |
525 #endif // LayerScrollableArea_h | 527 #endif // LayerScrollableArea_h |
OLD | NEW |