| Differences between
and this patch
- a/Source/WebKit2/ChangeLog +47 lines
Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
1
2015-06-10  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
2
3
        [EFL] Support indexeddb for WK2
4
        https://bugs.webkit.org/show_bug.cgi?id=145867
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * PlatformEfl.cmake:
9
        * Shared/efl/KeyedDecoder.cpp: Added.
10
        (WebKit::KeyedDecoder::KeyedDecoder):
11
        (WebKit::KeyedDecoder::~KeyedDecoder):
12
        (WebKit::KeyedDecoder::decodeBytes):
13
        (WebKit::KeyedDecoder::decodeSimpleValue):
14
        (WebKit::KeyedDecoder::decodeBool):
15
        (WebKit::KeyedDecoder::decodeUInt32):
16
        (WebKit::KeyedDecoder::decodeInt32):
17
        (WebKit::KeyedDecoder::decodeInt64):
18
        (WebKit::KeyedDecoder::decodeFloat):
19
        (WebKit::KeyedDecoder::decodeDouble):
20
        (WebKit::KeyedDecoder::decodeString):
21
        (WebKit::KeyedDecoder::beginObject):
22
        (WebKit::KeyedDecoder::endObject):
23
        (WebKit::KeyedDecoder::beginArray):
24
        (WebKit::KeyedDecoder::beginArrayElement):
25
        (WebKit::KeyedDecoder::endArrayElement):
26
        (WebKit::KeyedDecoder::endArray):
27
        * Shared/efl/KeyedDecoder.h: Added.
28
        * Shared/efl/KeyedEncoder.cpp: Added.
29
        (WebKit::KeyedEncoder::KeyedEncoder):
30
        (WebKit::KeyedEncoder::~KeyedEncoder):
31
        (WebKit::KeyedEncoder::encodeBytes):
32
        (WebKit::KeyedEncoder::encodeBool):
33
        (WebKit::KeyedEncoder::encodeUInt32):
34
        (WebKit::KeyedEncoder::encodeInt32):
35
        (WebKit::KeyedEncoder::encodeInt64):
36
        (WebKit::KeyedEncoder::encodeFloat):
37
        (WebKit::KeyedEncoder::encodeDouble):
38
        (WebKit::KeyedEncoder::encodeString):
39
        (WebKit::KeyedEncoder::beginObject):
40
        (WebKit::KeyedEncoder::endObject):
41
        (WebKit::KeyedEncoder::beginArray):
42
        (WebKit::KeyedEncoder::beginArrayElement):
43
        (WebKit::KeyedEncoder::endArrayElement):
44
        (WebKit::KeyedEncoder::endArray):
45
        (WebKit::KeyedEncoder::finishEncoding):
46
        * Shared/efl/KeyedEncoder.h: Added.
47
1
2015-06-09  Anders Carlsson  <andersca@apple.com>
48
2015-06-09  Anders Carlsson  <andersca@apple.com>
2
49
3
        Fix build.
50
        Fix build.
