Title: [222769] trunk/Source/WebCore
- Revision
- 222769
- Author
- [email protected]
- Date
- 2017-10-02 22:31:19 -0700 (Mon, 02 Oct 2017)
Log Message
Web Inspector: Rename methods ending in *Json() as *JSON()
https://bugs.webkit.org/show_bug.cgi?id=177793
Patch by Joseph Pecoraro <[email protected]> on 2017-10-02
Reviewed by Matt Baker.
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::buildObjectForCachedResource):
(WebCore::InspectorNetworkAgent::willSendRequest):
(WebCore::InspectorNetworkAgent::didReceiveResponse):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::resourceTypeJSON):
(WebCore::InspectorPageAgent::cachedResourceTypeJSON):
(WebCore::InspectorPageAgent::buildObjectForFrameTree):
(WebCore::InspectorPageAgent::resourceTypeJson): Deleted.
(WebCore::InspectorPageAgent::cachedResourceTypeJson): Deleted.
* inspector/InspectorPageAgent.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222768 => 222769)
--- trunk/Source/WebCore/ChangeLog 2017-10-03 05:10:29 UTC (rev 222768)
+++ trunk/Source/WebCore/ChangeLog 2017-10-03 05:31:19 UTC (rev 222769)
@@ -1,3 +1,22 @@
+2017-10-02 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Rename methods ending in *Json() as *JSON()
+ https://bugs.webkit.org/show_bug.cgi?id=177793
+
+ Reviewed by Matt Baker.
+
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::buildObjectForCachedResource):
+ (WebCore::InspectorNetworkAgent::willSendRequest):
+ (WebCore::InspectorNetworkAgent::didReceiveResponse):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::resourceTypeJSON):
+ (WebCore::InspectorPageAgent::cachedResourceTypeJSON):
+ (WebCore::InspectorPageAgent::buildObjectForFrameTree):
+ (WebCore::InspectorPageAgent::resourceTypeJson): Deleted.
+ (WebCore::InspectorPageAgent::cachedResourceTypeJson): Deleted.
+ * inspector/InspectorPageAgent.h:
+
2017-10-02 Wenson Hsieh <[email protected]>
REGRESSION(r222595): Intermittent crash while accessing DataTransferItemList
Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (222768 => 222769)
--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-10-03 05:10:29 UTC (rev 222768)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-10-03 05:31:19 UTC (rev 222769)
@@ -307,7 +307,7 @@
{
auto resourceObject = Inspector::Protocol::Network::CachedResource::create()
.setUrl(cachedResource->url())
- .setType(InspectorPageAgent::cachedResourceTypeJson(*cachedResource))
+ .setType(InspectorPageAgent::cachedResourceTypeJSON(*cachedResource))
.setBodySize(cachedResource->encodedSize())
.release();
@@ -365,7 +365,7 @@
for (auto& entry : m_extraRequestHeaders)
request.setHTTPHeaderField(entry.key, entry.value);
- Inspector::Protocol::Page::ResourceType protocolResourceType = InspectorPageAgent::resourceTypeJson(type);
+ auto protocolResourceType = InspectorPageAgent::resourceTypeJSON(type);
RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = buildInitiatorObject(loader.frame() ? loader.frame()->document() : nullptr);
String targetId = request.initiatorIdentifier();
@@ -438,7 +438,7 @@
m_resourcesData->responseReceived(requestId, m_pageAgent->frameId(loader.frame()), response);
m_resourcesData->setResourceType(requestId, type);
- m_frontendDispatcher->responseReceived(requestId, m_pageAgent->frameId(loader.frame()), m_pageAgent->loaderId(&loader), timestamp(), InspectorPageAgent::resourceTypeJson(type), resourceResponse);
+ m_frontendDispatcher->responseReceived(requestId, m_pageAgent->frameId(loader.frame()), m_pageAgent->loaderId(&loader), timestamp(), InspectorPageAgent::resourceTypeJSON(type), resourceResponse);
// If we revalidated the resource and got Not modified, send content length following didReceiveResponse
// as there will be no calls to didReceiveData from the network stack.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (222768 => 222769)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-10-03 05:10:29 UTC (rev 222768)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2017-10-03 05:31:19 UTC (rev 222769)
@@ -246,7 +246,7 @@
return cachedResource;
}
-Inspector::Protocol::Page::ResourceType InspectorPageAgent::resourceTypeJson(InspectorPageAgent::ResourceType resourceType)
+Inspector::Protocol::Page::ResourceType InspectorPageAgent::resourceTypeJSON(InspectorPageAgent::ResourceType resourceType)
{
switch (resourceType) {
case DocumentResource:
@@ -320,9 +320,9 @@
return inspectorResourceType(cachedResource.type());
}
-Inspector::Protocol::Page::ResourceType InspectorPageAgent::cachedResourceTypeJson(const CachedResource& cachedResource)
+Inspector::Protocol::Page::ResourceType InspectorPageAgent::cachedResourceTypeJSON(const CachedResource& cachedResource)
{
- return resourceTypeJson(inspectorResourceType(cachedResource));
+ return resourceTypeJSON(inspectorResourceType(cachedResource));
}
RefPtr<TextResourceDecoder> InspectorPageAgent::createTextDecoder(const String& mimeType, const String& textEncodingName)
@@ -849,7 +849,7 @@
for (auto* cachedResource : cachedResourcesForFrame(frame)) {
auto resourceObject = Inspector::Protocol::Page::FrameResource::create()
.setUrl(cachedResource->url())
- .setType(cachedResourceTypeJson(*cachedResource))
+ .setType(cachedResourceTypeJSON(*cachedResource))
.setMimeType(cachedResource->response().mimeType())
.release();
if (cachedResource->wasCanceled())
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (222768 => 222769)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2017-10-03 05:10:29 UTC (rev 222768)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2017-10-03 05:31:19 UTC (rev 222769)
@@ -85,10 +85,10 @@
static String sourceMapURLForResource(CachedResource*);
static CachedResource* cachedResource(Frame*, const URL&);
- static Inspector::Protocol::Page::ResourceType resourceTypeJson(ResourceType);
+ static Inspector::Protocol::Page::ResourceType resourceTypeJSON(ResourceType);
static ResourceType inspectorResourceType(CachedResource::Type);
static ResourceType inspectorResourceType(const CachedResource&);
- static Inspector::Protocol::Page::ResourceType cachedResourceTypeJson(const CachedResource&);
+ static Inspector::Protocol::Page::ResourceType cachedResourceTypeJSON(const CachedResource&);
static RefPtr<TextResourceDecoder> createTextDecoder(const String& mimeType, const String& textEncodingName);
// Page API for InspectorFrontend
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
