mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
226 commits 1 branch 183 tags 5.3 GiB
Commit graph

226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Roben
ae1e26bddd Fix a hang on quit when application cache is used 
If you navigated to a page that used the HTML Application Cache, you'd see a
hang on quit with a backtrace like so:

+     2825 content::ContentMain(int, char const**, content::ContentMainDelegate*)  (in libchromiumcontent.dylib) + 64  [0xb33190]
+       2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x96b261  [0xb34261]
+         2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x96a409  [0xb33409]
+           2825 content::BrowserMain(content::MainFunctionParams const&)  (in libchromiumcontent.dylib) + 200  [0x14290b8]
+             2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x1265426  [0x142e426]
+               2825 content::BrowserMainLoop::~BrowserMainLoop()  (in libchromiumcontent.dylib) + 17  [0x14294a1]
+                 2825 content::BrowserMainLoop::~BrowserMainLoop()  (in libchromiumcontent.dylib) + 357  [0x1429625]
+                     2825 brightray::BrowserMainParts::~BrowserMainParts()  (in ) + 70  [0x68df6]
+                       2825 scoped_ptr<brightray::BrowserContext, base::DefaultDeleter<brightray::BrowserContext> >::~scoped_ptr()  (in ) + 23  [0x68ff7]
+                         2825 scoped_ptr<brightray::BrowserContext, base::DefaultDeleter<brightray::BrowserContext> >::~scoped_ptr()  (in ) + 23  [0x69297]
+                           2825 base::internal::scoped_ptr_impl<brightray::BrowserContext, base::DefaultDeleter<brightray::BrowserContext> >::~scoped_ptr_impl()  (in ) + 23  [0x692b7]
+                             2825 base::internal::scoped_ptr_impl<brightray::BrowserContext, base::DefaultDeleter<brightray::BrowserContext> >::~scoped_ptr_impl()  (in ) + 50  [0x692f2]
+                               2825 base::DefaultDeleter<brightray::BrowserContext>::operator()(brightray::BrowserContext*) const  (in ) + 46  [0x6916e]
+                                   2825 brightray::BrowserContext::~BrowserContext()  (in ) + 127  [0x672bf]
+                                     2825 base::SupportsUserData::~SupportsUserData()  (in libchromiumcontent.dylib) + 57  [0xccc019]
+                                       2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0xb03230  [0xccc230]
+                                         2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0xb0324e  [0xccc24e]
+                                           2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x14c4239  [0x168d239]
+                                             2825 content::StoragePartitionImpl::~StoragePartitionImpl()  (in libchromiumcontent.dylib) + 17  [0x16899a1]
+                                               2825 content::StoragePartitionImpl::~StoragePartitionImpl()  (in libchromiumcontent.dylib) + 491  [0x1689bab]
+                                                 2825 content::ChromeAppCacheService::DeleteOnCorrectThread() const  (in libchromiumcontent.dylib) + 66  [0x1424f32]
+                                                   2825 content::ChromeAppCacheService::~ChromeAppCacheService()  (in libchromiumcontent.dylib) + 50  [0x1424e32]
+                                                     2825 appcache::AppCacheService::~AppCacheService()  (in libchromiumcontent.dylib) + 301  [0x2b8ad2d]
+                                                       2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x29c9b81  [0x2b92b81]
+                                                         2825 ???  (in libchromiumcontent.dylib)  load address 0x1c9000 + 0x29c9da4  [0x2b92da4]
+                                                           2825 appcache::AppCacheDiskCache::~AppCacheDiskCache()  (in libchromiumcontent.dylib) + 17  [0x2b78c71]
+                                                             2825 appcache::AppCacheDiskCache::~AppCacheDiskCache()  (in libchromiumcontent.dylib) + 135  [0x2b78d17]
+                                                               2825 disk_cache::BackendImpl::~BackendImpl()  (in libchromiumcontent.dylib) + 17  [0x25979a1]
+                                                                 2825 disk_cache::BackendImpl::~BackendImpl()  (in libchromiumcontent.dylib) + 305  [0x2597af1]
+                                                                   2825 base::WaitableEvent::Wait()  (in libchromiumcontent.dylib) + 50  [0xccd942]
+                                                                     2825 base::WaitableEvent::TimedWait(base::TimeDelta const&)  (in libchromiumcontent.dylib) + 347  [0xccdb3b]
+                                                                       2825 base::ConditionVariable::Wait()  (in libchromiumcontent.dylib) + 35  [0xcccbb3]
+                                                                         2825 pthread_cond_wait$UNIX2003  (in libsystem_c.dylib) + 71  [0x964d3089]
+                                                                           2825 _pthread_cond_wait  (in libsystem_c.dylib) + 833  [0x9644d280]
+                                                                             2825 __psynch_cvwait  (in libsystem_kernel.dylib) + 10  [0x94b8e8e2]

