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

Side by Side Diff: Source/modules/indexeddb/IDBDatabase.cpp

Issue 1240223003: Oilpan: remove unnecessary ENABLE(OILPAN) protections of trace() calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 IDBDatabase::~IDBDatabase() 89 IDBDatabase::~IDBDatabase()
90 { 90 {
91 if (!m_closePending && m_backend) 91 if (!m_closePending && m_backend)
92 m_backend->close(); 92 m_backend->close();
93 } 93 }
94 94
95 DEFINE_TRACE(IDBDatabase) 95 DEFINE_TRACE(IDBDatabase)
96 { 96 {
97 visitor->trace(m_versionChangeTransaction); 97 visitor->trace(m_versionChangeTransaction);
98 visitor->trace(m_transactions); 98 visitor->trace(m_transactions);
99 #if ENABLE(OILPAN)
100 visitor->trace(m_enqueuedEvents); 99 visitor->trace(m_enqueuedEvents);
101 #endif
102 visitor->trace(m_databaseCallbacks); 100 visitor->trace(m_databaseCallbacks);
103 RefCountedGarbageCollectedEventTargetWithInlineData<IDBDatabase>::trace(visi tor); 101 RefCountedGarbageCollectedEventTargetWithInlineData<IDBDatabase>::trace(visi tor);
104 ActiveDOMObject::trace(visitor); 102 ActiveDOMObject::trace(visitor);
105 } 103 }
106 104
107 int64_t IDBDatabase::nextTransactionId() 105 int64_t IDBDatabase::nextTransactionId()
108 { 106 {
109 // Only keep a 32-bit counter to allow ports to use the other 32 107 // Only keep a 32-bit counter to allow ports to use the other 32
110 // bits of the id. 108 // bits of the id.
111 static int currentTransactionId = 0; 109 static int currentTransactionId = 0;
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 { 451 {
454 return EventTargetNames::IDBDatabase; 452 return EventTargetNames::IDBDatabase;
455 } 453 }
456 454
457 ExecutionContext* IDBDatabase::executionContext() const 455 ExecutionContext* IDBDatabase::executionContext() const
458 { 456 {
459 return ActiveDOMObject::executionContext(); 457 return ActiveDOMObject::executionContext();
460 } 458 }
461 459
462 } // namespace blink 460 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp ('k') | Source/modules/indexeddb/IDBRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698