OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 #include "platform/geometry/LayoutRect.h" | 127 #include "platform/geometry/LayoutRect.h" |
128 #include "platform/graphics/GraphicsLayer.h" | 128 #include "platform/graphics/GraphicsLayer.h" |
129 #include "platform/graphics/filters/FilterOperation.h" | 129 #include "platform/graphics/filters/FilterOperation.h" |
130 #include "platform/graphics/filters/FilterOperations.h" | 130 #include "platform/graphics/filters/FilterOperations.h" |
131 #include "platform/weborigin/SchemeRegistry.h" | 131 #include "platform/weborigin/SchemeRegistry.h" |
132 #include "public/platform/Platform.h" | 132 #include "public/platform/Platform.h" |
133 #include "public/platform/WebConnectionType.h" | 133 #include "public/platform/WebConnectionType.h" |
134 #include "public/platform/WebGraphicsContext3D.h" | 134 #include "public/platform/WebGraphicsContext3D.h" |
135 #include "public/platform/WebGraphicsContext3DProvider.h" | 135 #include "public/platform/WebGraphicsContext3DProvider.h" |
136 #include "public/platform/WebLayer.h" | 136 #include "public/platform/WebLayer.h" |
| 137 #include "wtf/DateMath.h" |
137 #include "wtf/InstanceCounter.h" | 138 #include "wtf/InstanceCounter.h" |
138 #include "wtf/PassOwnPtr.h" | 139 #include "wtf/PassOwnPtr.h" |
139 #include "wtf/dtoa.h" | 140 #include "wtf/dtoa.h" |
140 #include "wtf/text/StringBuffer.h" | 141 #include "wtf/text/StringBuffer.h" |
141 #include <v8.h> | 142 #include <v8.h> |
142 | 143 |
143 namespace blink { | 144 namespace blink { |
144 | 145 |
145 // FIXME: oilpan: These will be removed soon. | 146 // FIXME: oilpan: These will be removed soon. |
146 static MockPagePopupDriver* s_pagePopupDriver = 0; | 147 static MockPagePopupDriver* s_pagePopupDriver = 0; |
(...skipping 2187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2334 frame()->document()->getTransitionElementData(elementData); | 2335 frame()->document()->getTransitionElementData(elementData); |
2335 | 2336 |
2336 StringBuilder markup; | 2337 StringBuilder markup; |
2337 Vector<Document::TransitionElementData>::iterator iter = elementData.begin()
; | 2338 Vector<Document::TransitionElementData>::iterator iter = elementData.begin()
; |
2338 for (; iter != elementData.end(); ++iter) | 2339 for (; iter != elementData.end(); ++iter) |
2339 markup.append(iter->markup); | 2340 markup.append(iter->markup); |
2340 | 2341 |
2341 return markup.toString(); | 2342 return markup.toString(); |
2342 } | 2343 } |
2343 | 2344 |
| 2345 double Internals::convertToLocalTime(double ms) |
| 2346 { |
| 2347 return WTF::convertToLocalTime(ms); |
| 2348 } |
| 2349 |
2344 } // namespace blink | 2350 } // namespace blink |
OLD | NEW |