OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 4 |
5 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1203 } | 1203 } |
1204 | 1204 |
1205 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { | 1205 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { |
1206 suspend_webkit_shared_timer_ = false; | 1206 suspend_webkit_shared_timer_ = false; |
1207 } | 1207 } |
1208 | 1208 |
1209 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { | 1209 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { |
1210 notify_webkit_of_modal_loop_ = false; | 1210 notify_webkit_of_modal_loop_ = false; |
1211 } | 1211 } |
1212 | 1212 |
1213 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1213 void RenderThreadImpl::OnSetZoomLevelForCurrentURL( |
1214 const std::string& host, | 1214 const std::string& scheme, |
1215 double zoom_level) { | 1215 const std::string& host, |
| 1216 double zoom_level, |
| 1217 const std::set<int>& exceptions) { |
1216 RenderViewZoomer zoomer(scheme, host, zoom_level); | 1218 RenderViewZoomer zoomer(scheme, host, zoom_level); |
1217 RenderView::ForEach(&zoomer); | 1219 RenderView::ForEach(&zoomer); |
1218 } | 1220 } |
1219 | 1221 |
1220 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { | 1222 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { |
1221 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); | 1223 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); |
1222 RenderProcessObserver* observer; | 1224 RenderProcessObserver* observer; |
1223 while ((observer = it.GetNext()) != NULL) { | 1225 while ((observer = it.GetNext()) != NULL) { |
1224 if (observer->OnControlMessageReceived(msg)) | 1226 if (observer->OnControlMessageReceived(msg)) |
1225 return true; | 1227 return true; |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1517 hidden_widget_count_--; | 1519 hidden_widget_count_--; |
1518 | 1520 |
1519 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1521 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1520 return; | 1522 return; |
1521 } | 1523 } |
1522 | 1524 |
1523 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1525 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1524 } | 1526 } |
1525 | 1527 |
1526 } // namespace content | 1528 } // namespace content |
OLD | NEW |