OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "platform/LayoutTestSupport.h" | 45 #include "platform/LayoutTestSupport.h" |
46 #include "platform/Logging.h" | 46 #include "platform/Logging.h" |
47 #include "platform/graphics/ImageDecodingStore.h" | 47 #include "platform/graphics/ImageDecodingStore.h" |
48 #include "platform/graphics/media/MediaPlayer.h" | 48 #include "platform/graphics/media/MediaPlayer.h" |
49 #include "public/platform/Platform.h" | 49 #include "public/platform/Platform.h" |
50 #include "public/platform/WebPrerenderingSupport.h" | 50 #include "public/platform/WebPrerenderingSupport.h" |
51 #include "public/platform/WebThread.h" | 51 #include "public/platform/WebThread.h" |
52 #include "wtf/Assertions.h" | 52 #include "wtf/Assertions.h" |
53 #include "wtf/CryptographicallyRandomNumber.h" | 53 #include "wtf/CryptographicallyRandomNumber.h" |
54 #include "wtf/MainThread.h" | 54 #include "wtf/MainThread.h" |
55 #include "wtf/UnusedParam.h" | |
56 #include "wtf/WTF.h" | 55 #include "wtf/WTF.h" |
57 #include "wtf/text/AtomicString.h" | 56 #include "wtf/text/AtomicString.h" |
58 #include "wtf/text/TextEncoding.h" | 57 #include "wtf/text/TextEncoding.h" |
59 #include <v8.h> | 58 #include <v8.h> |
60 | 59 |
61 namespace blink { | 60 namespace blink { |
62 | 61 |
63 namespace { | 62 namespace { |
64 | 63 |
65 class EndOfTaskRunner : public WebThread::TaskObserver { | 64 class EndOfTaskRunner : public WebThread::TaskObserver { |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 { | 209 { |
211 return WebCore::isRunningLayoutTest(); | 210 return WebCore::isRunningLayoutTest(); |
212 } | 211 } |
213 | 212 |
214 void enableLogChannel(const char* name) | 213 void enableLogChannel(const char* name) |
215 { | 214 { |
216 #if !LOG_DISABLED | 215 #if !LOG_DISABLED |
217 WTFLogChannel* channel = WebCore::getChannelFromName(name); | 216 WTFLogChannel* channel = WebCore::getChannelFromName(name); |
218 if (channel) | 217 if (channel) |
219 channel->state = WTFLogChannelOn; | 218 channel->state = WTFLogChannelOn; |
220 #else | |
221 UNUSED_PARAM(name); | |
222 #endif // !LOG_DISABLED | 219 #endif // !LOG_DISABLED |
223 } | 220 } |
224 | 221 |
225 void resetPluginCache(bool reloadPages) | 222 void resetPluginCache(bool reloadPages) |
226 { | 223 { |
227 WebCore::Page::refreshPlugins(reloadPages); | 224 WebCore::Page::refreshPlugins(reloadPages); |
228 } | 225 } |
229 | 226 |
230 } // namespace blink | 227 } // namespace blink |
OLD | NEW |