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

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

Issue 2483843002: Revert of [scheduler] Teach scheduler about audio state (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 3454 matching lines...) Expand 10 before | Expand all | Expand 10 after
3465 plugin->plugin()->rotateView( 3465 plugin->plugin()->rotateView(
3466 WebPlugin::RotationType90Counterclockwise); 3466 WebPlugin::RotationType90Counterclockwise);
3467 break; 3467 break;
3468 default: 3468 default:
3469 NOTREACHED(); 3469 NOTREACHED();
3470 } 3470 }
3471 } 3471 }
3472 } 3472 }
3473 } 3473 }
3474 3474
3475 void WebViewImpl::audioStateChanged(bool isAudioPlaying) {
3476 m_scheduler->audioStateChanged(isAudioPlaying);
3477 }
3478
3479 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) { 3475 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) {
3480 return coreHitTestResultAt(point); 3476 return coreHitTestResultAt(point);
3481 } 3477 }
3482 3478
3483 HitTestResult WebViewImpl::coreHitTestResultAt( 3479 HitTestResult WebViewImpl::coreHitTestResultAt(
3484 const WebPoint& pointInViewport) { 3480 const WebPoint& pointInViewport) {
3485 DocumentLifecycle::AllowThrottlingScope throttlingScope( 3481 DocumentLifecycle::AllowThrottlingScope throttlingScope(
3486 mainFrameImpl()->frame()->document()->lifecycle()); 3482 mainFrameImpl()->frame()->document()->lifecycle());
3487 FrameView* view = mainFrameImpl()->frameView(); 3483 FrameView* view = mainFrameImpl()->frameView();
3488 IntPoint pointInRootFrame = 3484 IntPoint pointInRootFrame =
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
4453 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4449 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4454 return nullptr; 4450 return nullptr;
4455 return focusedFrame; 4451 return focusedFrame;
4456 } 4452 }
4457 4453
4458 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4454 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4459 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4455 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4460 } 4456 }
4461 4457
4462 } // namespace blink 4458 } // 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