Commit 3b9c81e5 authored by esprehn's avatar esprehn Committed by Commit bot

Move blink platform's JSON code into a directory.

You get an owner, and you get an owner, everyone has an owner! :D

BUG=642096

Review-Url: https://codereview.chromium.org/2293493003
Cr-Commit-Position: refs/heads/master@{#415210}
parent a3230092
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define JSONValuesForV8_h #define JSONValuesForV8_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
#include <v8.h> #include <v8.h>
......
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
#include "core/svg/SVGSVGElement.h" #include "core/svg/SVGSVGElement.h"
#include "platform/Histogram.h" #include "platform/Histogram.h"
#include "platform/HostWindow.h" #include "platform/HostWindow.h"
#include "platform/JSONValues.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "platform/ScriptForbiddenScope.h" #include "platform/ScriptForbiddenScope.h"
#include "platform/TraceEvent.h" #include "platform/TraceEvent.h"
...@@ -108,6 +107,7 @@ ...@@ -108,6 +107,7 @@
#include "platform/graphics/paint/CullRect.h" #include "platform/graphics/paint/CullRect.h"
#include "platform/graphics/paint/PaintController.h" #include "platform/graphics/paint/PaintController.h"
#include "platform/graphics/paint/ScopedPaintChunkProperties.h" #include "platform/graphics/paint/ScopedPaintChunkProperties.h"
#include "platform/json/JSONValues.h"
#include "platform/scheduler/CancellableTaskFactory.h" #include "platform/scheduler/CancellableTaskFactory.h"
#include "platform/scroll/ScrollAnimatorBase.h" #include "platform/scroll/ScrollAnimatorBase.h"
#include "platform/scroll/ScrollbarTheme.h" #include "platform/scroll/ScrollbarTheme.h"
......
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
#include "core/paint/TransformRecorder.h" #include "core/paint/TransformRecorder.h"
#include "core/svg/SVGDocumentExtensions.h" #include "core/svg/SVGDocumentExtensions.h"
#include "platform/DragImage.h" #include "platform/DragImage.h"
#include "platform/JSONValues.h"
#include "platform/PluginScriptForbiddenScope.h" #include "platform/PluginScriptForbiddenScope.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "platform/ScriptForbiddenScope.h" #include "platform/ScriptForbiddenScope.h"
...@@ -79,6 +78,7 @@ ...@@ -79,6 +78,7 @@
#include "platform/graphics/paint/PaintController.h" #include "platform/graphics/paint/PaintController.h"
#include "platform/graphics/paint/SkPictureBuilder.h" #include "platform/graphics/paint/SkPictureBuilder.h"
#include "platform/graphics/paint/TransformDisplayItem.h" #include "platform/graphics/paint/TransformDisplayItem.h"
#include "platform/json/JSONValues.h"
#include "platform/plugins/PluginData.h" #include "platform/plugins/PluginData.h"
#include "platform/text/TextStream.h" #include "platform/text/TextStream.h"
#include "public/platform/InterfaceProvider.h" #include "public/platform/InterfaceProvider.h"
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
#include "core/loader/DocumentLoader.h" #include "core/loader/DocumentLoader.h"
#include "core/loader/FrameLoaderClient.h" #include "core/loader/FrameLoaderClient.h"
#include "core/loader/PingLoader.h" #include "core/loader/PingLoader.h"
#include "platform/JSONValues.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "platform/json/JSONValues.h"
#include "platform/network/ContentSecurityPolicyParsers.h" #include "platform/network/ContentSecurityPolicyParsers.h"
#include "platform/network/ContentSecurityPolicyResponseHeaders.h" #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
#include "platform/network/EncodedFormData.h" #include "platform/network/EncodedFormData.h"
......
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
#include "core/html/parser/HTMLParserIdioms.h" #include "core/html/parser/HTMLParserIdioms.h"
#include "core/inspector/ConsoleMessage.h" #include "core/inspector/ConsoleMessage.h"
#include "core/layout/LayoutTheme.h" #include "core/layout/LayoutTheme.h"
#include "platform/JSONValues.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "platform/json/JSONValues.h"
#include "platform/text/PlatformLocale.h" #include "platform/text/PlatformLocale.h"
#include "platform/text/TextBreakIterator.h" #include "platform/text/TextBreakIterator.h"
#include "wtf/PtrUtil.h" #include "wtf/PtrUtil.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "core/loader/FrameLoaderClient.h" #include "core/loader/FrameLoaderClient.h"
#include "core/loader/NavigationScheduler.h" #include "core/loader/NavigationScheduler.h"
#include "core/loader/PingLoader.h" #include "core/loader/PingLoader.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "platform/network/EncodedFormData.h" #include "platform/network/EncodedFormData.h"
#include "platform/weborigin/SecurityOrigin.h" #include "platform/weborigin/SecurityOrigin.h"
#include "wtf/text/StringBuilder.h" #include "wtf/text/StringBuilder.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "core/layout/LayoutTestHelper.h" #include "core/layout/LayoutTestHelper.h"
#include "core/layout/LayoutView.h" #include "core/layout/LayoutView.h"
#include "core/layout/api/LayoutAPIShim.h" #include "core/layout/api/LayoutAPIShim.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace blink { namespace blink {
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include "core/paint/ObjectPaintInvalidator.h" #include "core/paint/ObjectPaintInvalidator.h"
#include "core/paint/TransformRecorder.h" #include "core/paint/TransformRecorder.h"
#include "platform/Histogram.h" #include "platform/Histogram.h"
#include "platform/JSONValues.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "platform/ScriptForbiddenScope.h" #include "platform/ScriptForbiddenScope.h"
#include "platform/TraceEvent.h" #include "platform/TraceEvent.h"
...@@ -68,6 +67,7 @@ ...@@ -68,6 +67,7 @@
#include "platform/graphics/paint/PaintController.h" #include "platform/graphics/paint/PaintController.h"
#include "platform/graphics/paint/SkPictureBuilder.h" #include "platform/graphics/paint/SkPictureBuilder.h"
#include "platform/graphics/paint/TransformDisplayItem.h" #include "platform/graphics/paint/TransformDisplayItem.h"
#include "platform/json/JSONValues.h"
namespace blink { namespace blink {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "core/paint/ObjectPaintInvalidator.h" #include "core/paint/ObjectPaintInvalidator.h"
#include "core/layout/LayoutTestHelper.h" #include "core/layout/LayoutTestHelper.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace blink { namespace blink {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "core/svg/SVGParsingError.h" #include "core/svg/SVGParsingError.h"
#include "core/dom/QualifiedName.h" #include "core/dom/QualifiedName.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "wtf/text/CharacterNames.h" #include "wtf/text/CharacterNames.h"
#include "wtf/text/StringBuilder.h" #include "wtf/text/StringBuilder.h"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "modules/crypto/CryptoKey.h" #include "modules/crypto/CryptoKey.h"
#include "modules/crypto/CryptoResultImpl.h" #include "modules/crypto/CryptoResultImpl.h"
#include "modules/crypto/NormalizeAlgorithm.h" #include "modules/crypto/NormalizeAlgorithm.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebCrypto.h" #include "public/platform/WebCrypto.h"
#include "public/platform/WebCryptoAlgorithm.h" #include "public/platform/WebCryptoAlgorithm.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "core/inspector/DevToolsHost.h" #include "core/inspector/DevToolsHost.h"
#include "core/page/Page.h" #include "core/page/Page.h"
#include "modules/filesystem/DOMFileSystem.h" #include "modules/filesystem/DOMFileSystem.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
namespace blink { namespace blink {
......
...@@ -42,10 +42,6 @@ ...@@ -42,10 +42,6 @@
'Histogram.cpp', 'Histogram.cpp',
'Histogram.h', 'Histogram.h',
'HostWindow.h', 'HostWindow.h',
'JSONParser.cpp',
'JSONParser.h',
'JSONValues.cpp',
'JSONValues.h',
'KeyboardCodes.h', 'KeyboardCodes.h',
'KillRing.h', 'KillRing.h',
'KillRingNone.cpp', 'KillRingNone.cpp',
...@@ -848,6 +844,10 @@ ...@@ -848,6 +844,10 @@
'image-encoders/PNGImageEncoder.h', 'image-encoders/PNGImageEncoder.h',
'image-encoders/WEBPImageEncoder.cpp', 'image-encoders/WEBPImageEncoder.cpp',
'image-encoders/WEBPImageEncoder.h', 'image-encoders/WEBPImageEncoder.h',
'json/JSONParser.cpp',
'json/JSONParser.h',
'json/JSONValues.cpp',
'json/JSONValues.h',
'mac/BlockExceptions.h', 'mac/BlockExceptions.h',
'mac/BlockExceptions.mm', 'mac/BlockExceptions.mm',
'mac/ColorMac.h', 'mac/ColorMac.h',
...@@ -1223,7 +1223,6 @@ ...@@ -1223,7 +1223,6 @@
'LayoutLocaleTest.cpp', 'LayoutLocaleTest.cpp',
'LayoutUnitTest.cpp', 'LayoutUnitTest.cpp',
'LifecycleContextTest.cpp', 'LifecycleContextTest.cpp',
'JSONParserTest.cpp',
'PODArenaTest.cpp', 'PODArenaTest.cpp',
'PODFreeListArenaTest.cpp', 'PODFreeListArenaTest.cpp',
'PODIntervalTreeTest.cpp', 'PODIntervalTreeTest.cpp',
...@@ -1307,6 +1306,7 @@ ...@@ -1307,6 +1306,7 @@
'image-decoders/jpeg/JPEGImageDecoderTest.cpp', 'image-decoders/jpeg/JPEGImageDecoderTest.cpp',
'image-decoders/webp/WEBPImageDecoderTest.cpp', 'image-decoders/webp/WEBPImageDecoderTest.cpp',
'image-decoders/ico/ICOImageDecoderTest.cpp', 'image-decoders/ico/ICOImageDecoderTest.cpp',
'json/JSONParserTest.cpp',
'mac/VersionUtilMacTest.mm', 'mac/VersionUtilMacTest.mm',
'mojo/KURLSecurityOriginTest.cpp', 'mojo/KURLSecurityOriginTest.cpp',
'network/EncodedFormDataTest.cpp', 'network/EncodedFormDataTest.cpp',
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "base/trace_event/trace_event_argument.h" #include "base/trace_event/trace_event_argument.h"
#include "cc/layers/layer.h" #include "cc/layers/layer.h"
#include "platform/DragImage.h" #include "platform/DragImage.h"
#include "platform/JSONValues.h"
#include "platform/TraceEvent.h" #include "platform/TraceEvent.h"
#include "platform/geometry/FloatRect.h" #include "platform/geometry/FloatRect.h"
#include "platform/geometry/LayoutRect.h" #include "platform/geometry/LayoutRect.h"
...@@ -44,6 +43,7 @@ ...@@ -44,6 +43,7 @@
#include "platform/graphics/filters/SkiaImageFilterBuilder.h" #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
#include "platform/graphics/paint/DrawingRecorder.h" #include "platform/graphics/paint/DrawingRecorder.h"
#include "platform/graphics/paint/PaintController.h" #include "platform/graphics/paint/PaintController.h"
#include "platform/json/JSONValues.h"
#include "platform/scroll/ScrollableArea.h" #include "platform/scroll/ScrollableArea.h"
#include "platform/text/TextStream.h" #include "platform/text/TextStream.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#ifndef LoggingCanvas_h #ifndef LoggingCanvas_h
#define LoggingCanvas_h #define LoggingCanvas_h
#include "platform/JSONValues.h"
#include "platform/graphics/InterceptingCanvas.h" #include "platform/graphics/InterceptingCanvas.h"
#include "platform/json/JSONValues.h"
#include <memory> #include <memory>
namespace blink { namespace blink {
......
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#ifndef PictureSnapshot_h #ifndef PictureSnapshot_h
#define PictureSnapshot_h #define PictureSnapshot_h
#include "platform/JSONValues.h"
#include "platform/PlatformExport.h" #include "platform/PlatformExport.h"
#include "platform/graphics/GraphicsContext.h" #include "platform/graphics/GraphicsContext.h"
#include "platform/json/JSONValues.h"
#include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkPicture.h"
#include "third_party/skia/include/core/SkPictureRecorder.h" #include "third_party/skia/include/core/SkPictureRecorder.h"
#include "wtf/RefCounted.h" #include "wtf/RefCounted.h"
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "platform/JSONParser.h" #include "platform/json/JSONParser.h"
#include "platform/Decimal.h" #include "platform/Decimal.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "wtf/text/StringBuilder.h" #include "wtf/text/StringBuilder.h"
#include "wtf/text/StringToNumber.h" #include "wtf/text/StringToNumber.h"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "platform/JSONParser.h" #include "platform/json/JSONParser.h"
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "wtf/text/StringBuilder.h" #include "wtf/text/StringBuilder.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "platform/JSONValues.h" #include "platform/json/JSONValues.h"
#include "platform/Decimal.h" #include "platform/Decimal.h"
#include "wtf/MathExtras.h" #include "wtf/MathExtras.h"
......
esprehn@chromium.org
pfeldman@chromium.org
iclelland@chromium.org
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment