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

Side by Side Diff: WebCore/inspector/InspectorController.cpp

Issue 3441018: Merge 67709 - 2010-09-17 Pavel Feldman <pfeldman@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 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
« no previous file with comments | « WebCore/inspector/InspectorController.h ('k') | WebCore/inspector/InspectorResource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 } 996 }
997 } 997 }
998 998
999 resource->startTiming(); 999 resource->startTiming();
1000 resource->updateRequest(request); 1000 resource->updateRequest(request);
1001 1001
1002 if (resource != m_mainResource && m_frontend) 1002 if (resource != m_mainResource && m_frontend)
1003 resource->updateScriptObject(m_frontend.get()); 1003 resource->updateScriptObject(m_frontend.get());
1004 } 1004 }
1005 1005
1006 void InspectorController::markResourceAsCached(unsigned long identifier)
1007 {
1008 if (!enabled())
1009 return;
1010
1011 if (RefPtr<InspectorResource> resource = getTrackedResource(identifier))
1012 resource->markAsCached();
1013 }
1014
1006 void InspectorController::didReceiveResponse(unsigned long identifier, const Res ourceResponse& response) 1015 void InspectorController::didReceiveResponse(unsigned long identifier, const Res ourceResponse& response)
1007 { 1016 {
1008 if (!enabled()) 1017 if (!enabled())
1009 return; 1018 return;
1010 1019
1011 if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) { 1020 if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
1012 resource->updateResponse(response); 1021 resource->updateResponse(response);
1013 1022
1014 if (resource != m_mainResource && m_frontend) 1023 if (resource != m_mainResource && m_frontend)
1015 resource->updateScriptObject(m_frontend.get()); 1024 resource->updateScriptObject(m_frontend.get());
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1917 void InspectorController::didModifyDOMAttrImpl(Element* element) 1926 void InspectorController::didModifyDOMAttrImpl(Element* element)
1918 { 1927 {
1919 if (m_domAgent) 1928 if (m_domAgent)
1920 m_domAgent->didModifyDOMAttr(element); 1929 m_domAgent->didModifyDOMAttr(element);
1921 } 1930 }
1922 1931
1923 1932
1924 } // namespace WebCore 1933 } // namespace WebCore
1925 1934
1926 #endif // ENABLE(INSPECTOR) 1935 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « WebCore/inspector/InspectorController.h ('k') | WebCore/inspector/InspectorResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698