OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010-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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
642 if (ic) { | 642 if (ic) { |
643 GraphicsContextBuilder builder(canvas); | 643 GraphicsContextBuilder builder(canvas); |
644 GraphicsContext& context = builder.context(); | 644 GraphicsContext& context = builder.context(); |
645 context.platformContext()->setDrawingToImageBuffer(true); | 645 context.platformContext()->setDrawingToImageBuffer(true); |
646 ic->drawHighlight(context); | 646 ic->drawHighlight(context); |
647 } | 647 } |
648 } | 648 } |
649 | 649 |
650 WebVector<WebMemoryUsageInfo> WebDevToolsAgentImpl::processMemoryDistribution()
const | 650 WebVector<WebMemoryUsageInfo> WebDevToolsAgentImpl::processMemoryDistribution()
const |
651 { | 651 { |
652 HashMap<String, size_t> memoryInfo = m_webViewImpl->page()->inspectorControl
ler()->processMemoryDistribution(); | 652 HashMap<String, size_t> memoryInfo; // = m_webViewImpl->page()->inspectorCon
troller()->processMemoryDistribution(); |
653 WebVector<WebMemoryUsageInfo> memoryInfoVector((size_t)memoryInfo.size()); | 653 WebVector<WebMemoryUsageInfo> memoryInfoVector((size_t)memoryInfo.size()); |
654 size_t i = 0; | 654 size_t i = 0; |
655 for (HashMap<String, size_t>::const_iterator it = memoryInfo.begin(); it !=
memoryInfo.end(); ++it) | 655 for (HashMap<String, size_t>::const_iterator it = memoryInfo.begin(); it !=
memoryInfo.end(); ++it) |
656 memoryInfoVector[i++] = WebMemoryUsageInfo(it->key, it->value); | 656 memoryInfoVector[i++] = WebMemoryUsageInfo(it->key, it->value); |
657 return memoryInfoVector; | 657 return memoryInfoVector; |
658 } | 658 } |
659 | 659 |
660 void WebDevToolsAgentImpl::highlight() | 660 void WebDevToolsAgentImpl::highlight() |
661 { | 661 { |
662 m_webViewImpl->addPageOverlay(this, OverlayZOrders::highlight); | 662 m_webViewImpl->addPageOverlay(this, OverlayZOrders::highlight); |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 resultObject->setString("data", hintData); | 837 resultObject->setString("data", hintData); |
838 break; | 838 break; |
839 case BrowserDataHintNone: | 839 case BrowserDataHintNone: |
840 default: | 840 default: |
841 ASSERT_NOT_REACHED(); | 841 ASSERT_NOT_REACHED(); |
842 } | 842 } |
843 return messageObject->toJSONString(); | 843 return messageObject->toJSONString(); |
844 } | 844 } |
845 | 845 |
846 } // namespace WebKit | 846 } // namespace WebKit |
OLD | NEW |