| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "modules/device_orientation/DeviceMotionController.h" | 56 #include "modules/device_orientation/DeviceMotionController.h" |
| 57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" | 57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" |
| 58 #include "modules/device_orientation/DeviceOrientationController.h" | 58 #include "modules/device_orientation/DeviceOrientationController.h" |
| 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
| 60 #include "modules/gamepad/NavigatorGamepad.h" | 60 #include "modules/gamepad/NavigatorGamepad.h" |
| 61 #include "modules/mediasession/HTMLMediaElementMediaSession.h" | 61 #include "modules/mediasession/HTMLMediaElementMediaSession.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/Histogram.h" |
| 66 #include "platform/MIMETypeRegistry.h" | 67 #include "platform/MIMETypeRegistry.h" |
| 67 #include "platform/RuntimeEnabledFeatures.h" | 68 #include "platform/RuntimeEnabledFeatures.h" |
| 68 #include "platform/UserGestureIndicator.h" | 69 #include "platform/UserGestureIndicator.h" |
| 69 #include "platform/exported/WrappedResourceRequest.h" | 70 #include "platform/exported/WrappedResourceRequest.h" |
| 70 #include "platform/exported/WrappedResourceResponse.h" | 71 #include "platform/exported/WrappedResourceResponse.h" |
| 71 #include "platform/fonts/GlyphPageTreeNode.h" | 72 #include "platform/fonts/GlyphPageTreeNode.h" |
| 72 #include "platform/network/HTTPParsers.h" | 73 #include "platform/network/HTTPParsers.h" |
| 73 #include "platform/plugins/PluginData.h" | 74 #include "platform/plugins/PluginData.h" |
| 74 #include "public/platform/Platform.h" | 75 #include "public/platform/Platform.h" |
| 75 #include "public/platform/WebApplicationCacheHost.h" | 76 #include "public/platform/WebApplicationCacheHost.h" |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 | 491 |
| 491 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
itType commitType) | 492 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
itType commitType) |
| 492 { | 493 { |
| 493 if (!m_webFrame->parent()) { | 494 if (!m_webFrame->parent()) { |
| 494 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, fals
e); | 495 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, fals
e); |
| 495 } | 496 } |
| 496 | 497 |
| 497 // Save some histogram data so we can compute the average memory used per | 498 // Save some histogram data so we can compute the average memory used per |
| 498 // page load of the glyphs. | 499 // page load of the glyphs. |
| 499 // TODO(esprehn): Is this ancient uma actually useful? | 500 // TODO(esprehn): Is this ancient uma actually useful? |
| 500 Platform::current()->histogramCustomCounts("Memory.GlyphPagesPerLoad", Glyph
PageTreeNode::treeGlyphPageCount(), 1, 10000, 50); | 501 DEFINE_STATIC_LOCAL(CustomCountHistogram, gyphsPagesPerLoadHistogram, ("Memo
ry.GlyphPagesPerLoad", 1, 10000, 50)); |
| 502 gyphsPagesPerLoadHistogram.count(GlyphPageTreeNode::treeGlyphPageCount()); |
| 501 | 503 |
| 502 if (m_webFrame->client()) | 504 if (m_webFrame->client()) |
| 503 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte
m(item), static_cast<WebHistoryCommitType>(commitType)); | 505 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte
m(item), static_cast<WebHistoryCommitType>(commitType)); |
| 504 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram
e->frame()->localFrameRoot())->devToolsAgentImpl(); | 506 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram
e->frame()->localFrameRoot())->devToolsAgentImpl(); |
| 505 if (devToolsAgent) | 507 if (devToolsAgent) |
| 506 devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame()); | 508 devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame()); |
| 507 } | 509 } |
| 508 | 510 |
| 509 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad( | 511 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad( |
| 510 const ResourceError& error, HistoryCommitType commitType) | 512 const ResourceError& error, HistoryCommitType commitType) |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1021 | 1023 |
| 1022 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 1023 { | 1025 { |
| 1024 if (m_webFrame->client()) { | 1026 if (m_webFrame->client()) { |
| 1025 m_webFrame->client()->suddenTerminationDisablerChanged( | 1027 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 1026 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 1027 } | 1029 } |
| 1028 } | 1030 } |
| 1029 | 1031 |
| 1030 } // namespace blink | 1032 } // namespace blink |
| OLD | NEW |