Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2408003002: Revert "[scheduler] Teach scheduler about audio state" (Closed)
Patch Set: Rebase. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 3745 matching lines...) Expand 10 before | Expand all | Expand 10 after
3756 plugin->plugin()->rotateView( 3756 plugin->plugin()->rotateView(
3757 WebPlugin::RotationType90Counterclockwise); 3757 WebPlugin::RotationType90Counterclockwise);
3758 break; 3758 break;
3759 default: 3759 default:
3760 NOTREACHED(); 3760 NOTREACHED();
3761 } 3761 }
3762 } 3762 }
3763 } 3763 }
3764 } 3764 }
3765 3765
3766 void WebViewImpl::audioStateChanged(bool isAudioPlaying) {
3767 m_scheduler->audioStateChanged(isAudioPlaying);
3768 }
3769
3770 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) { 3766 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) {
3771 return coreHitTestResultAt(point); 3767 return coreHitTestResultAt(point);
3772 } 3768 }
3773 3769
3774 HitTestResult WebViewImpl::coreHitTestResultAt( 3770 HitTestResult WebViewImpl::coreHitTestResultAt(
3775 const WebPoint& pointInViewport) { 3771 const WebPoint& pointInViewport) {
3776 DocumentLifecycle::AllowThrottlingScope throttlingScope( 3772 DocumentLifecycle::AllowThrottlingScope throttlingScope(
3777 mainFrameImpl()->frame()->document()->lifecycle()); 3773 mainFrameImpl()->frame()->document()->lifecycle());
3778 FrameView* view = mainFrameImpl()->frameView(); 3774 FrameView* view = mainFrameImpl()->frameView();
3779 IntPoint pointInRootFrame = 3775 IntPoint pointInRootFrame =
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
4743 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4739 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4744 return nullptr; 4740 return nullptr;
4745 return focusedFrame; 4741 return focusedFrame;
4746 } 4742 }
4747 4743
4748 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4744 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4749 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4745 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4750 } 4746 }
4751 4747
4752 } // namespace blink 4748 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/platform/WebViewScheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698