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

Side by Side Diff: Source/WebKit/chromium/src/WebKit.cpp

Issue 14325012: Remove the dynamic initialization of WebKitSystemInterface. Just call into the library directly. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: '' Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/core.gypi » ('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) 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include <wtf/text/AtomicString.h> 57 #include <wtf/text/AtomicString.h>
58 58
59 #if ENABLE(VIDEO) 59 #if ENABLE(VIDEO)
60 #include "MediaPlayerPrivateChromium.h" 60 #include "MediaPlayerPrivateChromium.h"
61 #include "WebMediaPlayerClientImpl.h" 61 #include "WebMediaPlayerClientImpl.h"
62 #endif 62 #endif
63 63
64 #include "WebWorkerClientImpl.h" 64 #include "WebWorkerClientImpl.h"
65 #include "WorkerContextProxyChromium.h" 65 #include "WorkerContextProxyChromium.h"
66 66
67 #if OS(DARWIN)
68 #include "WebSystemInterface.h"
69 #endif
70
71 namespace WebKit { 67 namespace WebKit {
72 68
73 namespace { 69 namespace {
74 70
75 class EndOfTaskRunner : public WebThread::TaskObserver { 71 class EndOfTaskRunner : public WebThread::TaskObserver {
76 public: 72 public:
77 virtual void willProcessTask() { } 73 virtual void willProcessTask() { }
78 virtual void didProcessTask() 74 virtual void didProcessTask()
79 { 75 {
80 #if ENABLE(CUSTOM_ELEMENTS) 76 #if ENABLE(CUSTOM_ELEMENTS)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 s_endOfTaskRunner = new EndOfTaskRunner; 123 s_endOfTaskRunner = new EndOfTaskRunner;
128 currentThread->addTaskObserver(s_endOfTaskRunner); 124 currentThread->addTaskObserver(s_endOfTaskRunner);
129 } 125 }
130 } 126 }
131 127
132 void initializeWithoutV8(Platform* webKitPlatformSupport) 128 void initializeWithoutV8(Platform* webKitPlatformSupport)
133 { 129 {
134 ASSERT(!s_webKitInitialized); 130 ASSERT(!s_webKitInitialized);
135 s_webKitInitialized = true; 131 s_webKitInitialized = true;
136 132
137 #if OS(DARWIN)
138 InitWebCoreSystemInterface();
139 #endif
140
141 ASSERT(webKitPlatformSupport); 133 ASSERT(webKitPlatformSupport);
142 ASSERT(!s_webKitPlatformSupport); 134 ASSERT(!s_webKitPlatformSupport);
143 s_webKitPlatformSupport = webKitPlatformSupport; 135 s_webKitPlatformSupport = webKitPlatformSupport;
144 Platform::initialize(s_webKitPlatformSupport); 136 Platform::initialize(s_webKitPlatformSupport);
145 137
146 WTF::initializeThreading(); 138 WTF::initializeThreading();
147 WTF::initializeMainThread(); 139 WTF::initializeMainThread();
148 WebCore::init(); 140 WebCore::init();
149 WebCore::ImageDecodingStore::initializeOnce(); 141 WebCore::ImageDecodingStore::initializeOnce();
150 142
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 UNUSED_PARAM(name); 205 UNUSED_PARAM(name);
214 #endif // !LOG_DISABLED 206 #endif // !LOG_DISABLED
215 } 207 }
216 208
217 void resetPluginCache(bool reloadPages) 209 void resetPluginCache(bool reloadPages)
218 { 210 {
219 WebCore::Page::refreshPlugins(reloadPages); 211 WebCore::Page::refreshPlugins(reloadPages);
220 } 212 }
221 213
222 } // namespace WebKit 214 } // namespace WebKit
OLDNEW
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698