Chromium Code Reviews| 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 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1186 } | 1186 } |
| 1187 | 1187 |
| 1188 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { | 1188 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { |
| 1189 suspend_webkit_shared_timer_ = false; | 1189 suspend_webkit_shared_timer_ = false; |
| 1190 } | 1190 } |
| 1191 | 1191 |
| 1192 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { | 1192 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { |
| 1193 notify_webkit_of_modal_loop_ = false; | 1193 notify_webkit_of_modal_loop_ = false; |
| 1194 } | 1194 } |
| 1195 | 1195 |
| 1196 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1196 void RenderThreadImpl::OnSetZoomLevelForCurrentURL( |
| 1197 const std::string& host, | 1197 const std::string& scheme, |
| 1198 double zoom_level) { | 1198 const std::string& host, |
| 1199 double zoom_level, | |
| 1200 const std::set<int>& exceptions) { | |
|
fsamuel
2014/05/28 15:37:05
I'm confused. What are we using exceptions for?
| |
| 1199 RenderViewZoomer zoomer(scheme, host, zoom_level); | 1201 RenderViewZoomer zoomer(scheme, host, zoom_level); |
| 1200 RenderView::ForEach(&zoomer); | 1202 RenderView::ForEach(&zoomer); |
| 1201 } | 1203 } |
| 1202 | 1204 |
| 1203 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { | 1205 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { |
| 1204 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); | 1206 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); |
| 1205 RenderProcessObserver* observer; | 1207 RenderProcessObserver* observer; |
| 1206 while ((observer = it.GetNext()) != NULL) { | 1208 while ((observer = it.GetNext()) != NULL) { |
| 1207 if (observer->OnControlMessageReceived(msg)) | 1209 if (observer->OnControlMessageReceived(msg)) |
| 1208 return true; | 1210 return true; |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1509 hidden_widget_count_--; | 1511 hidden_widget_count_--; |
| 1510 | 1512 |
| 1511 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1513 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
| 1512 return; | 1514 return; |
| 1513 } | 1515 } |
| 1514 | 1516 |
| 1515 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1517 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
| 1516 } | 1518 } |
| 1517 | 1519 |
| 1518 } // namespace content | 1520 } // namespace content |
| OLD | NEW |