| Differences between
and this patch
- a/Source/WebKit/chromium/ChangeLog +25 lines
Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
1
2012-06-12  Joshua Bell  <jsbell@chromium.org>
2
3
        IndexedDB: Add new type (and chromium webkit API) for metadata snapshot
4
        https://bugs.webkit.org/show_bug.cgi?id=88678
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * WebKit.gyp:
9
        * public/WebIDBDatabase.h:
10
        (WebKit::WebIDBDatabase::metadata):
11
        * public/WebIDBKeyPath.h: Add operator= (for treating like POD)
12
        (WebIDBKeyPath):
13
        * public/WebIDBMetadata.h: Added.
14
        (WebCore):
15
        (WebKit):
16
        (WebIDBMetadata):
17
        (WebKit::WebIDBMetadata::WebIDBMetadata):
18
        (ObjectStore):
19
        (WebKit::WebIDBMetadata::ObjectStore::ObjectStore):
20
        (Index):
21
        (WebKit::WebIDBMetadata::Index::Index):
22
        * src/WebIDBKeyPath.cpp:
23
        (WebKit::WebIDBKeyPath::operator=):
24
        (WebKit):
25
1
2012-06-09  Eugene Klyuchnikov  <eustas.bug@gmail.com>
26
2012-06-09  Eugene Klyuchnikov  <eustas.bug@gmail.com>
2
27
3
        Web Inspector: Add message loop instrumentation to public API and timeline agent
28
        Web Inspector: Add message loop instrumentation to public API and timeline agent
- a/Source/WebKit/chromium/WebKit.gyp +1 lines
Lines 181-186 a/Source/WebKit/chromium/WebKit.gyp_sec1
181
                'public/WebIDBKey.h',
181
                'public/WebIDBKey.h',
182
                'public/WebIDBKeyPath.h',
182
                'public/WebIDBKeyPath.h',
183
                'public/WebIDBKeyRange.h',
183
                'public/WebIDBKeyRange.h',
184
                'public/WebIDBMetadata.h',
184
                'public/WebIDBObjectStore.h',
185
                'public/WebIDBObjectStore.h',
185
                'public/WebIDBTransaction.h',
186
                'public/WebIDBTransaction.h',
186
                'public/WebIDBTransactionCallbacks.h',
187
                'public/WebIDBTransactionCallbacks.h',
- a/Source/WebKit/chromium/public/WebIDBDatabase.h +6 lines
Lines 28-33 a/Source/WebKit/chromium/public/WebIDBDatabase.h_sec1
28
28
29
#include "WebDOMStringList.h"
29
#include "WebDOMStringList.h"
30
#include "WebExceptionCode.h"
30
#include "WebExceptionCode.h"
31
#include "WebIDBMetadata.h"
31
#include "platform/WebCommon.h"
32
#include "platform/WebCommon.h"
32
33
33
namespace WebKit {
34
namespace WebKit {
Lines 44-49 class WebIDBDatabase { a/Source/WebKit/chromium/public/WebIDBDatabase.h_sec2
44
public:
45
public:
45
    virtual ~WebIDBDatabase() { }
46
    virtual ~WebIDBDatabase() { }
46
47
48
    virtual WebIDBMetadata metadata() const
49
    {
50
        WEBKIT_ASSERT_NOT_REACHED();
51
        return WebIDBMetadata();
52
    }
47
    virtual WebString name() const
53
    virtual WebString name() const
48
    {
54
    {
49
        WEBKIT_ASSERT_NOT_REACHED();
55
        WEBKIT_ASSERT_NOT_REACHED();
- a/Source/WebKit/chromium/public/WebIDBKeyPath.h +1 lines
Lines 47-52 public: a/Source/WebKit/chromium/public/WebIDBKeyPath.h_sec1
47
    WEBKIT_EXPORT static WebIDBKeyPath createNull();
47
    WEBKIT_EXPORT static WebIDBKeyPath createNull();
48
    WEBKIT_EXPORT WebIDBKeyPath(const WebIDBKeyPath&);
48
    WEBKIT_EXPORT WebIDBKeyPath(const WebIDBKeyPath&);
49
    WEBKIT_EXPORT ~WebIDBKeyPath();
49
    WEBKIT_EXPORT ~WebIDBKeyPath();
50
    WEBKIT_EXPORT WebIDBKeyPath& operator=(const WebIDBKeyPath&);
50
51
51
    enum Type {
52
    enum Type {
52
        NullType = 0,
53
        NullType = 0,
- a/Source/WebKit/chromium/public/WebIDBMetadata.h +81 lines
Line 0 a/Source/WebKit/chromium/public/WebIDBMetadata.h_sec1
1
/*
2
 * Copyright (C) 2012 Google Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 *
8
 * 1.  Redistributions of source code must retain the above copyright
9
 *     notice, this list of conditions and the following disclaimer.
10
 * 2.  Redistributions in binary form must reproduce the above copyright
11
 *     notice, this list of conditions and the following disclaimer in the
12
 *     documentation and/or other materials provided with the distribution.
13
 *
14
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17
 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef WebIDBMetadata_h
27
#define WebIDBMetadata_h
28
29
#include "WebIDBKeyPath.h"
30
#include "platform/WebCommon.h"
31
#include "platform/WebPrivateOwnPtr.h"
32
#include "platform/WebString.h"
33
#include "platform/WebVector.h"
34
35
namespace WebCore {
36
struct IDBDatabaseMetadata;
37
struct IDBIndexMetadata;
38
struct IDBObjectStoreMetadata;
39
}
40
41
namespace WebKit {
42
43
struct WebIDBMetadata {
44
    struct Index;
45
    struct ObjectStore;
46
47
    WebString name;
48
    WebString version;
49
    WebVector<ObjectStore> objectStores;
50
    WebIDBMetadata()
51
        : name(WebString())
52
        , version(WebString()) { }
53
54
    struct ObjectStore {
55
        WebString name;
56
        WebIDBKeyPath keyPath;
57
        bool autoIncrement;
58
        WebVector<Index> indexes;
59
        ObjectStore()
60
            : name(WebString())
61
            , keyPath(WebIDBKeyPath::createNull())
62
            , autoIncrement(false) { }
63
    };
64
65
    struct Index {
66
        WebString name;
67
        WebIDBKeyPath keyPath;
68
        bool unique;
69
        bool multiEntry;
70
        Index()
71
            : name(WebString())
72
            , keyPath(WebIDBKeyPath::createNull())
73
            , unique(false)
74
            , multiEntry(false) { }
75
    };
76
};
77
78
79
} // namespace WebKit
80
81
#endif // WebIDBMetadata_h
- a/Source/WebKit/chromium/src/WebIDBKeyPath.cpp +7 lines
Lines 60-65 WebIDBKeyPath WebIDBKeyPath::createNull() a/Source/WebKit/chromium/src/WebIDBKeyPath.cpp_sec1
60
    return WebIDBKeyPath(IDBKeyPath());
60
    return WebIDBKeyPath(IDBKeyPath());
61
}
61
}
62
62
63
WebIDBKeyPath& WebIDBKeyPath::operator=(const WebIDBKeyPath& other)
64
{
65
    ASSERT(other.m_private.get());
66
    m_private.reset(new IDBKeyPath(other));
67
    return *this;
68
}
69
63
bool WebIDBKeyPath::isValid() const
70
bool WebIDBKeyPath::isValid() const
64
{
71
{
65
    ASSERT(m_private.get());
72
    ASSERT(m_private.get());

Return to Bug 88678