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

Side by Side Diff: third_party/WebKit/Source/web/WebKit.cpp

Issue 1847513002: Revert of Factor out setIndexedDBClientCreateFunction from blink::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 25 matching lines...) Expand all
36 #include "bindings/core/v8/V8Initializer.h" 36 #include "bindings/core/v8/V8Initializer.h"
37 #include "core/animation/AnimationClock.h" 37 #include "core/animation/AnimationClock.h"
38 #include "core/page/Page.h" 38 #include "core/page/Page.h"
39 #include "gin/public/v8_platform.h" 39 #include "gin/public/v8_platform.h"
40 #include "modules/ModulesInitializer.h" 40 #include "modules/ModulesInitializer.h"
41 #include "platform/LayoutTestSupport.h" 41 #include "platform/LayoutTestSupport.h"
42 #include "platform/Logging.h" 42 #include "platform/Logging.h"
43 #include "platform/heap/Heap.h" 43 #include "platform/heap/Heap.h"
44 #include "public/platform/Platform.h" 44 #include "public/platform/Platform.h"
45 #include "public/platform/WebThread.h" 45 #include "public/platform/WebThread.h"
46 #include "web/IndexedDBClientImpl.h"
46 #include "wtf/Assertions.h" 47 #include "wtf/Assertions.h"
47 #include "wtf/MainThread.h" 48 #include "wtf/MainThread.h"
48 #include "wtf/Partitions.h" 49 #include "wtf/Partitions.h"
49 #include "wtf/WTF.h" 50 #include "wtf/WTF.h"
50 #include "wtf/text/AtomicString.h" 51 #include "wtf/text/AtomicString.h"
51 #include "wtf/text/TextEncoding.h" 52 #include "wtf/text/TextEncoding.h"
52 #include <v8.h> 53 #include <v8.h>
53 54
54 namespace blink { 55 namespace blink {
55 56
(...skipping 21 matching lines...) Expand all
77 { 78 {
78 DEFINE_STATIC_LOCAL(OwnPtr<ModulesInitializer>, initializer, (adoptPtr(new M odulesInitializer))); 79 DEFINE_STATIC_LOCAL(OwnPtr<ModulesInitializer>, initializer, (adoptPtr(new M odulesInitializer)));
79 return *initializer; 80 return *initializer;
80 } 81 }
81 82
82 void initialize(Platform* platform) 83 void initialize(Platform* platform)
83 { 84 {
84 Platform::initialize(platform); 85 Platform::initialize(platform);
85 86
86 modulesInitializer().initialize(); 87 modulesInitializer().initialize();
88 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
87 89
88 V8Initializer::initializeMainThread(); 90 V8Initializer::initializeMainThread();
89 91
90 // currentThread is null if we are running on a thread without a message loo p. 92 // currentThread is null if we are running on a thread without a message loo p.
91 if (WebThread* currentThread = platform->currentThread()) { 93 if (WebThread* currentThread = platform->currentThread()) {
92 ASSERT(!s_endOfTaskRunner); 94 ASSERT(!s_endOfTaskRunner);
93 s_endOfTaskRunner = new EndOfTaskRunner; 95 s_endOfTaskRunner = new EndOfTaskRunner;
94 currentThread->addTaskObserver(s_endOfTaskRunner); 96 currentThread->addTaskObserver(s_endOfTaskRunner);
95 } 97 }
96 } 98 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 ASSERT(!reloadPages); 174 ASSERT(!reloadPages);
173 Page::refreshPlugins(); 175 Page::refreshPlugins();
174 } 176 }
175 177
176 void decommitFreeableMemory() 178 void decommitFreeableMemory()
177 { 179 {
178 WTF::Partitions::decommitFreeableMemory(); 180 WTF::Partitions::decommitFreeableMemory();
179 } 181 }
180 182
181 } // namespace blink 183 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/IndexedDBClientImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698