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

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

Issue 2561993002: Only propagate intervention reports to local frames (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 if (m_client) 1054 if (m_client)
1055 FontCache::acceptLanguagesChanged(m_client->acceptLanguages()); 1055 FontCache::acceptLanguagesChanged(m_client->acceptLanguages());
1056 1056
1057 if (!page()) 1057 if (!page())
1058 return; 1058 return;
1059 1059
1060 page()->acceptLanguagesChanged(); 1060 page()->acceptLanguagesChanged();
1061 } 1061 }
1062 1062
1063 void WebViewImpl::ReportIntervention(const WebString& message) { 1063 void WebViewImpl::ReportIntervention(const WebString& message) {
1064 if (!mainFrame()) 1064 if (!mainFrameImpl())
1065 return; 1065 return;
1066 WebConsoleMessage consoleMessage(WebConsoleMessage::LevelWarning, message); 1066 WebConsoleMessage consoleMessage(WebConsoleMessage::LevelWarning, message);
1067 mainFrame()->addMessageToConsole(consoleMessage); 1067 mainFrameImpl()->addMessageToConsole(consoleMessage);
1068 } 1068 }
1069 1069
1070 float WebViewImpl::expensiveBackgroundThrottlingCPUBudget() { 1070 float WebViewImpl::expensiveBackgroundThrottlingCPUBudget() {
1071 return settingsImpl()->expensiveBackgroundThrottlingCPUBudget(); 1071 return settingsImpl()->expensiveBackgroundThrottlingCPUBudget();
1072 } 1072 }
1073 1073
1074 float WebViewImpl::expensiveBackgroundThrottlingInitialBudget() { 1074 float WebViewImpl::expensiveBackgroundThrottlingInitialBudget() {
1075 return settingsImpl()->expensiveBackgroundThrottlingInitialBudget(); 1075 return settingsImpl()->expensiveBackgroundThrottlingInitialBudget();
1076 } 1076 }
1077 1077
(...skipping 3120 matching lines...) Expand 10 before | Expand all | Expand 10 after
4198 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4198 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4199 return nullptr; 4199 return nullptr;
4200 return focusedFrame; 4200 return focusedFrame;
4201 } 4201 }
4202 4202
4203 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4203 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4204 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4204 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4205 } 4205 }
4206 4206
4207 } // namespace blink 4207 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698