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

Side by Side Diff: public/platform/WebFrameTime.h

Issue 321373003: Changing animate to beginFrame and use struct rather than naked double to allow extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | public/web/WebWidget.h » ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 * * 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 WebPoint_h 31 #ifndef WebFrameTime_h
32 #define WebPoint_h 32 #define WebFrameTime_h
33 33
34 #include "WebCommon.h" 34 #include "WebCommon.h"
35 35
36 #if INSIDE_BLINK
37 #include "platform/geometry/IntPoint.h"
38 #else
39 #include <ui/gfx/point.h>
40 #endif
41
42 namespace blink { 36 namespace blink {
43 37
44 struct WebPoint { 38 struct WebFrameTime {
45 int x; 39 WebFrameTime(double flt, uint64_t d, uint64_t fdt)
abarth-chromium 2014/06/11 19:33:01 Please use complete words in variable names.
mithro-old 2014/06/18 03:36:44 Done.
46 int y; 40 : frameLastTime(flt)
47 41 , renderDeadline(d)
48 WebPoint() 42 , frameDisplayTime(fdt)
49 : x(0)
50 , y(0)
51 { 43 {
52 } 44 }
53 45
54 WebPoint(int x, int y) 46 // FIXME(mithro): Upgrade frame_time, deadline and frame_dispaly_time to Tim eTick class.
abarth-chromium 2014/06/11 19:33:01 frame_time -> frameTime frame_dispaly_time -> fram
55 : x(x) 47
56 , y(y) 48 // Time in CLOCK_MONOTONIC that is the most recent vsync time.
49 double frameLastTime;
abarth-chromium 2014/06/11 19:33:01 lastFrameTime?
mithro-old 2014/06/18 03:36:44 Done.
50
51 // Time in CLOCK_MONOTONIC by which rendering must be finished by to not
52 // stall the pipeline.
53 double renderDeadline;
54
55 // Time in CLOCK_MONOTONIC that the frame will hit the glass of the display
56 // if rendered within the deadline. A value of NaN means we do not know and
57 // you should use frameLastTime instead.
58 double frameDisplayTime;
59
60 inline bool frameDisplayTimeValid()
abarth-chromium 2014/06/11 19:33:01 The keyword |inline| doesn't do anything there.
mithro-old 2014/06/18 03:36:44 I removed these functions and just made sure displ
57 { 61 {
62 return (frameDisplayTime == frameDisplayTime) && frameDisplayTime >= fra meLastTime;
58 } 63 }
59 64
60 #if INSIDE_BLINK 65 inline double frameTime()
abarth-chromium 2014/06/11 19:33:01 ditto
mithro-old 2014/06/18 03:36:44 Done.
61 WebPoint(const WebCore::IntPoint& p)
62 : x(p.x())
63 , y(p.y())
64 { 66 {
67 if (frameDisplayTimeValid())
68 return frameDisplayTime;
69 return frameLastTime;
65 } 70 }
66
67 WebPoint& operator=(const WebCore::IntPoint& p)
68 {
69 x = p.x();
70 y = p.y();
71 return *this;
72 }
73
74 operator WebCore::IntPoint() const
75 {
76 return WebCore::IntPoint(x, y);
77 }
78 #else
79 WebPoint(const gfx::Point& p)
80 : x(p.x())
81 , y(p.y())
82 {
83 }
84
85 WebPoint& operator=(const gfx::Point& p)
86 {
87 x = p.x();
88 y = p.y();
89 return *this;
90 }
91
92 operator gfx::Point() const
93 {
94 return gfx::Point(x, y);
95 }
96 #endif
97 }; 71 };
98 72
99 inline bool operator==(const WebPoint& a, const WebPoint& b)
100 {
101 return a.x == b.x && a.y == b.y;
102 }
103
104 inline bool operator!=(const WebPoint& a, const WebPoint& b)
105 {
106 return !(a == b);
107 }
108
109 } // namespace blink 73 } // namespace blink
110 74
111 #endif 75 #endif
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | public/web/WebWidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698