Skip to content

Commit fe3e73a

Browse files
donny-dontdonny-dont
committed
[PlayStation] Add WebKit API files
https://bugs.webkit.org/show_bug.cgi?id=207168 Reviewed by Darin Adler. Add PlayStation WebKit API files and expose them in the root header. Fix up the build to copy them over. Also make sure that the playstation directory is listed as a platform in the forwarding headers script. * PlatformPlayStation.cmake: * Scripts/generate-forwarding-headers.pl: * Shared/API/c/WKBase.h: * Shared/API/c/playstation/WKBasePlayStation.h: Added. * UIProcess/API/C/WKAPICast.h: * UIProcess/API/C/playstation/WKAPICastPlayStation.h: Added. * UIProcess/API/C/playstation/WKView.h: Added. Canonical link: https://commits.webkit.org/220201@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255685 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent ea1f9f0 commit fe3e73a

8 files changed

Lines changed: 145 additions & 5 deletions

File tree

‎Source/WebKit/ChangeLog‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
2020-02-04 Don Olmstead <[email protected]>
2+
3+
[PlayStation] Add WebKit API files
4+
https://bugs.webkit.org/show_bug.cgi?id=207168
5+
6+
Reviewed by Darin Adler.
7+
8+
Add PlayStation WebKit API files and expose them in the root header. Fix up the
9+
build to copy them over. Also make sure that the playstation directory is listed
10+
as a platform in the forwarding headers script.
11+
12+
* PlatformPlayStation.cmake:
13+
* Scripts/generate-forwarding-headers.pl:
14+
* Shared/API/c/WKBase.h:
15+
* Shared/API/c/playstation/WKBasePlayStation.h: Added.
16+
* UIProcess/API/C/WKAPICast.h:
17+
* UIProcess/API/C/playstation/WKAPICastPlayStation.h: Added.
18+
* UIProcess/API/C/playstation/WKView.h: Added.
19+
120
2020-02-04 youenn fablet <[email protected]>
221

322
NetworkProcess should be notified by UIProcess when its service worker process connection should be on

