| OLD | NEW |
| 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 | 281 |
| 282 void InspectorController::evaluateForTestInFrontend(long callId, const String& s
cript) | 282 void InspectorController::evaluateForTestInFrontend(long callId, const String& s
cript) |
| 283 { | 283 { |
| 284 m_isUnderTest = true; | 284 m_isUnderTest = true; |
| 285 if (InspectorInspectorAgent* inspectorAgent = m_instrumentingAgents->inspect
orInspectorAgent()) | 285 if (InspectorInspectorAgent* inspectorAgent = m_instrumentingAgents->inspect
orInspectorAgent()) |
| 286 inspectorAgent->evaluateForTestInFrontend(callId, script); | 286 inspectorAgent->evaluateForTestInFrontend(callId, script); |
| 287 } | 287 } |
| 288 | 288 |
| 289 void InspectorController::drawHighlight(GraphicsContext& context) const | 289 void InspectorController::drawHighlight(GraphicsContext& context) const |
| 290 { | 290 { |
| 291 // https://code.google.com/p/chromium/issues/detail?id=343757 | |
| 292 DisableCompositingQueryAsserts disabler; | |
| 293 m_overlay->paint(context); | 291 m_overlay->paint(context); |
| 294 } | 292 } |
| 295 | 293 |
| 296 void InspectorController::getHighlight(Highlight* highlight) const | 294 void InspectorController::getHighlight(Highlight* highlight) const |
| 297 { | 295 { |
| 298 m_overlay->getHighlight(highlight); | 296 m_overlay->getHighlight(highlight); |
| 299 } | 297 } |
| 300 | 298 |
| 301 void InspectorController::inspect(Node* node) | 299 void InspectorController::inspect(Node* node) |
| 302 { | 300 { |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 timelineAgent->processGPUEvent(InspectorTimelineAgent::GPUEvent(timestam
p, phase, foreign, usedGPUMemoryBytes)); | 463 timelineAgent->processGPUEvent(InspectorTimelineAgent::GPUEvent(timestam
p, phase, foreign, usedGPUMemoryBytes)); |
| 466 } | 464 } |
| 467 | 465 |
| 468 void InspectorController::scriptsEnabled(bool enabled) | 466 void InspectorController::scriptsEnabled(bool enabled) |
| 469 { | 467 { |
| 470 if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgen
t()) | 468 if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgen
t()) |
| 471 pageAgent->scriptsEnabled(enabled); | 469 pageAgent->scriptsEnabled(enabled); |
| 472 } | 470 } |
| 473 | 471 |
| 474 } // namespace WebCore | 472 } // namespace WebCore |
| OLD | NEW |