BackendImpl was waiting on BrowserThread::CACHE, but that thread had already
been stopped. The solution is to destroy the BrowserContext before threads have
been stopped. We now do this in BrowserMainParts::PostMainMessageLoopRun, which
matches content_shell.
 2013-10-23 12:16:25 -04:00
Adam Roben
8ff43b034c Merge pull request #13 from brightray/devtools-scheme 
Use "chrome-devtools://" scheme for devtools
 2013-10-11 07:29:27 -07:00
Cheng Zhao
f623ddf7fc Cleanup unused headers, data members and functions. 2013-10-11 07:17:53 -04:00
Cheng Zhao
2cd6dd791e Setup devtools in the correct phase. 
* RegisterDevToolsClientHostFor should be called right after the agent_host and
  the frontend host are created.
* SetupDevToolsFrontendClient should be called before the devtools window is
  going to start navigation.
 2013-10-11 07:17:03 -04:00
Cheng Zhao
9d29c8eb7c Use the "chrome-devtools://" scheme to open devtools. 2013-10-10 16:56:52 -04:00
Adam Roben
c949fd931c Merge pull request #31 from brightray/less-flashing 
Fix flashing in devtools views
 2013-10-10 13:29:14 -07:00
Adam Roben
6b9e61c65d Fix flashing in WebContents we create 
If the embedding app creates them it's up to them to fix this.
 2013-10-10 16:24:22 -04:00
Adam Roben
8ae459e9fa Work around http://crbug.com/279472 for devtools views 2013-10-10 14:17:30 -04:00
Adam Roben
c0e744db78 Update libchromiumcontent to use Xcode's clang 
* vendor/libchromiumcontent 759a8d0...21d99bd (1):
  > Merge pull request #28 from brightray/xcode-clang
 2013-10-09 12:58:36 -04:00
Adam Roben
d06ac20947 Update to latest libchromiumcontent 
* vendor/libchromiumcontent bfb2d7b...759a8d0 (1):
  > Remove googleurl/ from the distribution
 2013-10-08 13:20:43 -04:00
Adam Roben
1f1f93465b Make MediaStreamDevicesController::Accept/Deny public again 
Clients rely on this.
 2013-10-07 17:04:40 -04:00
Adam Roben
b3b4ab2c70 Update ICU header include path 
I should have done this as part of #30.
 2013-10-07 17:02:35 -04:00
Adam Roben
4e5f6a10f9 Merge pull request #30 from brightray/chrome-30 
Update to Chrome 30
 2013-10-07 13:36:23 -07:00
Adam Roben
9165424348 Update ResourceContext for Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=215991.
 2013-10-07 16:31:58 -04:00
Adam Roben
4d6ee2c416 URLRequestContextStorage::set_http_server_properties takes a scoped_ptr in Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=212466.
 2013-10-07 16:31:58 -04:00
