| Differences between
and this patch
- a/Source/WebKit2/ChangeLog +56 lines
Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
1
2015-07-07  Joonghun Park  <jh718.park@samsung.com>
2
3
        [EFL][WK2] Add IndexedDB based on DatabaseProcess
4
        https://bugs.webkit.org/show_bug.cgi?id=139643
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp: Add missing config.h, otherwise cause a problem
9
        ENABLE(DATABASE_PROCESS) macro does not work in DatabaseProcessMainUnix.h
10
        * DatabaseProcess/efl/DatabaseProcessMainEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
11
        (WebKit::DatabaseProcessMainUnix):
12
        * PlatformEfl.cmake:
13
        * Shared/efl/KeyedDecoder.cpp: Added.
14
        (WebKit::KeyedDecoder::KeyedDecoder):
15
        (WebKit::KeyedDecoder::~KeyedDecoder):
16
        (WebKit::KeyedDecoder::decodeBytes):
17
        (WebKit::KeyedDecoder::decodeBool):
18
        (WebKit::KeyedDecoder::decodeUInt32):
19
        (WebKit::KeyedDecoder::decodeInt32):
20
        (WebKit::KeyedDecoder::decodeInt64):
21
        (WebKit::KeyedDecoder::decodeFloat):
22
        (WebKit::KeyedDecoder::decodeDouble):
23
        (WebKit::KeyedDecoder::decodeString):
24
        (WebKit::KeyedDecoder::beginObject):
25
        (WebKit::KeyedDecoder::endObject):
26
        (WebKit::KeyedDecoder::beginArray):
27
        (WebKit::KeyedDecoder::beginArrayElement):
28
        (WebKit::KeyedDecoder::endArrayElement):
29
        (WebKit::KeyedDecoder::endArray):
30
        * Shared/efl/KeyedDecoder.h: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
31
        * Shared/efl/KeyedEncoder.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
32
        (WebKit::KeyedEncoder::KeyedEncoder):
33
        (WebKit::KeyedEncoder::~KeyedEncoder):
34
        (WebKit::KeyedEncoder::encodeBytes):
35
        (WebKit::KeyedEncoder::encodeBool):
36
        (WebKit::KeyedEncoder::encodeUInt32):
37
        (WebKit::KeyedEncoder::encodeInt32):
38
        (WebKit::KeyedEncoder::encodeInt64):
39
        (WebKit::KeyedEncoder::encodeFloat):
40
        (WebKit::KeyedEncoder::encodeDouble):
41
        (WebKit::KeyedEncoder::encodeString):
42
        (WebKit::KeyedEncoder::beginObject):
43
        (WebKit::KeyedEncoder::endObject):
44
        (WebKit::KeyedEncoder::beginArray):
45
        (WebKit::KeyedEncoder::beginArrayElement):
46
        (WebKit::KeyedEncoder::endArrayElement):
47
        (WebKit::KeyedEncoder::endArray):
48
        (WebKit::KeyedEncoder::finishEncoding):
49
        * Shared/efl/KeyedEncoder.h: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
50
        * Shared/efl/ProcessExecutablePathEfl.cpp:
51
        (WebKit::executablePathOfDatabaseProcess):
52
        * UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp: Copied from Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.
53
        (WebKit::DatabaseProcessProxy::platformGetLaunchOptions):
54
        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
55
        (WebKit::ProcessLauncher::launchProcess):
56
1
2015-07-06  Brent Fulgham  <bfulgham@apple.com>
57
2015-07-06  Brent Fulgham  <bfulgham@apple.com>
2
58
3
        Ensure media playback is stopped during page close
59
        Ensure media playback is stopped during page close
- a/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp +1 lines
Lines 23-28 a/Source/WebKit2/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp_sec1
23
 * THE POSSIBILITY OF SUCH DAMAGE.
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
24
 */
