Webkit merge from 44668 to 44682.

webkit/webkit.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
@@ skipping 1821 matching lines @@
         '../third_party/WebKit/WebCore/inspector/ConsoleMessage.cpp',
         '../third_party/WebKit/WebCore/inspector/ConsoleMessage.h',
         '../third_party/WebKit/WebCore/inspector/InspectorController.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorController.h',
         '../third_party/WebKit/WebCore/inspector/InspectorDatabaseResource.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorDatabaseResource.h',
         '../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.h',
         '../third_party/WebKit/WebCore/inspector/InspectorFrontend.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorFrontend.h',
+        '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.cpp',
+        '../third_party/WebKit/WebCore/inspector/InspectorJSONObject.h',
         '../third_party/WebKit/WebCore/inspector/InspectorResource.cpp',
         '../third_party/WebKit/WebCore/inspector/InspectorResource.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.cpp',
         '../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptDebugListener.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptDebugServer.cpp',
         '../third_party/WebKit/WebCore/inspector/JavaScriptDebugServer.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfile.cpp',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfile.h',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.cpp',
         '../third_party/WebKit/WebCore/inspector/JavaScriptProfileNode.h',
-        '../third_party/WebKit/WebCore/inspector/JSONObject.cpp',
-        '../third_party/WebKit/WebCore/inspector/JSONObject.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCache.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheGroup.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheGroup.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheResource.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheResource.h',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheStorage.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/ApplicationCacheStorage.h',
         '../third_party/WebKit/WebCore/loader/appcache/DOMApplicationCache.cpp',
         '../third_party/WebKit/WebCore/loader/appcache/DOMApplicationCache.h',
@@ skipping 2990 matching lines @@
             '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputPreviousIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningMediumIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningsErrors.png',
           ],
         },
       ],
     },
   ],
 }