Adam Roben
d1623535e8 Update browser/media/* for Chrome 30 
I took the latest versions of these files from chrome/browser/media,
then pared them down to remove all Chrome-isms and uses of UI to prompt
the user about allowing access to devices.
 2013-10-07 16:31:58 -04:00
Adam Roben
aa4f991659 Add DevToolsFrontendHostDelegate indexing methods from Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=215622.
 2013-10-07 16:31:57 -04:00
Adam Roben
4d59060657 BrowserContext::RequestMIDISysExPermission was added in Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=211437.
 2013-10-07 16:31:57 -04:00
Adam Roben
c1c4344879 BrowserContext::GetSpeechRecognitionPreferences is gone in Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=210616.
 2013-10-07 16:31:57 -04:00
Adam Roben
eb446fc707 content::BrowserContext::GetPath is a const member function in Chrome 30 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=211931.
 2013-10-07 16:31:57 -04:00
Adam Roben
64a5ce6e15 Update for move of scoped_nsobject header and namespace 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=207616.
 2013-10-07 16:31:57 -04:00
Adam Roben
1e99ec9aed Update #includes for moves of string-related headers 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=205050.
 2013-10-07 16:31:57 -04:00
Adam Roben
0575987343 Update to Chrome 30 
* vendor/libchromiumcontent a56056d...bfb2d7b (1):
  > Merge pull request #27 from brightray/chrome-30
 2013-10-07 16:31:42 -04:00
Adam Roben
8c7de2259b Update to latest libchromiumcontent 
* vendor/libchromiumcontent ccec3a4...a56056d (1):
  > Stop exporting GURL symbols from test_support_chromiumcontent
 2013-08-23 17:30:53 -04:00
Adam Roben
345bc3fc6b Merge pull request #29 from brightray/chrome-29 
Update to Chrome 29
 2013-08-23 14:03:13 -07:00
Adam Roben
b24d7d7c76 Update utf_string_conversions.h path in another place 2013-08-23 17:01:18 -04:00
Adam Roben
2c030a419d Update for webkit header moves 2013-08-23 16:56:53 -04:00
Adam Roben
7d3f371b51 Update for move of MessageLoop into base namespace 2013-08-23 16:56:41 -04:00
Adam Roben
4946ec9081 Update for utf_string_conversions.h move in Chrome 29 2013-08-23 16:56:30 -04:00
Adam Roben
7dd1b8195f Update libchromiumcontent to Chrome 29 
* vendor/libchromiumcontent 5ffcb39...ccec3a4 (2):
  > Merge pull request #25 from brightray/29.0.1547.57
  > Switch back to using s3put on Linux
 2013-08-23 16:56:05 -04:00
Adam Roben
79a1731921 Merge pull request #28 from brightray/vendor-gyp 
Include gyp as a submodule
 2013-08-23 04:52:20 -07:00
Adam Roben
f17f9d932c Include gyp as a submodule 
This makes it so you don't have to install gyp on your system before you
can build.
 2013-08-23 07:48:37 -04:00
Adam Roben
710d0fc6c5 Make overriding BrowserContext::RegisterPrefs actually work 
We were calling it before derived classes' vtables were set up. Now we wait to
call it until the BrowserContext is fully constructed.
 2013-08-15 16:07:14 -04:00
Adam Roben
1161da6527 Mention that Clang 3.0 is needed on Linux 2013-08-14 08:17:52 -04:00
Adam Roben
3df85640a6 Merge pull request #26 from brightray/linux 
Get a basic Linux build working
 2013-08-14 05:16:15 -07:00
Adam Roben
9638e3956f Don't use base::DIR_APP_DATA on Linux 
It doesn't exist. Instead, match content_shell by putting
application-specific data in $XDG_CONFIG_HOME or ~/.config.
 2013-08-14 08:14:54 -04:00
Adam Roben
22ea2073df Compile as C++11 on Linux 2013-08-14 08:14:54 -04:00
Adam Roben
7f3afbaf3d Force building with Clang on Linux to get C++11 support 2013-08-14 08:14:54 -04:00
Adam Roben
d27a984378 Define USE_X11 on Linux 2013-08-06 17:29:08 -04:00
Adam Roben
3076781c8a Build using make on Linux 2013-08-06 17:25:07 -04:00
Adam Roben
b596adc237 Start teaching script/build about Linux 2013-08-06 16:49:59 -04:00
Adam Roben
efad174995 Update libchromiumcontent to get better Linux support 
* vendor/libchromiumcontent be71317...5ffcb39 (2):
  > Delete commented-out code in script/download
  > Teach script/download about Linux
 2013-08-06 16:43:21 -04:00
Adam Roben
af20c55519 Spew less when script/cibuild fails 2013-08-06 16:42:21 -04:00
Adam Roben
6841801538 Spew less when script/bootstrap fails 2013-08-06 16:39:11 -04:00
Adam Roben
a61fa01c5d Update libchromiumcontent to get basic Linux support 
* vendor/libchromiumcontent 33472d4...be71317 (4):
  > Merge pull request #24 from brightray/linux
  > Fix gyp syntax
  > Fix Release linker error on Linux
  > Make sure we always apply patches in alphabetical order
 2013-07-31 16:27:00 -07:00
Adam Roben
53ac82b6c1 Merge pull request #25 from brightray/getusermedia 
Enable navigator.webkitGetUserMedia()
 2013-07-31 11:52:51 -07:00
Adam Roben
c2623d2bdc Fix typos 2013-07-31 11:52:21 -07:00
Adam Roben
2595335045 Enable navigator.webkitGetUserMedia() 
The code came from chrome/browser/media, but was simplified to remove
dependencies on other parts of chrome/ and to always allow the media stream
request.
 2013-07-31 11:08:45 -07:00
Adam Roben
bd648ce58f Put ICU headers on the include path for embedders 2013-07-25 12:31:41 -04:00
Adam Roben
d32a2fbc97 Update libchromiumcontent to get ICU headers 
* vendor/libchromiumcontent ee4cea0...33472d4 (5):
  > Export ICU headers
  > When `gclient sync` fails, revert all local changes and try again
  > Merge pull request #23 from brightray/chromiumviews_pdb
  > Merge pull request #22 from brightray/cygwin2
  > Update to Chrome 28.0.1500.71
 2013-07-25 12:22:58 -04:00