OLD | NEW |
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "WorkerLoaderProxy.h" | 51 #include "WorkerLoaderProxy.h" |
52 #include "WorkerThread.h" | 52 #include "WorkerThread.h" |
53 | 53 |
54 namespace WebCore { | 54 namespace WebCore { |
55 | 55 |
56 IDBFactory::IDBFactory(IDBFactoryBackendInterface* factory) | 56 IDBFactory::IDBFactory(IDBFactoryBackendInterface* factory) |
57 : m_backend(factory) | 57 : m_backend(factory) |
58 { | 58 { |
59 // We pass a reference to this object before it can be adopted. | 59 // We pass a reference to this object before it can be adopted. |
60 relaxAdoptionRequirement(); | 60 relaxAdoptionRequirement(); |
| 61 ScriptWrappable::init(this); |
61 } | 62 } |
62 | 63 |
63 IDBFactory::~IDBFactory() | 64 IDBFactory::~IDBFactory() |
64 { | 65 { |
65 } | 66 } |
66 | 67 |
67 namespace { | 68 namespace { |
68 static bool isContextValid(ScriptExecutionContext* context) | 69 static bool isContextValid(ScriptExecutionContext* context) |
69 { | 70 { |
70 ASSERT(context->isDocument() || context->isWorkerContext()); | 71 ASSERT(context->isDocument() || context->isWorkerContext()); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 | 175 |
175 if (!first->isValid() || !second->isValid()) { | 176 if (!first->isValid() || !second->isValid()) { |
176 ec = IDBDatabaseException::DataError; | 177 ec = IDBDatabaseException::DataError; |
177 return 0; | 178 return 0; |
178 } | 179 } |
179 | 180 |
180 return static_cast<short>(first->compare(second.get())); | 181 return static_cast<short>(first->compare(second.get())); |
181 } | 182 } |
182 | 183 |
183 } // namespace WebCore | 184 } // namespace WebCore |
OLD | NEW |