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

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

Issue 2019963002: Remove get from CrossThreadPersistent to avoid accidental use Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 2007, 2008, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2013 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #endif 51 #endif
52 } 52 }
53 53
54 void DatabaseTask::run() 54 void DatabaseTask::run()
55 { 55 {
56 // Database tasks are meant to be used only once, so make sure this one hasn 't been performed before. 56 // Database tasks are meant to be used only once, so make sure this one hasn 't been performed before.
57 #if !LOG_DISABLED 57 #if !LOG_DISABLED
58 ASSERT(!m_complete); 58 ASSERT(!m_complete);
59 #endif 59 #endif
60 60
61 if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()-> isDatabaseOpen(m_database.get())) { 61 if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()-> isDatabaseOpen(m_database)) {
62 taskCancelled(); 62 taskCancelled();
63 #if !LOG_DISABLED 63 #if !LOG_DISABLED
64 m_complete = true; 64 m_complete = true;
65 #endif 65 #endif
66 return; 66 return;
67 } 67 }
68 68
69 WTF_LOG(StorageAPI, "Performing %s %p\n", debugTaskName(), this); 69 WTF_LOG(StorageAPI, "Performing %s %p\n", debugTaskName(), this);
70 70
71 m_database->resetAuthorizer(); 71 m_database->resetAuthorizer();
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 } 181 }
182 182
183 #if !LOG_DISABLED 183 #if !LOG_DISABLED
184 const char* Database::DatabaseTableNamesTask::debugTaskName() const 184 const char* Database::DatabaseTableNamesTask::debugTaskName() const
185 { 185 {
186 return "DatabaseTableNamesTask"; 186 return "DatabaseTableNamesTask";
187 } 187 }
188 #endif 188 #endif
189 189
190 } // namespace blink 190 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698