| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #include "chrome_frame/test/perf/chrome_frame_perftest.h" | 4 #include "chrome_frame/test/perf/chrome_frame_perftest.h" |
| 5 | 5 |
| 6 #include <atlwin.h> | 6 #include <atlwin.h> |
| 7 #include <atlhost.h> | 7 #include <atlhost.h> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 BEGIN_COM_MAP(ChromeFrameActiveXContainer) | 65 BEGIN_COM_MAP(ChromeFrameActiveXContainer) |
| 66 COM_INTERFACE_ENTRY(IPropertyNotifySink) | 66 COM_INTERFACE_ENTRY(IPropertyNotifySink) |
| 67 END_COM_MAP() | 67 END_COM_MAP() |
| 68 | 68 |
| 69 BEGIN_MSG_MAP(ChromeFrameActiveXContainer) | 69 BEGIN_MSG_MAP(ChromeFrameActiveXContainer) |
| 70 MESSAGE_HANDLER(WM_CREATE, OnCreate) | 70 MESSAGE_HANDLER(WM_CREATE, OnCreate) |
| 71 MESSAGE_HANDLER(WM_DESTROY, OnDestroy) | 71 MESSAGE_HANDLER(WM_DESTROY, OnDestroy) |
| 72 END_MSG_MAP() | 72 END_MSG_MAP() |
| 73 | 73 |
| 74 HRESULT OnMessageCallback(const VARIANT* param) { | 74 HRESULT OnMessageCallback(const VARIANT* param) { |
| 75 DLOG(INFO) << __FUNCTION__; | 75 DVLOG(1) << __FUNCTION__; |
| 76 OnMessageCallbackImpl(param); | 76 OnMessageCallbackImpl(param); |
| 77 return S_OK; | 77 return S_OK; |
| 78 } | 78 } |
| 79 | 79 |
| 80 HRESULT OnLoadErrorCallback(const VARIANT* param) { | 80 HRESULT OnLoadErrorCallback(const VARIANT* param) { |
| 81 DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal; | 81 DVLOG(1) << __FUNCTION__ << " " << param->bstrVal; |
| 82 OnLoadErrorCallbackImpl(param); | 82 OnLoadErrorCallbackImpl(param); |
| 83 return S_OK; | 83 return S_OK; |
| 84 } | 84 } |
| 85 | 85 |
| 86 HRESULT OnLoadCallback(const VARIANT* param) { | 86 HRESULT OnLoadCallback(const VARIANT* param) { |
| 87 DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal; | 87 DVLOG(1) << __FUNCTION__ << " " << param->bstrVal; |
| 88 OnLoadCallbackImpl(param); | 88 OnLoadCallbackImpl(param); |
| 89 return S_OK; | 89 return S_OK; |
| 90 } | 90 } |
| 91 | 91 |
| 92 ChromeFrameActiveXContainer() : | 92 ChromeFrameActiveXContainer() : |
| 93 prop_notify_cookie_(0), | 93 prop_notify_cookie_(0), |
| 94 onmsg_(this, &ChromeFrameActiveXContainer::OnMessageCallback), | 94 onmsg_(this, &ChromeFrameActiveXContainer::OnMessageCallback), |
| 95 onloaderror_(this, &ChromeFrameActiveXContainer::OnLoadErrorCallback), | 95 onloaderror_(this, &ChromeFrameActiveXContainer::OnLoadErrorCallback), |
| 96 onload_(this, &ChromeFrameActiveXContainer::OnLoadCallback) { | 96 onload_(this, &ChromeFrameActiveXContainer::OnLoadCallback) { |
| 97 } | 97 } |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 // override the browser directory to use the reference build instead. | 457 // override the browser directory to use the reference build instead. |
| 458 virtual void SetUp() { | 458 virtual void SetUp() { |
| 459 // Register the reference build Chrome Frame DLL. | 459 // Register the reference build Chrome Frame DLL. |
| 460 chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); | 460 chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); |
| 461 chrome_frame_registrar_->RegisterReferenceChromeFrameBuild(); | 461 chrome_frame_registrar_->RegisterReferenceChromeFrameBuild(); |
| 462 | 462 |
| 463 ChromeFrameStartupTest::SetUp(); | 463 ChromeFrameStartupTest::SetUp(); |
| 464 | 464 |
| 465 chrome_frame_dll_ = FilePath( | 465 chrome_frame_dll_ = FilePath( |
| 466 chrome_frame_registrar_->GetReferenceChromeFrameDllPath()); | 466 chrome_frame_registrar_->GetReferenceChromeFrameDllPath()); |
| 467 DLOG(INFO) << __FUNCTION__ << ": " << chrome_frame_dll_.value(); | 467 DVLOG(1) << __FUNCTION__ << ": " << chrome_frame_dll_.value(); |
| 468 } | 468 } |
| 469 | 469 |
| 470 virtual void TearDown() { | 470 virtual void TearDown() { |
| 471 // Reregister the Chrome Frame DLL in the build directory. | 471 // Reregister the Chrome Frame DLL in the build directory. |
| 472 chrome_frame_registrar_.reset(NULL); | 472 chrome_frame_registrar_.reset(NULL); |
| 473 } | 473 } |
| 474 }; | 474 }; |
| 475 | 475 |
| 476 // This class provides base functionality to measure ChromeFrame memory | 476 // This class provides base functionality to measure ChromeFrame memory |
| 477 // usage. | 477 // usage. |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 GetNextUrl(&url); | 586 GetNextUrl(&url); |
| 587 ASSERT_TRUE(!url.empty()); | 587 ASSERT_TRUE(!url.empty()); |
| 588 | 588 |
| 589 StartTest(url, test_name); | 589 StartTest(url, test_name); |
| 590 } | 590 } |
| 591 | 591 |
| 592 void OnNavigationSuccess(const VARIANT* param) { | 592 void OnNavigationSuccess(const VARIANT* param) { |
| 593 ASSERT_TRUE(param != NULL); | 593 ASSERT_TRUE(param != NULL); |
| 594 ASSERT_EQ(VT_BSTR, param->vt); | 594 ASSERT_EQ(VT_BSTR, param->vt); |
| 595 | 595 |
| 596 DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal; | 596 DVLOG(1) << __FUNCTION__ << " " << param->bstrVal; |
| 597 InitiateNextNavigation(); | 597 InitiateNextNavigation(); |
| 598 } | 598 } |
| 599 | 599 |
| 600 void OnNavigationFailure(const VARIANT* param) { | 600 void OnNavigationFailure(const VARIANT* param) { |
| 601 ASSERT_TRUE(param != NULL); | 601 ASSERT_TRUE(param != NULL); |
| 602 ASSERT_EQ(VT_BSTR, param->vt); | 602 ASSERT_EQ(VT_BSTR, param->vt); |
| 603 | 603 |
| 604 DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal; | 604 DVLOG(1) << __FUNCTION__ << " " << param->bstrVal; |
| 605 InitiateNextNavigation(); | 605 InitiateNextNavigation(); |
| 606 } | 606 } |
| 607 | 607 |
| 608 protected: | 608 protected: |
| 609 bool GetNextUrl(std::string* url) { | 609 bool GetNextUrl(std::string* url) { |
| 610 if (current_url_index_ >= urls_.size()) | 610 if (current_url_index_ >= urls_.size()) |
| 611 return false; | 611 return false; |
| 612 | 612 |
| 613 *url = urls_[current_url_index_++]; | 613 *url = urls_[current_url_index_++]; |
| 614 return true; | 614 return true; |
| (...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1455 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles, | 1455 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles, |
| 1456 "automationproviderconnect"); | 1456 "automationproviderconnect"); |
| 1457 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles, | 1457 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles, |
| 1458 "externaltabnavigate"); | 1458 "externaltabnavigate"); |
| 1459 PrintPerfTestResults(renderer_main_monitor, kNumCycles, | 1459 PrintPerfTestResults(renderer_main_monitor, kNumCycles, |
| 1460 "beginrenderermain"); | 1460 "beginrenderermain"); |
| 1461 #ifdef NDEBUG | 1461 #ifdef NDEBUG |
| 1462 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage"); | 1462 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage"); |
| 1463 #endif // NDEBUG | 1463 #endif // NDEBUG |
| 1464 } | 1464 } |
| OLD | NEW |