- a/Source/WebKit2/PlatformEfl.cmake +2 lines
Lines 36-41 list(APPEND WebKit2_SOURCES a/Source/WebKit2/PlatformEfl.cmake_sec1
36
36
37
    Shared/cairo/ShareableBitmapCairo.cpp
37
    Shared/cairo/ShareableBitmapCairo.cpp
38
38
39
    Shared/efl/KeyedDecoder.cpp
40
    Shared/efl/KeyedEncoder.cpp
39
    Shared/efl/NativeContextMenuItemEfl.cpp
41
    Shared/efl/NativeContextMenuItemEfl.cpp
40
    Shared/efl/NativeWebKeyboardEventEfl.cpp
42
    Shared/efl/NativeWebKeyboardEventEfl.cpp
41
    Shared/efl/NativeWebTouchEventEfl.cpp
43
    Shared/efl/NativeWebTouchEventEfl.cpp
- a/Source/WebKit2/Shared/efl/KeyedDecoder.cpp +114 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedDecoder.cpp_sec1
1
/*
2
 * Copyright (C) 2015 Naver Corp. 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
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "config.h"
27
#include "KeyedDecoder.h"
28
29
#include <wtf/text/CString.h>
30
31
namespace WebKit {
32
33
KeyedDecoder::KeyedDecoder(const uint8_t* data, size_t size)
34
{
35
}
36
37
KeyedDecoder::~KeyedDecoder()
38
{
39
}
40
41
bool KeyedDecoder::decodeBytes(const String& key, const uint8_t*& bytes, size_t& size)
42
{
43
    return false;
44
}
45
46
template<typename T, typename F>
47
bool KeyedDecoder::decodeSimpleValue(const String& key, T& result, F getFunction)
48
{
49
    return false;
50
}
51
52
bool KeyedDecoder::decodeBool(const String& key, bool& result)
53
{
54
    return decodeSimpleValue(key, result, g_variant_get_boolean);
55
}
56
57
bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
58
{
59
    return decodeSimpleValue(key, result, g_variant_get_uint32);
60
}
61
62
bool KeyedDecoder::decodeInt32(const String& key, int32_t& result)
63
{
64
    return decodeSimpleValue(key, result, g_variant_get_int32);
65
}
66
67
bool KeyedDecoder::decodeInt64(const String& key, int64_t& result)
68
{
69
    return decodeSimpleValue(key, result, g_variant_get_int64);
70
}
71
72
bool KeyedDecoder::decodeFloat(const String& key, float& result)
73
{
74
    return decodeSimpleValue(key, result, g_variant_get_double);
75
}
76
77
bool KeyedDecoder::decodeDouble(const String& key, double& result)
78
{
79
    return decodeSimpleValue(key, result, g_variant_get_double);
80
}
81
82
bool KeyedDecoder::decodeString(const String& key, String& result)
83
{
84
    return false;
85
}
86
87
bool KeyedDecoder::beginObject(const String& key)
88
{
89
    return false;
90
}
91
92
void KeyedDecoder::endObject()
93
{
94
}
95
96
bool KeyedDecoder::beginArray(const String& key)
97
{
98
    return false;
99
}
100
101
bool KeyedDecoder::beginArrayElement()
102
{
103
    return false;
104
}
105
106
void KeyedDecoder::endArrayElement()
107
{
108
}
109
110
void KeyedDecoder::endArray()
111
{
112
}
113
114
} // namespace WebKit
- a/Source/WebKit2/Shared/efl/KeyedDecoder.h +66 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedDecoder.h_sec1
1
/*
2
 * Copyright (C) 2015 Naver Corp. 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
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef KeyedDecoder_h
27
#define KeyedDecoder_h
28
29
#include <WebCore/KeyedCoding.h>
30
#include <wtf/HashMap.h>
31
#include <wtf/text/StringHash.h>
32
#include <wtf/text/WTFString.h>
33
34
namespace WebKit {
35
36
class KeyedDecoder final : public WebCore::KeyedDecoder {
37
public:
38
    KeyedDecoder(const uint8_t* data, size_t);
39
    virtual ~KeyedDecoder() override;
40
41
private:
42
    virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) override;
43
    virtual bool decodeBool(const String& key, bool&) override;
44
    virtual bool decodeUInt32(const String& key, uint32_t&) override;
45
    virtual bool decodeInt32(const String& key, int32_t&) override;
46
    virtual bool decodeInt64(const String& key, int64_t&) override;
47
    virtual bool decodeFloat(const String& key, float&) override;
48
    virtual bool decodeDouble(const String& key, double&) override;
49
    virtual bool decodeString(const String& key, String&) override;
50
51
    virtual bool beginObject(const String& key) override;
52
    virtual void endObject() override;
53
54
    virtual bool beginArray(const String& key) override;
55
    virtual bool beginArrayElement() override;
56
    virtual void endArrayElement() override;
57
    virtual void endArray() override;
58
59
    template<typename T, typename F> bool decodeSimpleValue(const String& key, T& result, F getFunction);
60
61
    Vector<unsigned> m_arrayIndexStack;
62
};
63
64
} // namespace WebKit
65
66
#endif // KeyedDecoder_h
- a/Source/WebKit2/Shared/efl/KeyedEncoder.cpp +105 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedEncoder.cpp_sec1
1
/*
2
 * Copyright (C) 2015 Naver Corp. 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
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "config.h"
27
#include "KeyedEncoder.h"
28
29
#include <WebCore/SharedBuffer.h>
30
#include <wtf/text/CString.h>
31
32
using namespace WebCore;
33
34
namespace WebKit {
35
36
KeyedEncoder::KeyedEncoder()
37
{
38
}
39
40
KeyedEncoder::~KeyedEncoder()
41
{
42
}
43
44
void KeyedEncoder::encodeBytes(const String& key, const uint8_t* bytes, size_t size)
45
{
46
}
47
48
void KeyedEncoder::encodeBool(const String& key, bool value)
49
{
50
}
51
52
void KeyedEncoder::encodeUInt32(const String& key, uint32_t value)
53
{
54
}
55
56
void KeyedEncoder::encodeInt32(const String& key, int32_t value)
57
{
58
}
59
60
void KeyedEncoder::encodeInt64(const String& key, int64_t value)
61
{
62
}
63
64
void KeyedEncoder::encodeFloat(const String& key, float value)
65
{
66
}
67
68
void KeyedEncoder::encodeDouble(const String& key, double value)
69
{
70
}
71
72
void KeyedEncoder::encodeString(const String& key, const String& value)
73
{
74
}
75
76
void KeyedEncoder::beginObject(const String& key)
77
{
78
}
79
80
void KeyedEncoder::endObject()
81
{
82
}
83
84
void KeyedEncoder::beginArray(const String& key)
85
{
86
}
87
88
void KeyedEncoder::beginArrayElement()
89
{
90
}
91
92
void KeyedEncoder::endArrayElement()
93
{
94
}
95
96
void KeyedEncoder::endArray()
97
{
98
}
99
100
PassRefPtr<SharedBuffer> KeyedEncoder::finishEncoding()
101
{
102
    return nullptr;
103
}
104
105
} // namespace WebKit
- a/Source/WebKit2/Shared/efl/KeyedEncoder.h +63 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedEncoder.h_sec1
1
/*
2
 * Copyright (C) 2015 Naver Corp. 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
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef KeyedEncoder_h
27
#define KeyedEncoder_h
28
29
#include <WebCore/KeyedCoding.h>
30
#include <wtf/Vector.h>
31
#include <wtf/text/WTFString.h>
32
33
namespace WebKit {
34
35
class KeyedEncoder final : public WebCore::KeyedEncoder {
36
public:
37
    KeyedEncoder();
38
    ~KeyedEncoder();
39
40
    virtual PassRefPtr<WebCore::SharedBuffer> finishEncoding() override;
41
42
private:
43
    virtual void encodeBytes(const String& key, const uint8_t*, size_t) override;
44
    virtual void encodeBool(const String& key, bool) override;
45
    virtual void encodeUInt32(const String& key, uint32_t) override;
46
    virtual void encodeInt32(const String& key, int32_t) override;
47
    virtual void encodeInt64(const String& key, int64_t) override;
48
    virtual void encodeFloat(const String& key, float) override;
49
    virtual void encodeDouble(const String& key, double) override;
50
    virtual void encodeString(const String& key, const String&) override;
51
52
    virtual void beginObject(const String& key) override;
53
    virtual void endObject() override;
54
55
    virtual void beginArray(const String& key) override;
56
    virtual void beginArrayElement() override;
57
    virtual void endArrayElement() override;
58
    virtual void endArray() override;
59
};
60
61
} // namespace WebKit
62
63
#endif // KeyedEncoder_h
- a/Source/cmake/OptionsEfl.cmake -1 / +1 lines
Lines 84-90 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF) a/Source/cmake/OptionsEfl.cmake_sec1
84
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
84
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
85
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
85
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
86
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
86
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
87
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC OFF)
87
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC ON)
88
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
88
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
89
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
89
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
90
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
90
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
- a/Tools/ChangeLog +9 lines
Lines 1-3 a/Tools/ChangeLog_sec1
1
2015-06-10  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
2
3
        [EFL] Support indexeddb for WK2
4
        https://bugs.webkit.org/show_bug.cgi?id=145867
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * Scripts/webkitperl/FeatureList.pm:
9
1
2015-06-10  Hyungwook Lee  <hyungwook.lee@navercorp.com>
10
2015-06-10  Hyungwook Lee  <hyungwook.lee@navercorp.com>
2
11
3
        [EFL] Execute Javascript method in mini browser address bar.
12
        [EFL] Execute Javascript method in mini browser address bar.
- a/Tools/Scripts/webkitperl/FeatureList.pm -1 / +1 lines
Lines 262-268 my @features = ( a/Tools/Scripts/webkitperl/FeatureList.pm_sec1
262
      define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
262
      define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
263
263
264
    { option => "indexed-database", desc => "Toggle Indexed Database support",
264
    { option => "indexed-database", desc => "Toggle Indexed Database support",
265
      define => "ENABLE_INDEXED_DATABASE", default => isGtk(), value => \$indexedDatabaseSupport },
265
      define => "ENABLE_INDEXED_DATABASE", default => (isGtk() || isEfl()), value => \$indexedDatabaseSupport },
266
266
267
    { option => "input-speech", desc => "Toggle Input Speech support",
267
    { option => "input-speech", desc => "Toggle Input Speech support",
268
      define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
268
      define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
- a/ChangeLog +9 lines
Lines 1-3 a/ChangeLog_sec1
1
2015-06-10  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
2
3
        [EFL] Support indexeddb for WK2
4
        https://bugs.webkit.org/show_bug.cgi?id=145867
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * Source/cmake/OptionsEfl.cmake:
9
1
2015-06-03  Daniel Bates  <dabates@apple.com>
10
2015-06-03  Daniel Bates  <dabates@apple.com>
2
11
3
        Caps lock indicator should not be shown in read-only or disabled field
12
        Caps lock indicator should not be shown in read-only or disabled field

Return to Bug 145867