Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 884753003: Fix template angle bracket syntax in inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Some more fixes Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 .setDomain(cookie.domain) 605 .setDomain(cookie.domain)
606 .setPath(cookie.path) 606 .setPath(cookie.path)
607 .setExpires(cookie.expires) 607 .setExpires(cookie.expires)
608 .setSize((cookie.name.length() + cookie.value.length())) 608 .setSize((cookie.name.length() + cookie.value.length()))
609 .setHttpOnly(cookie.httpOnly) 609 .setHttpOnly(cookie.httpOnly)
610 .setSecure(cookie.secure) 610 .setSecure(cookie.secure)
611 .setSession(cookie.session) 611 .setSession(cookie.session)
612 .release(); 612 .release();
613 } 613 }
614 614
615 static PassRefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie> > buildArrayForC ookies(ListHashSet<Cookie>& cookiesList) 615 static PassRefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>> buildArrayForCo okies(ListHashSet<Cookie>& cookiesList)
616 { 616 {
617 RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie> > cookies = TypeBuilder ::Array<TypeBuilder::Page::Cookie>::create(); 617 RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie>> cookies = TypeBuilder: :Array<TypeBuilder::Page::Cookie>::create();
618 618
619 ListHashSet<Cookie>::iterator end = cookiesList.end(); 619 ListHashSet<Cookie>::iterator end = cookiesList.end();
620 ListHashSet<Cookie>::iterator it = cookiesList.begin(); 620 ListHashSet<Cookie>::iterator it = cookiesList.begin();
621 for (int i = 0; it != end; ++it, i++) 621 for (int i = 0; it != end; ++it, i++)
622 cookies->addItem(buildObjectForCookie(*it)); 622 cookies->addItem(buildObjectForCookie(*it));
623 623
624 return cookies; 624 return cookies;
625 } 625 }
626 626
627 static void cachedResourcesForDocument(Document* document, Vector<Resource*>& re sult, bool skipXHRs) 627 static void cachedResourcesForDocument(Document* document, Vector<Resource*>& re sult, bool skipXHRs)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 689
690 result.append(urlWithoutFragment(frame->loader().documentLoader()->url())); 690 result.append(urlWithoutFragment(frame->loader().documentLoader()->url()));
691 691
692 Vector<Resource*> allResources = cachedResourcesForFrame(frame, false); 692 Vector<Resource*> allResources = cachedResourcesForFrame(frame, false);
693 for (const auto& resource : allResources) 693 for (const auto& resource : allResources)
694 result.append(urlWithoutFragment(resource->url())); 694 result.append(urlWithoutFragment(resource->url()));
695 695
696 return result; 696 return result;
697 } 697 }
698 698
699 void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<Type Builder::Page::Cookie> >& cookies) 699 void InspectorPageAgent::getCookies(ErrorString*, RefPtr<TypeBuilder::Array<Type Builder::Page::Cookie>>& cookies)
700 { 700 {
701 ListHashSet<Cookie> rawCookiesList; 701 ListHashSet<Cookie> rawCookiesList;
702 702
703 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(m ainFrame())) { 703 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(m ainFrame())) {
704 if (!frame->isLocalFrame()) 704 if (!frame->isLocalFrame())
705 continue; 705 continue;
706 Document* document = toLocalFrame(frame)->document(); 706 Document* document = toLocalFrame(frame)->document();
707 Vector<KURL> allURLs = allResourcesURLsForFrame(toLocalFrame(frame)); 707 Vector<KURL> allURLs = allResourcesURLsForFrame(toLocalFrame(frame));
708 for (const auto& url : allURLs) { 708 for (const auto& url : allURLs) {
709 Vector<Cookie> docCookiesList; 709 Vector<Cookie> docCookiesList;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 String content; 771 String content;
772 bool base64Encoded; 772 bool base64Encoded;
773 if (InspectorPageAgent::cachedResourceContent(cachedResource, result, &b ase64Encoded)) { 773 if (InspectorPageAgent::cachedResourceContent(cachedResource, result, &b ase64Encoded)) {
774 ASSERT(!base64Encoded); 774 ASSERT(!base64Encoded);
775 return true; 775 return true;
776 } 776 }
777 } 777 }
778 return false; 778 return false;
779 } 779 }
780 780
781 void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, c onst String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page:: SearchMatch> >& results) 781 void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, c onst String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page:: SearchMatch>>& results)
782 { 782 {
783 results = TypeBuilder::Array<TypeBuilder::Page::SearchMatch>::create(); 783 results = TypeBuilder::Array<TypeBuilder::Page::SearchMatch>::create();
784 784
785 LocalFrame* frame = frameForId(frameId); 785 LocalFrame* frame = frameForId(frameId);
786 KURL kurl(ParsedURLString, url); 786 KURL kurl(ParsedURLString, url);
787 787
788 FrameLoader* frameLoader = frame ? &frame->loader() : nullptr; 788 FrameLoader* frameLoader = frame ? &frame->loader() : nullptr;
789 DocumentLoader* loader = frameLoader ? frameLoader->documentLoader() : nullp tr; 789 DocumentLoader* loader = frameLoader ? frameLoader->documentLoader() : nullp tr;
790 if (!loader) 790 if (!loader)
791 return; 791 return;
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 name = frame->deprecatedLocalOwner()->getAttribute(HTMLNames::idAttr ); 1281 name = frame->deprecatedLocalOwner()->getAttribute(HTMLNames::idAttr );
1282 frameObject->setName(name); 1282 frameObject->setName(name);
1283 } 1283 }
1284 1284
1285 return frameObject; 1285 return frameObject;
1286 } 1286 }
1287 1287
1288 PassRefPtr<TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObject ForFrameTree(LocalFrame* frame) 1288 PassRefPtr<TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObject ForFrameTree(LocalFrame* frame)
1289 { 1289 {
1290 RefPtr<TypeBuilder::Page::Frame> frameObject = buildObjectForFrame(frame); 1290 RefPtr<TypeBuilder::Page::Frame> frameObject = buildObjectForFrame(frame);
1291 RefPtr<TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree::Resources> > subresources = TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree::Resourc es>::create(); 1291 RefPtr<TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree::Resources>> subresources = TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree::Resource s>::create();
1292 RefPtr<TypeBuilder::Page::FrameResourceTree> result = TypeBuilder::Page::Fra meResourceTree::create() 1292 RefPtr<TypeBuilder::Page::FrameResourceTree> result = TypeBuilder::Page::Fra meResourceTree::create()
1293 .setFrame(frameObject) 1293 .setFrame(frameObject)
1294 .setResources(subresources); 1294 .setResources(subresources);
1295 1295
1296 Vector<Resource*> allResources = cachedResourcesForFrame(frame, true); 1296 Vector<Resource*> allResources = cachedResourcesForFrame(frame, true);
1297 for (Resource* cachedResource : allResources) { 1297 for (Resource* cachedResource : allResources) {
1298 RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create() 1298 RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create()
1299 .setUrl(urlWithoutFragment(cachedResource->url()).string()) 1299 .setUrl(urlWithoutFragment(cachedResource->url()).string())
1300 .setType(cachedResourceTypeJson(*cachedResource)) 1300 .setType(cachedResourceTypeJson(*cachedResource))
1301 .setMimeType(cachedResource->response().mimeType()); 1301 .setMimeType(cachedResource->response().mimeType());
1302 if (cachedResource->wasCanceled()) 1302 if (cachedResource->wasCanceled())
1303 resourceObject->setCanceled(true); 1303 resourceObject->setCanceled(true);
1304 else if (cachedResource->status() == Resource::LoadError) 1304 else if (cachedResource->status() == Resource::LoadError)
1305 resourceObject->setFailed(true); 1305 resourceObject->setFailed(true);
1306 subresources->addItem(resourceObject); 1306 subresources->addItem(resourceObject);
1307 } 1307 }
1308 1308
1309 Vector<Document*> allImports = InspectorPageAgent::importsForFrame(frame); 1309 Vector<Document*> allImports = InspectorPageAgent::importsForFrame(frame);
1310 for (Document* import : allImports) { 1310 for (Document* import : allImports) {
1311 RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create() 1311 RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create()
1312 .setUrl(urlWithoutFragment(import->url()).string()) 1312 .setUrl(urlWithoutFragment(import->url()).string())
1313 .setType(resourceTypeJson(InspectorPageAgent::DocumentResource)) 1313 .setType(resourceTypeJson(InspectorPageAgent::DocumentResource))
1314 .setMimeType(import->suggestedMIMEType()); 1314 .setMimeType(import->suggestedMIMEType());
1315 subresources->addItem(resourceObject); 1315 subresources->addItem(resourceObject);
1316 } 1316 }
1317 1317
1318 RefPtr<TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree> > childrenAr ray; 1318 RefPtr<TypeBuilder::Array<TypeBuilder::Page::FrameResourceTree>> childrenArr ay;
1319 for (Frame* child = frame->tree().firstChild(); child; child = child->tree() .nextSibling()) { 1319 for (Frame* child = frame->tree().firstChild(); child; child = child->tree() .nextSibling()) {
1320 if (!child->isLocalFrame()) 1320 if (!child->isLocalFrame())
1321 continue; 1321 continue;
1322 if (!childrenArray) { 1322 if (!childrenArray) {
1323 childrenArray = TypeBuilder::Array<TypeBuilder::Page::FrameResourceT ree>::create(); 1323 childrenArray = TypeBuilder::Array<TypeBuilder::Page::FrameResourceT ree>::create();
1324 result->setChildFrames(childrenArray); 1324 result->setChildFrames(childrenArray);
1325 } 1325 }
1326 childrenArray->addItem(buildObjectForFrameTree(toLocalFrame(child))); 1326 childrenArray->addItem(buildObjectForFrameTree(toLocalFrame(child)));
1327 } 1327 }
1328 return result; 1328 return result;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 void InspectorPageAgent::trace(Visitor* visitor) 1506 void InspectorPageAgent::trace(Visitor* visitor)
1507 { 1507 {
1508 visitor->trace(m_page); 1508 visitor->trace(m_page);
1509 visitor->trace(m_injectedScriptManager); 1509 visitor->trace(m_injectedScriptManager);
1510 visitor->trace(m_inspectorResourceContentLoader); 1510 visitor->trace(m_inspectorResourceContentLoader);
1511 InspectorBaseAgent::trace(visitor); 1511 InspectorBaseAgent::trace(visitor);
1512 } 1512 }
1513 1513
1514 } // namespace blink 1514 } // namespace blink
1515 1515
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.h ('k') | Source/core/inspector/InspectorResourceAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698