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

Side by Side Diff: chrome/renderer/render_thread.cc

Issue 1338001: Block database access on allowDatabase instead of databaseOpenFile. (Closed)
Patch Set: without worker support Created 10 years, 8 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 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_thread.h" 5 #include "chrome/renderer/render_thread.h"
6 6
7 #include <v8.h> 7 #include <v8.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <limits> 10 #include <limits>
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 bool pumping_events = false, may_show_cookie_prompt = false; 306 bool pumping_events = false, may_show_cookie_prompt = false;
307 if (msg->is_sync()) { 307 if (msg->is_sync()) {
308 if (msg->is_caller_pumping_messages()) { 308 if (msg->is_caller_pumping_messages()) {
309 pumping_events = true; 309 pumping_events = true;
310 } else { 310 } else {
311 switch (msg->type()) { 311 switch (msg->type()) {
312 case ViewHostMsg_GetCookies::ID: 312 case ViewHostMsg_GetCookies::ID:
313 case ViewHostMsg_GetRawCookies::ID: 313 case ViewHostMsg_GetRawCookies::ID:
314 case ViewHostMsg_DOMStorageSetItem::ID: 314 case ViewHostMsg_DOMStorageSetItem::ID:
315 case ViewHostMsg_SyncLoad::ID: 315 case ViewHostMsg_SyncLoad::ID:
316 case ViewHostMsg_AllowDatabase::ID:
316 may_show_cookie_prompt = true; 317 may_show_cookie_prompt = true;
317 pumping_events = true; 318 pumping_events = true;
318 break; 319 break;
319 } 320 }
320 } 321 }
321 } 322 }
322 323
323 bool suspend_webkit_shared_timer = true; // default value 324 bool suspend_webkit_shared_timer = true; // default value
324 std::swap(suspend_webkit_shared_timer, suspend_webkit_shared_timer_); 325 std::swap(suspend_webkit_shared_timer, suspend_webkit_shared_timer_);
325 326
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 #endif 1002 #endif
1002 1003
1003 if (channel_handle.name.size() != 0) { 1004 if (channel_handle.name.size() != 0) {
1004 // Connect to the GPU process if a channel name was received. 1005 // Connect to the GPU process if a channel name was received.
1005 gpu_channel_->Connect(channel_handle.name); 1006 gpu_channel_->Connect(channel_handle.name);
1006 } else { 1007 } else {
1007 // Otherwise cancel the connection. 1008 // Otherwise cancel the connection.
1008 gpu_channel_ = NULL; 1009 gpu_channel_ = NULL;
1009 } 1010 }
1010 } 1011 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698