25
25
26
#include "config.h"
26
#include "DatabaseProcessMainUnix.h"
27
#include "DatabaseProcessMainUnix.h"
27
28
28
using namespace WebKit;
29
using namespace WebKit;
- a/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp +65 lines
Line 0 a/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp_sec1
1
/*
2
 * Copyright (C) 2015 Samsung Electronics
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 "DatabaseProcess.h"
28
29
#if ENABLE(DATABASE_PROCESS)
30
31
#include "ChildProcessMain.h"
32
#include "DatabaseProcessMainUnix.h"
33
#include <Ecore.h>
34
35
using namespace WebCore;
36
37
namespace WebKit {
38
39
class DatabaseProcessMain final: public ChildProcessMainBase {
40
public:
41
    bool platformInitialize() override
42
    {
43
        if (!ecore_init())
44
            return false;
45
46
        if (!ecore_main_loop_glib_integrate())
47
            return false;
48
49
        return true;
50
    }
51
52
    void platformFinalize() override
53
    {
54
        ecore_shutdown();
55
    }
56
};
57
58
int DatabaseProcessMainUnix(int argc, char** argv)
59
{
60
    return ChildProcessMain<DatabaseProcess, DatabaseProcessMain>(argc, argv);
61
}
62
63
} // namespace WebKit
64
65
#endif // ENABLE(DATABASE_PROCESS)
- a/Source/WebKit2/PlatformEfl.cmake +12 lines
Lines 1-4 a/Source/WebKit2/PlatformEfl.cmake_sec1
1
list(APPEND WebKit2_SOURCES
1
list(APPEND WebKit2_SOURCES
2
    DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
3
2
    NetworkProcess/efl/NetworkProcessMainEfl.cpp
4
    NetworkProcess/efl/NetworkProcessMainEfl.cpp
3
5
4
    NetworkProcess/soup/NetworkProcessSoup.cpp
6
    NetworkProcess/soup/NetworkProcessSoup.cpp
Lines 36-41 list(APPEND WebKit2_SOURCES a/Source/WebKit2/PlatformEfl.cmake_sec2
36
38
37
    Shared/cairo/ShareableBitmapCairo.cpp
39
    Shared/cairo/ShareableBitmapCairo.cpp
38
40
41
    Shared/efl/KeyedDecoder.cpp
42
    Shared/efl/KeyedEncoder.cpp
39
    Shared/efl/NativeContextMenuItemEfl.cpp
43
    Shared/efl/NativeContextMenuItemEfl.cpp
40
    Shared/efl/NativeWebKeyboardEventEfl.cpp
44
    Shared/efl/NativeWebKeyboardEventEfl.cpp
41
    Shared/efl/NativeWebTouchEventEfl.cpp
45
    Shared/efl/NativeWebTouchEventEfl.cpp
Lines 57-62 list(APPEND WebKit2_SOURCES a/Source/WebKit2/PlatformEfl.cmake_sec3
57
61
58
    Shared/unix/ChildProcessMain.cpp
62
    Shared/unix/ChildProcessMain.cpp
59
63
64
    UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp
65
60
    UIProcess/BackingStore.cpp
66
    UIProcess/BackingStore.cpp
61
    UIProcess/DefaultUndoController.cpp
67
    UIProcess/DefaultUndoController.cpp
62
68
Lines 228-233 list(APPEND WebKit2_INCLUDE_DIRECTORIES a/Source/WebKit2/PlatformEfl.cmake_sec4
228
    "${WEBCORE_DIR}/platform/graphics/x11"
234
    "${WEBCORE_DIR}/platform/graphics/x11"
229
    "${WEBCORE_DIR}/platform/network/soup"
235
    "${WEBCORE_DIR}/platform/network/soup"
230
    "${WEBCORE_DIR}/platform/text/enchant"
236
    "${WEBCORE_DIR}/platform/text/enchant"
237
    "${WEBKIT2_DIR}/DatabaseProcess/unix"
231
    "${WEBKIT2_DIR}/NetworkProcess/efl"
238
    "${WEBKIT2_DIR}/NetworkProcess/efl"
232
    "${WEBKIT2_DIR}/NetworkProcess/unix"
239
    "${WEBKIT2_DIR}/NetworkProcess/unix"
233
    "${WEBKIT2_DIR}/Platform/efl"
240
    "${WEBKIT2_DIR}/Platform/efl"
Lines 313-318 list(APPEND NetworkProcess_SOURCES a/Source/WebKit2/PlatformEfl.cmake_sec5
313
    NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
320
    NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
314
)
321
)
315
322
323
list(APPEND DatabaseProcess_SOURCES
324
    DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
325
)
326
316
list(APPEND WebProcess_LIBRARIES
327
list(APPEND WebProcess_LIBRARIES
317
    ${CAIRO_LIBRARIES}
328
    ${CAIRO_LIBRARIES}
318
    ${ECORE_IMF_EVAS_LIBRARIES}
329
    ${ECORE_IMF_EVAS_LIBRARIES}
Lines 481-486 add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\" a/Source/WebKit2/PlatformEfl.cmake_sec6
481
    -DWEBPROCESSNAME=\"WebProcess\"
492
    -DWEBPROCESSNAME=\"WebProcess\"
482
    -DPLUGINPROCESSNAME=\"PluginProcess\"
493
    -DPLUGINPROCESSNAME=\"PluginProcess\"
483
    -DNETWORKPROCESSNAME=\"NetworkProcess\"
494
    -DNETWORKPROCESSNAME=\"NetworkProcess\"
495
    -DDATABASEPROCESSNAME=\"DatabaseProcess\"
484
    -DEXTENSIONMANAGERNAME=\"libewebkit_extension_manager.so\"
496
    -DEXTENSIONMANAGERNAME=\"libewebkit_extension_manager.so\"
485
    -DGTEST_HAS_RTTI=0
497
    -DGTEST_HAS_RTTI=0
486
)
498
)
- a/Source/WebKit2/Shared/efl/KeyedDecoder.cpp +108 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedDecoder.cpp_sec1
1
/*
2
 * Copyright (C) 2015 Samsung Electronics
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
bool KeyedDecoder::decodeBool(const String& key, bool& result)
47
{
48
    return false;
49
}
50
51
bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
52
{
53
    return false;
54
}
55
56
bool KeyedDecoder::decodeInt32(const String& key, int32_t& result)
57
{
58
    return false;
59
}
60
61
bool KeyedDecoder::decodeInt64(const String& key, int64_t& result)
62
{
63
    return false;
64
}
65
66
bool KeyedDecoder::decodeFloat(const String& key, float& result)
67
{
68
    return false;
69
}
70
71
bool KeyedDecoder::decodeDouble(const String& key, double& result)
72
{
73
    return false;
74
}
75
76
bool KeyedDecoder::decodeString(const String& key, String& result)
77
{
78
    return false;
79
}
80
81
bool KeyedDecoder::beginObject(const String& key)
82
{
83
    return false;
84
}
85
86
void KeyedDecoder::endObject()
87
{
88
}
89
90
bool KeyedDecoder::beginArray(const String& key)
91
{
92
    return false;
93
}
94
95
bool KeyedDecoder::beginArrayElement()
96
{
97
    return false;
98
}
99
100
void KeyedDecoder::endArrayElement()
101
{
102
}
103
104
void KeyedDecoder::endArray()
105
{
106
}
107
108
} // namespace WebKit
- a/Source/WebKit2/Shared/efl/KeyedDecoder.h +63 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedDecoder.h_sec1
1
/*
2
 * Copyright (C) 2015 Samsung Electronics
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 <Eet.h>
30
#include <WebCore/KeyedCoding.h>
31
#include <wtf/HashMap.h>
32
#include <wtf/text/StringHash.h>
33
#include <wtf/text/WTFString.h>
34
35
namespace WebKit {
36
37
class KeyedDecoder final : public WebCore::KeyedDecoder {
38
public:
39
    KeyedDecoder(const uint8_t* data, size_t);
40
    virtual ~KeyedDecoder() override;
41
42
private:
43
    virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) override;
44
    virtual bool decodeBool(const String& key, bool&) override;
45
    virtual bool decodeUInt32(const String& key, uint32_t&) override;
46
    virtual bool decodeInt32(const String& key, int32_t&) override;
47
    virtual bool decodeInt64(const String& key, int64_t&) override;
48
    virtual bool decodeFloat(const String& key, float&) override;
49
    virtual bool decodeDouble(const String& key, double&) override;
50
    virtual bool decodeString(const String& key, String&) override;
51
52
    virtual bool beginObject(const String& key) override;
53
    virtual void endObject() override;
54
55
    virtual bool beginArray(const String& key) override;
56
    virtual bool beginArrayElement() override;
57
    virtual void endArrayElement() override;
58
    virtual void endArray() override;
59
};
60
61
} // namespace WebKit
62
63
#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 Samsung Electronics
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 SharedBuffer::create("", 0);
103
}
104
105
} // namespace WebKit
- a/Source/WebKit2/Shared/efl/KeyedEncoder.h +64 lines
Line 0 a/Source/WebKit2/Shared/efl/KeyedEncoder.h_sec1
1
/*
2
 * Copyright (C) 2015 Samsung Electronics
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 <Eet.h>
30
#include <WebCore/KeyedCoding.h>
31
#include <wtf/Vector.h>
32
#include <wtf/text/WTFString.h>
33
34
namespace WebKit {
35
36
class KeyedEncoder final : public WebCore::KeyedEncoder {
37
public:
38
    KeyedEncoder();
39
    ~KeyedEncoder();
40
41
    virtual PassRefPtr<WebCore::SharedBuffer> finishEncoding() override;
42
43
private:
44
    virtual void encodeBytes(const String& key, const uint8_t*, size_t) override;
45
    virtual void encodeBool(const String& key, bool) override;
46
    virtual void encodeUInt32(const String& key, uint32_t) override;
47
    virtual void encodeInt32(const String& key, int32_t) override;
48
    virtual void encodeInt64(const String& key, int64_t) override;
49
    virtual void encodeFloat(const String& key, float) override;
50
    virtual void encodeDouble(const String& key, double) override;
51
    virtual void encodeString(const String& key, const String&) override;
52
53
    virtual void beginObject(const String& key) override;
54
    virtual void endObject() override;
55
56
    virtual void beginArray(const String& key) override;
57
    virtual void beginArrayElement() override;
58
    virtual void endArrayElement() override;
59
    virtual void endArray() override;
60
};
61
62
} // namespace WebKit
63
64
#endif // KeyedEncoder_h
- a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp +9 lines
Lines 90-93 String executablePathOfNetworkProcess() a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp_sec1
90
}
90
}
91
#endif
91
#endif
92
92
93
#if ENABLE(DATABASE_PROCESS)
94
String executablePathOfDatabaseProcess()
95
{
96
    static NeverDestroyed<const String> webKitDatabaseProcessName(findProcessPath(DATABASEPROCESSNAME));
97
98
    return webKitDatabaseProcessName;
99
}
100
#endif
101
93
} // namespace WebKit
102
} // namespace WebKit
- a/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp +39 lines
Line 0 a/Source/WebKit2/UIProcess/Databases/efl/DatabaseProcessProxyEfl.cpp_sec1
1
/*
2
 * Copyright (C) 2015 Samsung Electronics
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 "DatabaseProcessProxy.h"
28
29
#if ENABLE(DATABASE_PROCESS)
30
31
namespace WebKit {
32
33
void DatabaseProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions&)
34
{
35
}
36
37
} // namespace WebKit
38
39
#endif // ENABLE(DATABASE_PROCESS)
- a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp +5 lines
Lines 89-94 void ProcessLauncher::launchProcess() a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp_sec1
89
        executablePath = executablePathOfNetworkProcess();
89
        executablePath = executablePathOfNetworkProcess();
90
        break;
90
        break;
91
#endif
91
#endif
92
#if ENABLE(DATABASE_PROCESS)
93
    case DatabaseProcess:
94
        executablePath = executablePathOfDatabaseProcess();
95
        break;
96
#endif
92
    default:
97
    default:
93
        ASSERT_NOT_REACHED();
98
        ASSERT_NOT_REACHED();
94
        return;
99
        return;
- a/Source/cmake/OptionsEfl.cmake -1 / +2 lines
Lines 79-84 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON) a/Source/cmake/OptionsEfl.cmake_sec1
79
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)
79
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)
80
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
80
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
81
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC ON)
81
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC ON)
82
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PUBLIC ON)
82
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC ON)
83
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC ON)
83
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR PUBLIC ON)
84
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR PUBLIC ON)
84
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PUBLIC ON)
85
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PUBLIC ON)
Lines 91-97 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF) a/Source/cmake/OptionsEfl.cmake_sec2
91
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
92
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
92
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
93
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
93
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
94
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
94
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC OFF)
95
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC ON)
95
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
96
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
96
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
97
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
97
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
98
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
- a/Tools/ChangeLog +9 lines
Lines 1-3 a/Tools/ChangeLog_sec1
1
2015-07-07  Joonghun Park  <jh718.park@samsung.com>
2
3
        [EFL][WK2] Add IndexedDB based on DatabaseProcess
4
        https://bugs.webkit.org/show_bug.cgi?id=139643
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * Scripts/webkitperl/FeatureList.pm:
9
1
2015-07-06  Alex Christensen  <achristensen@webkit.org>
10
2015-07-06  Alex Christensen  <achristensen@webkit.org>
2
11
3
        [Content Extensions] Remove memory page reporting
12
        [Content Extensions] Remove memory page reporting
- a/Tools/Scripts/webkitperl/FeatureList.pm -1 / +1 lines
Lines 259-265 my @features = ( a/Tools/Scripts/webkitperl/FeatureList.pm_sec1
259
      define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
259
      define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
260
260
261
    { option => "indexed-database", desc => "Toggle Indexed Database support",
261
    { option => "indexed-database", desc => "Toggle Indexed Database support",
262
      define => "ENABLE_INDEXED_DATABASE", default => isGtk(), value => \$indexedDatabaseSupport },
262
      define => "ENABLE_INDEXED_DATABASE", default => (isEfl() || isGtk()), value => \$indexedDatabaseSupport },
263
263
264
    { option => "input-speech", desc => "Toggle Input Speech support",
264
    { option => "input-speech", desc => "Toggle Input Speech support",
265
      define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
265
      define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
- a/ChangeLog +9 lines
Lines 1-3 a/ChangeLog_sec1
1
2015-07-07  Joonghun Park  <jh718.park@samsung.com>
2
3
        [EFL][WK2] Add IndexedDB based on DatabaseProcess
4
        https://bugs.webkit.org/show_bug.cgi?id=139643
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * Source/cmake/OptionsEfl.cmake:
9
1
2015-07-03  Emanuele Aina  <emanuele.aina@collabora.com>
10
2015-07-03  Emanuele Aina  <emanuele.aina@collabora.com>
2
11
3
        [GTK] Forcefully disable gtk-doc and gobject-introspection when crossbuilding
12
        [GTK] Forcefully disable gtk-doc and gobject-introspection when crossbuilding

Return to Bug 139643