Title: [227665] trunk/Source/WebCore
- Revision
- 227665
- Author
- [email protected]
- Date
- 2018-01-25 21:08:15 -0800 (Thu, 25 Jan 2018)
Log Message
Web Inspector: Add InspectorShaderProgram to Unified Sources build
https://bugs.webkit.org/show_bug.cgi?id=182084
Patch by Joseph Pecoraro <[email protected]> on 2018-01-25
Reviewed by Dan Bernstein.
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* Sources.txt:
Move to Sources.txt always.
* inspector/InspectorShaderProgram.cpp:
Add ENABLE(WEBGL) guard to contents.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (227664 => 227665)
--- trunk/Source/WebCore/CMakeLists.txt 2018-01-26 05:03:37 UTC (rev 227664)
+++ trunk/Source/WebCore/CMakeLists.txt 2018-01-26 05:08:15 UTC (rev 227665)
@@ -1128,8 +1128,6 @@
html/MediaEncryptedEvent.cpp
)
list(APPEND WebCore_IDL_FILES
- )
- list(APPEND WebCore_IDL_FILES
Modules/encryptedmedia/MediaKeyMessageEvent.idl
Modules/encryptedmedia/MediaKeySession.idl
Modules/encryptedmedia/MediaKeySessionType.idl
@@ -1196,8 +1194,6 @@
html/canvas/WebGLVertexArrayObject.cpp
html/canvas/WebGLVertexArrayObjectBase.cpp
html/canvas/WebGLVertexArrayObjectOES.cpp
-
- inspector/InspectorShaderProgram.cpp
)
list(APPEND WebCore_IDL_FILES
html/canvas/ANGLEInstancedArrays.idl
Modified: trunk/Source/WebCore/ChangeLog (227664 => 227665)
--- trunk/Source/WebCore/ChangeLog 2018-01-26 05:03:37 UTC (rev 227664)
+++ trunk/Source/WebCore/ChangeLog 2018-01-26 05:08:15 UTC (rev 227665)
@@ -1,3 +1,18 @@
+2018-01-25 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Add InspectorShaderProgram to Unified Sources build
+ https://bugs.webkit.org/show_bug.cgi?id=182084
+
+ Reviewed by Dan Bernstein.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * Sources.txt:
+ Move to Sources.txt always.
+
+ * inspector/InspectorShaderProgram.cpp:
+ Add ENABLE(WEBGL) guard to contents.
+
2018-01-25 Ryosuke Niwa <[email protected]>
Make scrolling to the focused element async
Modified: trunk/Source/WebCore/Sources.txt (227664 => 227665)
--- trunk/Source/WebCore/Sources.txt 2018-01-26 05:03:37 UTC (rev 227664)
+++ trunk/Source/WebCore/Sources.txt 2018-01-26 05:08:15 UTC (rev 227665)
@@ -1155,6 +1155,7 @@
inspector/InspectorInstrumentationCookie.cpp
inspector/InspectorNodeFinder.cpp
inspector/InspectorOverlay.cpp
+inspector/InspectorShaderProgram.cpp
inspector/InspectorStyleSheet.cpp
inspector/InstrumentingAgents.cpp
inspector/NetworkResourcesData.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (227664 => 227665)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-01-26 05:03:37 UTC (rev 227664)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-01-26 05:08:15 UTC (rev 227665)
@@ -1841,7 +1841,6 @@
69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 697101081C6BE1550018C7F1 /* AccessibilitySVGElement.h */; };
6A22E8701F10418600F546C3 /* InspectorCanvas.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A22E86F1F10418600F546C3 /* InspectorCanvas.h */; };
6A72798B1F16C29C003F39B8 /* InspectorShaderProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A7279881F16C29B003F39B8 /* InspectorShaderProgram.h */; };
- 6A72798C1F16C29C003F39B8 /* InspectorShaderProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A7279891F16C29B003F39B8 /* InspectorShaderProgram.cpp */; };
6B3480940EEF50D400AC1B41 /* NativeImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3480920EEF50D400AC1B41 /* NativeImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
6B693A2E1C51A82E00B03BEF /* ResourceLoadObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B693A2D1C51A82E00B03BEF /* ResourceLoadObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
6C4C96DF1AD4483500363F64 /* JSReadableByteStreamController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C4C96DB1AD4483500363F64 /* JSReadableByteStreamController.h */; };
@@ -30769,7 +30768,6 @@
07367DE0172CA68200D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm in Sources */,
BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
- 6A72798C1F16C29C003F39B8 /* InspectorShaderProgram.cpp in Sources */,
A1F6D0111FE099B20018078C /* JSApplePayModifier.cpp in Sources */,
A1F6D0101FE099960018078C /* JSApplePayPaymentMethodType.cpp in Sources */,
A11AE0D21FFD61DF0047348B /* JSMerchantValidationEvent.cpp in Sources */,
Modified: trunk/Source/WebCore/inspector/InspectorShaderProgram.cpp (227664 => 227665)
--- trunk/Source/WebCore/inspector/InspectorShaderProgram.cpp 2018-01-26 05:03:37 UTC (rev 227664)
+++ trunk/Source/WebCore/inspector/InspectorShaderProgram.cpp 2018-01-26 05:08:15 UTC (rev 227665)
@@ -26,6 +26,8 @@
#include "config.h"
#include "InspectorShaderProgram.h"
+#if ENABLE(WEBGL)
+
#include "GraphicsContext3D.h"
#include "GraphicsTypes3D.h"
#include "HTMLCanvasElement.h"
@@ -35,7 +37,6 @@
#include "WebGLShader.h"
#include <inspector/IdentifiersFactory.h>
-
namespace WebCore {
using namespace Inspector;
@@ -73,3 +74,4 @@
} // namespace WebCore
+#endif // ENABLE(WEBGL)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
