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

Side by Side Diff: Source/core/rendering/style/GridResolvedPosition.h

Issue 113943003: [CSS Grid] Introduce an explicit type for resolved grid positions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@to-land-zero
Patch Set: Created 6 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 | « Source/core/rendering/style/GridPosition.h ('k') | no next file » | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Igalia S.L. 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef ScriptPromise_h 31 #ifndef GridResolvedPosition_h
32 #define ScriptPromise_h 32 #define GridResolvedPosition_h
33 33
34 #include "bindings/v8/ScopedPersistent.h" 34 #include "core/rendering/style/GridPosition.h"
35 #include "bindings/v8/ScriptValue.h"
36 #include "bindings/v8/V8ScriptRunner.h"
37 #include <v8.h>
38 35
39 namespace WebCore { 36 namespace WebCore {
40 37
41 class ExecutionContext; 38 enum GridPositionSide {
39 ColumnStartSide,
40 ColumnEndSide,
41 RowStartSide,
42 RowEndSide
43 };
42 44
43 // ScriptPromise is the class for representing Promise values in C++ world. 45 class GridResolvedPosition {
44 // ScriptPromise holds a Promise.
45 // So holding a ScriptPromise as a member variable in DOM object causes
46 // memory leaks since it has a reference from C++ to V8.
47 //
48 class ScriptPromise {
49 public: 46 public:
50 // Constructs an empty promise. 47 static size_t adjustGridPositionForAfterEndSide(size_t resolvedPosition)
51 ScriptPromise() 48 {
52 : m_promise() 49 return resolvedPosition ? resolvedPosition - 1 : 0;
50 }
51
52 static size_t adjustGridPositionForSide(size_t resolvedPosition, GridPositio nSide side)
53 {
54 // An item finishing on the N-th line belongs to the N-1-th cell.
55 if (side == ColumnEndSide || side == RowEndSide)
56 return adjustGridPositionForAfterEndSide(resolvedPosition);
57
58 return resolvedPosition;
59 }
60
61 GridResolvedPosition()
62 : m_integerPosition(0)
53 { 63 {
54 } 64 }
55 65
56 explicit ScriptPromise(const ScriptValue& promise) 66 GridResolvedPosition(size_t position)
57 : m_promise(promise) 67 : m_integerPosition(position)
58 { 68 {
59 ASSERT(!m_promise.hasNoValue());
60 } 69 }
61 70
62 ScriptPromise(v8::Handle<v8::Value> promise, v8::Isolate* isolate) 71 GridResolvedPosition(const GridPosition& position, GridPositionSide side)
63 : m_promise(promise, isolate)
64 { 72 {
65 ASSERT(!m_promise.hasNoValue()); 73 size_t integerPosition;
74
75 ASSERT(position.integerPosition());
76 integerPosition = position.integerPosition() - 1;
77
78 m_integerPosition = adjustGridPositionForSide(integerPosition, side);
66 } 79 }
67 80
68 bool isObject() const 81 size_t integerPosition() const
69 { 82 {
70 return m_promise.isObject(); 83 return m_integerPosition;
71 } 84 }
72 85
73 bool isNull() const 86 void setIntegerPosition(size_t position)
74 { 87 {
75 return m_promise.isNull(); 88 m_integerPosition = position;
76 } 89 }
77 90
78 bool isUndefinedOrNull() const 91 bool operator==(const GridResolvedPosition& other) const
79 { 92 {
80 return m_promise.isUndefined() || m_promise.isNull(); 93 return m_integerPosition == other.m_integerPosition;
81 } 94 }
82 95
83 v8::Handle<v8::Value> v8Value() const 96 operator int() const { return m_integerPosition; }
84 {
85 return m_promise.v8Value();
86 }
87
88 v8::Isolate* isolate() const
89 {
90 return m_promise.isolate();
91 }
92
93 bool hasNoValue() const
94 {
95 return m_promise.hasNoValue();
96 }
97
98 void clear()
99 {
100 m_promise.clear();
101 }
102
103 static ScriptPromise createPending();
104 static ScriptPromise createPending(ExecutionContext*);
105 97
106 private: 98 private:
107 ScriptValue m_promise; 99 size_t m_integerPosition;
108 }; 100 };
109 101
110 } // namespace WebCore 102 } // namespace WebCore
111 103
112 104 #endif // GridResolvedPosition_h
113 #endif // ScriptPromise_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/GridPosition.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698