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

Side by Side Diff: sky/engine/core/dom/RenderedDocumentMarker.h

Issue 830273006: Delete document marker related invalidation code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/dom/DocumentMarkerController.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 14 matching lines...) Expand all
25 */ 25 */
26 26
27 #ifndef SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_ 27 #ifndef SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_
28 #define SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_ 28 #define SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_
29 29
30 #include "sky/engine/core/dom/DocumentMarker.h" 30 #include "sky/engine/core/dom/DocumentMarker.h"
31 #include "sky/engine/platform/geometry/LayoutRect.h" 31 #include "sky/engine/platform/geometry/LayoutRect.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 // FIXME(sky): We no longer need this subclass. Remove it
36 // and just used DocumentMarker.
37
35 class RenderedDocumentMarker final : public DocumentMarker { 38 class RenderedDocumentMarker final : public DocumentMarker {
36 public: 39 public:
37 static PassOwnPtr<RenderedDocumentMarker> create(const DocumentMarker& marke r) 40 static PassOwnPtr<RenderedDocumentMarker> create(const DocumentMarker& marke r)
38 { 41 {
39 return adoptPtr(new RenderedDocumentMarker(marker)); 42 return adoptPtr(new RenderedDocumentMarker(marker));
40 } 43 }
41 44
42 bool isRendered() const { return invalidMarkerRect() != m_renderedRect; }
43 bool contains(const LayoutPoint& point) const { return isRendered() && m_ren deredRect.contains(point); }
44 void setRenderedRect(const LayoutRect& r) { m_renderedRect = r; }
45 const LayoutRect& renderedRect() const { return m_renderedRect; }
46 void invalidate(const LayoutRect&);
47 void invalidate() { m_renderedRect = invalidMarkerRect(); }
48
49 private: 45 private:
50 explicit RenderedDocumentMarker(const DocumentMarker& marker) 46 explicit RenderedDocumentMarker(const DocumentMarker& marker)
51 : DocumentMarker(marker) 47 : DocumentMarker(marker)
52 , m_renderedRect(invalidMarkerRect())
53 { 48 {
54 } 49 }
55
56 static const LayoutRect& invalidMarkerRect()
57 {
58 static const LayoutRect rect = LayoutRect(-1, -1, -1, -1);
59 return rect;
60 }
61
62 LayoutRect m_renderedRect;
63 }; 50 };
64 51
65 inline void RenderedDocumentMarker::invalidate(const LayoutRect& r)
66 {
67 if (m_renderedRect.intersects(r))
68 invalidate();
69 }
70
71 DEFINE_TYPE_CASTS(RenderedDocumentMarker, DocumentMarker, marker, true, true); 52 DEFINE_TYPE_CASTS(RenderedDocumentMarker, DocumentMarker, marker, true, true);
72 53
73 } // namespace blink 54 } // namespace blink
74 55
75 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::RenderedDocumentMarker ); 56 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::RenderedDocumentMarker );
76 57
77 #endif // SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_ 58 #endif // SKY_ENGINE_CORE_DOM_RENDEREDDOCUMENTMARKER_H_
OLDNEW
« no previous file with comments | « sky/engine/core/dom/DocumentMarkerController.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698