| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 #include "core/svg/SVGImageElement.h" | 117 #include "core/svg/SVGImageElement.h" |
| 118 #include "core/testing/DictionaryTest.h" | 118 #include "core/testing/DictionaryTest.h" |
| 119 #include "core/testing/GCObservation.h" | 119 #include "core/testing/GCObservation.h" |
| 120 #include "core/testing/InternalRuntimeFlags.h" | 120 #include "core/testing/InternalRuntimeFlags.h" |
| 121 #include "core/testing/InternalSettings.h" | 121 #include "core/testing/InternalSettings.h" |
| 122 #include "core/testing/LayerRect.h" | 122 #include "core/testing/LayerRect.h" |
| 123 #include "core/testing/LayerRectList.h" | 123 #include "core/testing/LayerRectList.h" |
| 124 #include "core/testing/PrivateScriptTest.h" | 124 #include "core/testing/PrivateScriptTest.h" |
| 125 #include "core/testing/TypeConversions.h" | 125 #include "core/testing/TypeConversions.h" |
| 126 #include "core/testing/UnionTypesTest.h" | 126 #include "core/testing/UnionTypesTest.h" |
| 127 #include "core/workers/WorkerThread.h" | 127 #include "core/workers/WorkerScript.h" |
| 128 #include "platform/Cursor.h" | 128 #include "platform/Cursor.h" |
| 129 #include "platform/Language.h" | 129 #include "platform/Language.h" |
| 130 #include "platform/PlatformKeyboardEvent.h" | 130 #include "platform/PlatformKeyboardEvent.h" |
| 131 #include "platform/RuntimeEnabledFeatures.h" | 131 #include "platform/RuntimeEnabledFeatures.h" |
| 132 #include "platform/TraceEvent.h" | 132 #include "platform/TraceEvent.h" |
| 133 #include "platform/geometry/IntRect.h" | 133 #include "platform/geometry/IntRect.h" |
| 134 #include "platform/geometry/LayoutRect.h" | 134 #include "platform/geometry/LayoutRect.h" |
| 135 #include "platform/graphics/GraphicsLayer.h" | 135 #include "platform/graphics/GraphicsLayer.h" |
| 136 #include "platform/heap/Handle.h" | 136 #include "platform/heap/Handle.h" |
| 137 #include "platform/inspector_protocol/FrontendChannel.h" | 137 #include "platform/inspector_protocol/FrontendChannel.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 return InternalSettings::from(*page); | 271 return InternalSettings::from(*page); |
| 272 } | 272 } |
| 273 | 273 |
| 274 InternalRuntimeFlags* Internals::runtimeFlags() const | 274 InternalRuntimeFlags* Internals::runtimeFlags() const |
| 275 { | 275 { |
| 276 return m_runtimeFlags.get(); | 276 return m_runtimeFlags.get(); |
| 277 } | 277 } |
| 278 | 278 |
| 279 unsigned Internals::workerThreadCount() const | 279 unsigned Internals::workerThreadCount() const |
| 280 { | 280 { |
| 281 return WorkerThread::workerThreadCount(); | 281 return WorkerScript::workerScriptCount(); |
| 282 } | 282 } |
| 283 | 283 |
| 284 String Internals::address(Node* node) | 284 String Internals::address(Node* node) |
| 285 { | 285 { |
| 286 char buf[32]; | 286 char buf[32]; |
| 287 sprintf(buf, "%p", node); | 287 sprintf(buf, "%p", node); |
| 288 | 288 |
| 289 return String(buf); | 289 return String(buf); |
| 290 } | 290 } |
| 291 | 291 |
| (...skipping 2268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2560 } | 2560 } |
| 2561 | 2561 |
| 2562 int Internals::getScrollAnimationState(Node* node) const | 2562 int Internals::getScrollAnimationState(Node* node) const |
| 2563 { | 2563 { |
| 2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) | 2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) |
| 2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState); | 2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState); |
| 2566 return -1; | 2566 return -1; |
| 2567 } | 2567 } |
| 2568 | 2568 |
| 2569 } // namespace blink | 2569 } // namespace blink |
| OLD | NEW |