Changeset 109946 in webkit


Ignore:
Timestamp:
Mar 6, 2012 12:13:37 PM (12 years ago)
Author:
senorblanco@chromium.org
Message:

Unreviewed, rolling out r109825.
​http://trac.webkit.org/changeset/109825
​https://bugs.webkit.org/show_bug.cgi?id=79413

Broke webkit_unit_tests on Chromium Win

Source/WebCore:

  • Modules/indexeddb/IDBLevelDBBackingStore.cpp:

(WebCore::IDBLevelDBBackingStore::open):

  • platform/leveldb/LevelDBDatabase.cpp:

(WebCore):

  • platform/leveldb/LevelDBDatabase.h:

(LevelDBDatabase):

Source/WebKit/chromium:

  • WebKit.gypi:
  • tests/LevelDBTest.cpp: Removed.
Location:
trunk/Source
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109944 r109946  
     12012-03-06  Stephen White  <senorblanco@chromium.org>
     2
     3        Unreviewed, rolling out r109825.
     4        http://trac.webkit.org/changeset/109825
     5        https://bugs.webkit.org/show_bug.cgi?id=79413
     6
     7        Broke webkit_unit_tests on Chromium Win
     8
     9        * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
     10        (WebCore::IDBLevelDBBackingStore::open):
     11        * platform/leveldb/LevelDBDatabase.cpp:
     12        (WebCore):
     13        * platform/leveldb/LevelDBDatabase.h:
     14        (LevelDBDatabase):
     15
    1162012-03-06  Beth Dakin  <bdakin@apple.com>
    217

  • trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp

    r109825 r109946  
    151151
    152152        db = LevelDBDatabase::open(path, comparator.get());
    153 
    154         if (!db) {
    155             LOG_ERROR("IndexedDB backing store open failed, attempting cleanup");
    156             bool success = LevelDBDatabase::destroy(path);
    157             if (!success) {
    158                 LOG_ERROR("IndexedDB backing store cleanup failed");
    159                 return PassRefPtr<IDBBackingStore>();
    160             }
    161 
    162             LOG_ERROR("IndexedDB backing store cleanup succeeded, reopening");
    163             db = LevelDBDatabase::open(path, comparator.get());
    164             if (!db) {
    165                 LOG_ERROR("IndexedDB backing store reopen after recovery failed");
    166                 return PassRefPtr<IDBBackingStore>();
    167             }
    168         }
    169153    }
    170154

  • trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp

    r109825 r109946  
    113113}
    114114
    115 bool LevelDBDatabase::destroy(const String& fileName)
    116 {
    117     leveldb::Options options;
    118     const leveldb::Status s = leveldb::DestroyDB(fileName.utf8().data(), options);
    119     return s.ok();
    120 }
    121 
    122115PassOwnPtr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, const LevelDBComparator* comparator)
    123116{

  • trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.h

    r109825 r109946  
    5151    static PassOwnPtr<LevelDBDatabase> open(const String& fileName, const LevelDBComparator*);
    5252    static PassOwnPtr<LevelDBDatabase> openInMemory(const LevelDBComparator*);
    53     static bool destroy(const String& fileName);
    5453    ~LevelDBDatabase();
    5554

  • trunk/Source/WebKit/chromium/ChangeLog

    r109889 r109946  
     12012-03-06  Stephen White  <senorblanco@chromium.org>
     2
     3        Unreviewed, rolling out r109825.
     4        http://trac.webkit.org/changeset/109825
     5        https://bugs.webkit.org/show_bug.cgi?id=79413
     6
     7        Broke webkit_unit_tests on Chromium Win
     8
     9        * WebKit.gypi:
     10        * tests/LevelDBTest.cpp: Removed.
     11
    1122012-03-06  Takashi Toyoshima  <toyoshim@chromium.org>
    213

  • trunk/Source/WebKit/chromium/WebKit.gypi

    r109876 r109946  
    106106            'tests/LayerChromiumTest.cpp',
    107107            'tests/LayerTextureUpdaterTest.cpp',
    108             'tests/LevelDBTest.cpp',
    109108            'tests/LocalizedNumberICUTest.cpp',
    110109            'tests/PaintAggregatorTest.cpp',
Note: See TracChangeset for help on using the changeset viewer.