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

Side by Side Diff: Source/WebCore/inspector/InspectorInstrumentation.cpp

Issue 11413088: Merge 134577 - Web Inspector: highlight is not updating as one edits CSS properties (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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 | « no previous file | Source/WebCore/inspector/InspectorPageAgent.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) 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 550
551 void InspectorInstrumentation::didRecalculateStyleImpl(const InspectorInstrument ationCookie& cookie) 551 void InspectorInstrumentation::didRecalculateStyleImpl(const InspectorInstrument ationCookie& cookie)
552 { 552 {
553 if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie)) 553 if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
554 timelineAgent->didRecalculateStyle(); 554 timelineAgent->didRecalculateStyle();
555 InstrumentingAgents* instrumentingAgents = cookie.first; 555 InstrumentingAgents* instrumentingAgents = cookie.first;
556 if (!instrumentingAgents) 556 if (!instrumentingAgents)
557 return; 557 return;
558 if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorRe sourceAgent()) 558 if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorRe sourceAgent())
559 resourceAgent->didRecalculateStyle(); 559 resourceAgent->didRecalculateStyle();
560 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( ))
561 pageAgent->didRecalculateStyle();
560 } 562 }
561 563
562 void InspectorInstrumentation::didScheduleStyleRecalculationImpl(InstrumentingAg ents* instrumentingAgents, Document* document) 564 void InspectorInstrumentation::didScheduleStyleRecalculationImpl(InstrumentingAg ents* instrumentingAgents, Document* document)
563 { 565 {
564 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent()) 566 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent())
565 timelineAgent->didScheduleStyleRecalculation(document->frame()); 567 timelineAgent->didScheduleStyleRecalculation(document->frame());
566 if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorRe sourceAgent()) 568 if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorRe sourceAgent())
567 resourceAgent->didScheduleStyleRecalculation(document); 569 resourceAgent->didScheduleStyleRecalculation(document);
568 } 570 }
569 571
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 DeviceOrientationData* InspectorInstrumentation::overrideDeviceOrientationImpl(I nstrumentingAgents* instrumentingAgents, DeviceOrientationData* deviceOrientatio n) 1285 DeviceOrientationData* InspectorInstrumentation::overrideDeviceOrientationImpl(I nstrumentingAgents* instrumentingAgents, DeviceOrientationData* deviceOrientatio n)
1284 { 1286 {
1285 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( )) 1287 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( ))
1286 deviceOrientation = pageAgent->overrideDeviceOrientation(deviceOrientati on); 1288 deviceOrientation = pageAgent->overrideDeviceOrientation(deviceOrientati on);
1287 return deviceOrientation; 1289 return deviceOrientation;
1288 } 1290 }
1289 1291
1290 } // namespace WebCore 1292 } // namespace WebCore
1291 1293
1292 #endif // !ENABLE(INSPECTOR) 1294 #endif // !ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorPageAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698