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

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

Issue 2403363003: [Merge to 2883] Revert "[scheduler] Teach scheduler about audio state" (Closed)
Patch Set: 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 3750 matching lines...) Expand 10 before | Expand all | Expand 10 after
3761 plugin->plugin()->rotateView( 3761 plugin->plugin()->rotateView(
3762 WebPlugin::RotationType90Counterclockwise); 3762 WebPlugin::RotationType90Counterclockwise);
3763 break; 3763 break;
3764 default: 3764 default:
3765 NOTREACHED(); 3765 NOTREACHED();
3766 } 3766 }
3767 } 3767 }
3768 } 3768 }
3769 } 3769 }
3770 3770
3771 void WebViewImpl::audioStateChanged(bool isAudioPlaying) {
3772 m_scheduler->audioStateChanged(isAudioPlaying);
3773 }
3774
3775 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) { 3771 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) {
3776 return coreHitTestResultAt(point); 3772 return coreHitTestResultAt(point);
3777 } 3773 }
3778 3774
3779 HitTestResult WebViewImpl::coreHitTestResultAt( 3775 HitTestResult WebViewImpl::coreHitTestResultAt(
3780 const WebPoint& pointInViewport) { 3776 const WebPoint& pointInViewport) {
3781 DocumentLifecycle::AllowThrottlingScope throttlingScope( 3777 DocumentLifecycle::AllowThrottlingScope throttlingScope(
3782 mainFrameImpl()->frame()->document()->lifecycle()); 3778 mainFrameImpl()->frame()->document()->lifecycle());
3783 FrameView* view = mainFrameImpl()->frameView(); 3779 FrameView* view = mainFrameImpl()->frameView();
3784 IntPoint pointInRootFrame = 3780 IntPoint pointInRootFrame =
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
4748 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4744 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4749 return nullptr; 4745 return nullptr;
4750 return focusedFrame; 4746 return focusedFrame;
4751 } 4747 }
4752 4748
4753 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4749 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4754 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4750 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4755 } 4751 }
4756 4752
4757 } // namespace blink 4753 } // 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