Skip to content

Commit 61faabd

Browse files
Eugene Ostroukhovofrobots
Eugene Ostroukhov
authored andcommitted
deps: v8_inspector update
Pick up latest from [1] corresponding to the Blink commit 60cd6e859b. [1]: pavelfeldman/v8_inspector@55f21a5611 PR-URL: #8150 Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
1 parent 1e0bfac commit 61faabd

File tree

102 files changed

+1852
-1598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1852
-1598
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright (C) 2013 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 are
6+
* met:
7+
*
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above
11+
* copyright notice, this list of conditions and the following disclaimer
12+
* in the documentation and/or other materials provided with the
13+
* distribution.
14+
* * Neither the name of Google Inc. nor the names of its
15+
* contributors may be used to endorse or promote products derived from
16+
* this software without specific prior written permission.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
32+
#ifndef PlatformExport_h
33+
#define PlatformExport_h
34+
35+
#if !defined(BLINK_PLATFORM_IMPLEMENTATION)
36+
#define BLINK_PLATFORM_IMPLEMENTATION 0
37+
#endif
38+
39+
#if defined(COMPONENT_BUILD)
40+
#if defined(WIN32)
41+
#if BLINK_PLATFORM_IMPLEMENTATION
42+
#define PLATFORM_EXPORT __declspec(dllexport)
43+
#else
44+
#define PLATFORM_EXPORT __declspec(dllimport)
45+
#endif
46+
#else // defined(WIN32)
47+
#define PLATFORM_EXPORT __attribute__((visibility("default")))
48+
#endif
49+
#else // defined(COMPONENT_BUILD)
50+
#define PLATFORM_EXPORT
51+
#endif
52+
53+
#if defined(_MSC_VER)
54+
// MSVC Compiler warning C4275:
55+
// non dll-interface class 'Bar' used as base for dll-interface class 'Foo'.
56+
// Note that this is intended to be used only when no access to the base class'
57+
// static data is done through derived classes or inline methods. For more info,
58+
// see http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
59+
//
60+
// This pragma will allow exporting a class that inherits from a non-exported
61+
// base class, anywhere in the Blink platform component. This is only
62+
// a problem when using the MSVC compiler on Windows.
63+
#pragma warning(suppress:4275)
64+
#endif
65+
66+
#endif // PlatformExport_h

deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/Array.h deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/Array_h.template

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#ifndef Array_h
66
#define Array_h
77

8-
#include "platform/inspector_protocol/ErrorSupport.h"
9-
#include "platform/inspector_protocol/Platform.h"
10-
#include "platform/inspector_protocol/String16.h"
11-
#include "platform/inspector_protocol/ValueConversions.h"
12-
#include "platform/inspector_protocol/Values.h"
8+
//#include "ErrorSupport.h"
9+
//#include "Platform.h"
10+
//#include "String16.h"
11+
//#include "ValueConversions.h"
12+
//#include "Values.h"
1313

1414
#include <vector>
1515

@@ -126,7 +126,7 @@ class ArrayBase {
126126
std::vector<T> m_vector;
127127
};
128128

129-
template<> class Array<String> : public ArrayBase<String> {};
129+
template<> class Array<InspectorProtocolConvenienceStringType> : public ArrayBase<InspectorProtocolConvenienceStringType> {};
130130
template<> class Array<String16> : public ArrayBase<String16> {};
131131
template<> class Array<int> : public ArrayBase<int> {};
132132
template<> class Array<double> : public ArrayBase<double> {};

deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/BackendCallback.h deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/BackendCallback_h.template

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
#ifndef BackendCallback_h
66
#define BackendCallback_h
77

8-
#include "platform/inspector_protocol/ErrorSupport.h"
9-
#include "platform/inspector_protocol/Platform.h"
8+
//#include "ErrorSupport.h"
9+
//#include "Platform.h"
10+
#include "{{config.class_export.header}}"
1011

1112
namespace blink {
1213
namespace protocol {
1314

14-
class PLATFORM_EXPORT BackendCallback {
15+
class {{config.class_export.macro}} BackendCallback {
1516
public:
1617
virtual ~BackendCallback() { }
1718
virtual void sendFailure(const ErrorString&) = 0;

0 commit comments

Comments
 (0)