‎Source/WebKit/PlatformPlayStation.cmake‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ list(APPEND WebKit_SOURCES
2828

2929
NetworkProcess/curl/NetworkDataTaskCurl.cpp
3030
NetworkProcess/curl/NetworkProcessCurl.cpp
31+
NetworkProcess/curl/NetworkProcessMainCurl.cpp
3132
NetworkProcess/curl/NetworkSessionCurl.cpp
3233
NetworkProcess/curl/RemoteNetworkingContextCurl.cpp
3334

@@ -72,7 +73,6 @@ list(APPEND WebKit_SOURCES
7273
UIProcess/WebMemoryPressureHandler.cpp
7374
UIProcess/WebViewportAttributes.cpp
7475

75-
UIProcess/API/C/WKGrammarDetail.cpp
7676
UIProcess/API/C/WKViewportAttributes.cpp
7777

7878
UIProcess/API/C/curl/WKProtectionSpaceCurl.cpp
@@ -109,24 +109,23 @@ list(APPEND WebKit_SOURCES
109109

110110
WebProcess/WebPage/playstation/WebPagePlayStation.cpp
111111

112+
WebProcess/playstation/WebProcessMainPlayStation.cpp
112113
WebProcess/playstation/WebProcessPlayStation.cpp
113114
)
114115

115116
list(APPEND WebKit_INCLUDE_DIRECTORIES
116117
"${WEBKIT_DIR}/NetworkProcess/curl"
117-
"${WEBKIT_DIR}/NetworkProcess/unix"
118118
"${WEBKIT_DIR}/Platform/IPC/unix"
119119
"${WEBKIT_DIR}/Shared/CoordinatedGraphics"
120120
"${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
121121
"${WEBKIT_DIR}/Shared/libwpe"
122-
"${WEBKIT_DIR}/Shared/unix"
123122
"${WEBKIT_DIR}/UIProcess/API/C/cairo"
124123
"${WEBKIT_DIR}/UIProcess/API/C/curl"
124+
"${WEBKIT_DIR}/UIProcess/API/C/playstation"
125125
"${WEBKIT_DIR}/UIProcess/CoordinatedGraphics"
126126
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"
127127
"${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
128128
"${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
129-
"${WEBKIT_DIR}/WebProcess/unix"
130129
)
131130

132131
# Temporarily list out shared headers here
@@ -282,7 +281,16 @@ set(WebKit_PUBLIC_FRAMEWORK_HEADERS
282281

283282
# PlayStation specific
284283
list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
284+
Shared/API/c/cairo/WKImageCairo.h
285285

286+
Shared/API/c/curl/WKCertificateInfoCurl.h
287+
288+
Shared/API/c/playstation/WKBasePlayStation.h
289+
290+
UIProcess/API/C/curl/WKProtectionSpaceCurl.h
291+
UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.h
292+
293+
UIProcess/API/C/playstation/WKView.h
286294
)
287295

288296
WEBKIT_MAKE_FORWARDING_HEADERS(WebKit

‎Source/WebKit/Scripts/generate-forwarding-headers.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
use Getopt::Long;
3737

3838
my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
39-
my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "curl", "gtk", "ios", "mac", "soup", "win", "wpe");
39+
my @platformPrefixes = ("ca", "cf", "cocoa", "Cocoa", "curl", "gtk", "ios", "mac", "playstation", "soup", "win", "wpe");
4040
my @frameworks = ("WebKit");
4141
my @skippedPrefixes = ("PAL");
4242
my @frameworkHeaders;

‎Source/WebKit/Shared/API/c/WKBase.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
#include <WebKit/WKBaseMac.h>
3939
#elif defined(_WIN32)
4040
#include <WebKit/WKBaseWin.h>
41+
#elif defined(__SCE__)
42+
#include <WebKit/WKBasePlayStation.h>
4143
#endif
4244

4345
/* WebKit2 shared types */

‎Source/WebKit/Shared/API/c/playstation/WKBasePlayStation.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright (C) 2020 Sony Interactive Entertainment Inc.
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 WKBasePlayStation_h
27+
#define WKBasePlayStation_h
28+
29+
#ifndef WKBase_h
30+
#error "Please #include \"WKBase.h\" instead of this file directly."
31+
#endif
32+
33+
typedef const struct OpaqueWKView* WKViewRef;
34+
35+
#endif /* WKBasePlayStation_h */

‎Source/WebKit/UIProcess/API/C/WKAPICast.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,4 +549,8 @@ inline WKWebGLLoadPolicy toAPI(WebCore::WebGLLoadPolicy webGLLoadPolicy)
549549
#include "WKAPICastWin.h"
550550
#endif
551551

552+
#if defined(__SCE__)
553+
#include "WKAPICastPlayStation.h"
554+
#endif
555+
552556
#endif // WKAPICast_h

‎Source/WebKit/UIProcess/API/C/playstation/WKAPICastPlayStation.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (C) 2020 Sony Interactive Entertainment Inc.
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 WKAPICastPlayStation_h
27+
#define WKAPICastPlayStation_h
28+
29+
#ifndef WKAPICast_h
30+
#error "Please #include \"WKAPICast.h\" instead of this file directly."
31+
#endif
32+
33+
#endif /* WKAPICastPlayStation_h */

‎Source/WebKit/UIProcess/API/C/playstation/WKView.h‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright (C) 2020 Sony Interactive Entertainment Inc.
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 WKView_h
27+
#define WKView_h
28+
29+
#include <WebKit/WKBase.h>
30+
31+
#ifdef __cplusplus
32+
extern "C" {
33+
#endif
34+
35+
#ifdef __cplusplus
36+
}
37+
#endif
38+
39+
#endif /* WKView_h */

0 commit comments

Comments
 (0)