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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 22 matching lines...) Expand all
33 #include "core/inspector/ConsoleMessage.h" 33 #include "core/inspector/ConsoleMessage.h"
34 #include "modules/webdatabase/Database.h" 34 #include "modules/webdatabase/Database.h"
35 #include "modules/webdatabase/DatabaseCallback.h" 35 #include "modules/webdatabase/DatabaseCallback.h"
36 #include "modules/webdatabase/DatabaseClient.h" 36 #include "modules/webdatabase/DatabaseClient.h"
37 #include "modules/webdatabase/DatabaseContext.h" 37 #include "modules/webdatabase/DatabaseContext.h"
38 #include "modules/webdatabase/DatabaseTask.h" 38 #include "modules/webdatabase/DatabaseTask.h"
39 #include "modules/webdatabase/DatabaseTracker.h" 39 #include "modules/webdatabase/DatabaseTracker.h"
40 #include "platform/Logging.h" 40 #include "platform/Logging.h"
41 #include "platform/weborigin/SecurityOrigin.h" 41 #include "platform/weborigin/SecurityOrigin.h"
42 #include "public/platform/WebTraceLocation.h" 42 #include "public/platform/WebTraceLocation.h"
43 #include "wtf/MainThread.h"
44 43
45 namespace blink { 44 namespace blink {
46 45
47 static DatabaseManager* s_databaseManager; 46 static DatabaseManager* s_databaseManager;
48 47
49 DatabaseManager& DatabaseManager::manager() 48 DatabaseManager& DatabaseManager::manager()
50 { 49 {
51 ASSERT(isMainThread()); 50 ASSERT(isMainThread());
52 if (!s_databaseManager) 51 if (!s_databaseManager)
53 s_databaseManager = new DatabaseManager(); 52 s_databaseManager = new DatabaseManager();
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 { 229 {
231 return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIf DoesNotExist); 230 return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIf DoesNotExist);
232 } 231 }
233 232
234 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m essage) 233 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m essage)
235 { 234 {
236 context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, Erro rMessageLevel, message)); 235 context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, Erro rMessageLevel, message));
237 } 236 }
238 237
239 } // namespace blink 238 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698