OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
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 are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "modules/gamepad/NavigatorGamepad.h" | 61 #include "modules/gamepad/NavigatorGamepad.h" |
62 #include "modules/mediasession/MediaSession.h" | 62 #include "modules/mediasession/MediaSession.h" |
63 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 63 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
64 #include "modules/storage/DOMWindowStorageController.h" | 64 #include "modules/storage/DOMWindowStorageController.h" |
65 #include "modules/vr/NavigatorVRDevice.h" | 65 #include "modules/vr/NavigatorVRDevice.h" |
66 #include "platform/MIMETypeRegistry.h" | 66 #include "platform/MIMETypeRegistry.h" |
67 #include "platform/RuntimeEnabledFeatures.h" | 67 #include "platform/RuntimeEnabledFeatures.h" |
68 #include "platform/UserGestureIndicator.h" | 68 #include "platform/UserGestureIndicator.h" |
69 #include "platform/exported/WrappedResourceRequest.h" | 69 #include "platform/exported/WrappedResourceRequest.h" |
70 #include "platform/exported/WrappedResourceResponse.h" | 70 #include "platform/exported/WrappedResourceResponse.h" |
| 71 #include "platform/fonts/GlyphPageTreeNode.h" |
71 #include "platform/network/HTTPParsers.h" | 72 #include "platform/network/HTTPParsers.h" |
72 #include "platform/plugins/PluginData.h" | 73 #include "platform/plugins/PluginData.h" |
73 #include "public/platform/Platform.h" | 74 #include "public/platform/Platform.h" |
74 #include "public/platform/WebApplicationCacheHost.h" | 75 #include "public/platform/WebApplicationCacheHost.h" |
75 #include "public/platform/WebMimeRegistry.h" | 76 #include "public/platform/WebMimeRegistry.h" |
76 #include "public/platform/WebRTCPeerConnectionHandler.h" | 77 #include "public/platform/WebRTCPeerConnectionHandler.h" |
77 #include "public/platform/WebSecurityOrigin.h" | 78 #include "public/platform/WebSecurityOrigin.h" |
78 #include "public/platform/WebURL.h" | 79 #include "public/platform/WebURL.h" |
79 #include "public/platform/WebURLError.h" | 80 #include "public/platform/WebURLError.h" |
80 #include "public/platform/WebVector.h" | 81 #include "public/platform/WebVector.h" |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 | 456 |
456 void FrameLoaderClientImpl::dispatchDidChangeIcons(IconType type) | 457 void FrameLoaderClientImpl::dispatchDidChangeIcons(IconType type) |
457 { | 458 { |
458 if (m_webFrame->client()) | 459 if (m_webFrame->client()) |
459 m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::
Type>(type)); | 460 m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::
Type>(type)); |
460 } | 461 } |
461 | 462 |
462 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
itType commitType) | 463 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
itType commitType) |
463 { | 464 { |
464 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, false); | 465 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, false); |
| 466 |
| 467 // Save some histogram data so we can compute the average memory used per |
| 468 // page load of the glyphs. |
| 469 // TODO(esprehn): Is this ancient uma actually useful? |
| 470 Platform::current()->histogramCustomCounts("Memory.GlyphPagesPerLoad", Glyph
PageTreeNode::treeGlyphPageCount(), 1, 10000, 50); |
| 471 |
465 if (m_webFrame->client()) | 472 if (m_webFrame->client()) |
466 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte
m(item), static_cast<WebHistoryCommitType>(commitType)); | 473 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte
m(item), static_cast<WebHistoryCommitType>(commitType)); |
467 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram
e->frame()->localFrameRoot())->devToolsAgentImpl(); | 474 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram
e->frame()->localFrameRoot())->devToolsAgentImpl(); |
468 if (devToolsAgent) | 475 if (devToolsAgent) |
469 devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame()); | 476 devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame()); |
470 } | 477 } |
471 | 478 |
472 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad( | 479 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad( |
473 const ResourceError& error, HistoryCommitType commitType) | 480 const ResourceError& error, HistoryCommitType commitType) |
474 { | 481 { |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
978 | 985 |
979 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 986 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
980 { | 987 { |
981 if (m_webFrame->client()) { | 988 if (m_webFrame->client()) { |
982 m_webFrame->client()->suddenTerminationDisablerChanged( | 989 m_webFrame->client()->suddenTerminationDisablerChanged( |
983 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 990 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
984 } | 991 } |
985 } | 992 } |
986 | 993 |
987 } // namespace blink | 994 } // namespace blink |
OLD | NEW |