bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 66269.

Browse Source 
- Fixes a crash with Flash-related JavaScript (issue #115).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@138 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-11-16 16:01:14 +00:00
parent 8c47cd961a
commit 239a283e02
10 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libcef/browser_appcache_system.h
View File

@ -1,6 +1,6 @@
// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef _BROWSER_APPCACHE_SYSTEM_H
#define _BROWSER_APPCACHE_SYSTEM_H
@ -28,7 +28,7 @@ class URLRequestContext;
// a UI thread on which webkit runs and an IO thread on which URLRequests
// are handled. This class conspires with BrowserResourceLoaderBridge to
// retrieve resources from the appcache.
class BrowserAppCacheSystem : public MessageLoop::DestructionObserver {
class BrowserAppCacheSystem {
public:
// Should be instanced somewhere in main(). If not instanced, the public
// static methods are all safe no-ops.
@ -51,6 +51,11 @@ class BrowserAppCacheSystem : public MessageLoop::DestructionObserver {
instance_->InitOnIOThread(request_context);
}
static void CleanupOnIOThread() {
if (instance_)
instance_->CleanupIOThread();
}
// Called by TestShellWebKitInit to manufacture a 'host' for webcore.
static WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
WebKit::WebApplicationCacheHostClient* client) {
@ -108,6 +113,7 @@ class BrowserAppCacheSystem : public MessageLoop::DestructionObserver {
// Instance methods called by our static public methods
void InitOnUIThread(const FilePath& cache_directory);
void InitOnIOThread(URLRequestContext* request_context);
void CleanupIOThread();
WebKit::WebApplicationCacheHost* CreateCacheHostForWebKit(
WebKit::WebApplicationCacheHostClient* client);
void SetExtraRequestBits(URLRequest* request,
@ -139,9 +145,6 @@ class BrowserAppCacheSystem : public MessageLoop::DestructionObserver {
return NULL;
}
// IOThread DestructionObserver
virtual void WillDestroyCurrentMessageLoop();
FilePath cache_directory_;
MessageLoop* io_message_loop_;
MessageLoop* ui_message_loop_;