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

4042 commits

Author SHA1 Message Date
Cheng Zhao
ea8ea1543f Refactor osr_output_device 2016-08-03 13:06:38 +09:00
Cheng Zhao
9d8e510a55 Refactor the code in atom_api_web_contents 2016-08-03 13:06:34 +09:00
Cheng Zhao
921aaf9aa3 Move osr related files to atom/browser/osr 2016-08-03 13:05:47 +09:00
Anthony Tseng
e0c0e3e5f7 Add IsSwipeTrackingFromScrollEventsEnabled in system prefs 2016-08-03 10:27:56 +08:00
Cheng Zhao
b0e36ec93a Revert unnecessary changes 2016-08-03 10:48:07 +09:00
Cheng Zhao
aefd99ec7f Only enable kEnableBeginFrameScheduling for offscreen 
It has effects on performance and only gets turned on after Chrome 54.
 2016-08-03 10:40:12 +09:00
Cheng Zhao
363fabdcb4 Merge branch 'offscreen-rendering' of https://github.com/MaxWhere/electron into merge-offscreen 2016-08-03 10:09:48 +09:00
Cheng Zhao
59076711cb Bump v1.3.2 2016-08-03 07:18:31 +09:00
gellert
1663a9cd13 fixes linendings 2016-08-02 19:31:30 +02:00
gellert
362f3deb93 fixes linting 2016-08-02 16:39:07 +02:00
gellert
8eed91d87a Merge remote-tracking branch 'upstream/master' into speedup-gpu 2016-08-02 14:59:03 +02:00
Cheng Zhao
8c0a033b6f Fix lint errors of using __proto__ 2016-08-02 21:02:28 +09:00
Cheng Zhao
844f32aa36 Set prototype of constructor directly 2016-08-02 20:38:35 +09:00
Heilig Benedek
4088f0eb33 remove unneeded windows specific things 2016-08-02 12:57:23 +02:00
Heilig Benedek
9068182664 small fixes 2016-08-02 12:56:03 +02:00
Cheng Zhao
8c3232dc56 Every native class now gets a name 2016-08-02 19:28:12 +09:00
Cheng Zhao
cb19efe49c Pass FunctionTemplate in BuildPrototype 2016-08-02 18:08:12 +09:00
Cheng Zhao
895b8b47ee Save the prototype of EventEmitter 2016-08-02 18:07:58 +09:00
Cheng Zhao
8f62e79243 GetConstructor now returns FunctionTemplate 2016-08-02 17:20:58 +09:00
Cheng Zhao
8cd4612fe0 Get rid of Constructor class 2016-08-02 17:02:04 +09:00
Cheng Zhao
846ec5ba49 AttachAsUserData now can assume the existence of wrapper 2016-08-02 15:28:32 +09:00
Cheng Zhao
1505a46ed0 Do not rely on Constructor to call Init 
This makes it deterministic when the JavaScript is initialized, which
can make our logic more clear.
 2016-08-02 15:15:40 +09:00
Anthony Tseng
beca2d26f3 Swipe back/forward should respect system preferences 2016-08-02 11:18:46 +08:00
Gabriel Handford
7bde92deb9 Add isVisible() to app.dock 2016-08-01 15:22:37 -07:00
gellert
56f5749675 adds transparency 2016-08-01 13:27:39 +02:00
Cheng Zhao
e1152ae96c Remove usages of linked_ptr 
It is no longer needed since we now have move semantic.
 2016-08-01 20:26:06 +09:00
Cheng Zhao
ffed3e9c0c Move the code to native 2016-08-01 20:11:17 +09:00
gellert
36918250ec a possible fix for dragging 2016-08-01 12:06:46 +02:00
gellert
439ad94afe Merge remote-tracking branch 'upstream/master' into speedup-gpu 2016-08-01 12:00:34 +02:00
Cheng Zhao
01ebc77228 Fix styling issues 2016-08-01 09:58:33 +09:00
Cheng Zhao
fb76aaac39 Merge pull request #6667 from liusy182/restore-issue 
fix maximize restore issue caused by restore window size change
 2016-08-01 09:56:08 +09:00
Heilig Benedek
c39ded0481 Merge branch 'speedup-gpu' of https://github.com/MaxWhere/electron into speedup-gpu 2016-08-01 02:18:37 +02:00
Heilig Benedek
64f220fb50 fix UTF character sending as suggested by @zcbenz 2016-08-01 02:18:07 +02:00
Heilig Benedek
bc9adcd5ca fix toBUFFER naming issue and cursor-changed parameter order 2016-08-01 02:17:49 +02:00
Heilig Benedek
7a471e1ab7 fix UTF character sending as suggested by @zcbenz 2016-08-01 02:14:11 +02:00
Heilig Benedek
bc7c5c567c fix toBUFFER naming issue and cursor-changed parameter order 2016-08-01 02:13:31 +02:00
gellert
8e1214fc3a paint toggling fix cleanup 2016-08-01 01:01:55 +02:00
gellert
aac5fb0377 fixes paint toggling, for real tho hopefully 2016-08-01 00:47:53 +02:00
gellert
1cd1c5e01c fixes paint toggling 2016-07-31 22:05:36 +02:00
Heilig Benedek
0098d5bca7 Hide when not painting + cursor event fix 2016-07-31 18:40:35 +02:00
gellert
35ee99265e adds tests for osr 2016-07-31 17:10:53 +02:00
liusi
db671702df fix maximize restore issue caused by restore window size change 2016-07-31 21:49:54 +08:00
gellert
5525ac36b8 does linting 2016-07-31 12:19:56 +02:00
Heilig Benedek
f3b723c9fa Send some more data with the cursor-changed event 2016-07-31 05:24:54 +02:00
Heilig Benedek
21962be60e Adds option to get raw data from NativeImage 2016-07-31 05:24:44 +02:00
Heilig Benedek
af80b9a7df Fixes not being able to send UTF8 characters anymore 2016-07-31 05:24:28 +02:00
Heilig Benedek
0a349ef16c remove fpscounter, can be enabled from node 2016-07-31 05:13:29 +02:00
Heilig Benedek
3e7ff466cd Merge branch 'speedup-gpu' of https://github.com/MaxWhere/electron into speedup-gpu 2016-07-31 05:12:34 +02:00
Heilig Benedek
3a1285aeac Send some more data with the cursor-changed event 2016-07-31 05:11:56 +02:00
Heilig Benedek
d0bda76a2d Adds option to get raw data from NativeImage 2016-07-31 05:11:18 +02:00
Heilig Benedek
94e52f0738 Fixes not being able to send UTF8 characters anymore 2016-07-31 05:10:14 +02:00
gellert
f60d791fa8 adds docs for osr 2016-07-31 00:22:34 +02:00
gellert
e4000850cd head part updates 2016-07-30 21:35:14 +02:00
gellert
916063f370 handles destroyed renderer process 2016-07-30 21:25:49 +02:00
gellert
976277ffbf webcontentsview cleanup 2016-07-30 20:39:17 +02:00
gellert
6486d80f87 api impl + cleanups + stability improvements 2016-07-30 15:40:16 +02:00
gellert
2190c4dd8d adds destructors + more code cleanup 2016-07-30 00:51:19 +02:00
Heilig Benedek
70656dc991 revert framesubscription 2016-07-29 19:54:35 +02:00
gellert
6abf7475b8 cleaning up osr pt1 2016-07-29 14:50:27 +02:00
Cheng Zhao
ea6e6dab8c Merge pull request #6644 from electron/webcontents-is-focused-crash 
Check view before checking top level native window
 2016-07-29 11:08:11 +09:00
Cheng Zhao
72612ed2f5 Merge pull request #6637 from electron/check-window-class 
Check that window is an EventDispatchingWindow
 2016-07-29 10:42:36 +09:00
Cheng Zhao
5e7ee675f7 Update ico to include sizes for 125% DPI 2016-07-29 10:32:48 +09:00
Kevin Sawicki
5982e3a75e Fix typo in comment 2016-07-28 15:48:01 -07:00
Kevin Sawicki
bd2ce5327c Return early when render widget host view is null 2016-07-28 15:47:52 -07:00
Kevin Sawicki
5eaae8136e Check that window is an EventDispatchingWindow 2016-07-28 08:48:56 -07:00
Heilig Benedek
7b61c5c9d0 removed some junk and added offscreen webcontents type 2016-07-28 12:10:56 +02:00
Cheng Zhao
e73bd00854 Merge pull request #6629 from electron/download-item-get-save-path 
Set download item save path to selected path from dialog
 2016-07-28 15:23:43 +09:00
Kevin Sawicki
0ad8c66b65 Use selected dialog path as item save path 2016-07-27 17:31:26 -07:00
Heilig Benedek
0dbe4bc417 api base 2016-07-28 01:58:23 +02:00
gellert
c45d9555e7 cleans up class names 2016-07-27 20:31:03 +02:00
gellert
f90e62a7a5 apply fixes 2016-07-27 19:59:01 +02:00
gellert
6e1db86a77 fixes software output device rendering 2016-07-27 19:44:41 +02:00
Heilig Benedek
221714e141 added onpaint to software path 2016-07-27 19:19:53 +02:00
Heilig Benedek
783c9d9218 Merge branch 'speedup-gpu' of https://github.com/MaxWhere/electron into speedup-gpu 2016-07-27 18:25:28 +02:00
Heilig Benedek
da5c95710f software bump 2016-07-27 18:24:58 +02:00
gellert
d0bd4816cb adds tracing calls and osx fix 2016-07-27 18:02:54 +02:00
Heilig Benedek
a39bb35744 use electron nativewindow 2016-07-27 14:36:22 +02:00
Cheng Zhao
242ce4f818 Fix building on non-Windows 2016-07-27 19:55:05 +09:00
Cheng Zhao
ff5b8047a1 Throw exception when ReadShortcutLink failed 2016-07-27 16:32:32 +09:00
Cheng Zhao
25538fe7fb All fields are always returned 2016-07-27 16:23:35 +09:00
Cheng Zhao
60ba2d624e Initialize COM before using the API 2016-07-27 16:20:53 +09:00
Cheng Zhao
7f3443b138 Add shell.writeShortcutLink/readShortcutLink 2016-07-27 16:16:21 +09:00
Cheng Zhao
367f94aa76 Bump v1.3.1 2016-07-27 13:21:17 +09:00
Cheng Zhao
b8bafbc5a3 Merge pull request #6620 from electron/tray-highlight-toggle 
Add option to always highlight the tray icon
 2016-07-27 10:49:38 +09:00
Cheng Zhao
99b523176b Merge pull request #6619 from electron/web-contents-copy-image-at 
Add webContents.copyImageAt(x, y)
 2016-07-27 10:15:38 +09:00
Cheng Zhao
7994f087fb Merge pull request #6618 from electron/code-range-registration 
Only register code range in Windows crash reporter once
 2016-07-27 09:52:18 +09:00
Kevin Sawicki
c4e743d207 Add TODO to deprecate boolean param 2016-07-26 14:18:15 -07:00
Kevin Sawicki
8e1de88512 Correct typo in variable name 2016-07-26 14:17:41 -07:00
Kevin Sawicki
b2f9cce297 Add option to always highlight the tray icon 2016-07-26 13:51:43 -07:00
Kevin Sawicki
bde432b64d Add webContents.copyImageAt 2016-07-26 12:06:11 -07:00
Kevin Sawicki
7a1b796dd0 Change registered flag from InitBreakpad 2016-07-26 10:54:30 -07:00
Kevin Sawicki
8956388804 Only register code range once 2016-07-26 10:40:11 -07:00
gellert
8392ece321 updates impl to newer version of chromium 2016-07-26 16:52:43 +02:00
deepak1556
e65bc481a8 browser: initialize pref registry in brightray 2016-07-26 16:34:04 +05:30
Cheng Zhao
d2ce50e3dd c++11 styling 2016-07-26 13:32:17 +09:00
Cheng Zhao
0da1a772be Set page's font settings with system settings 2016-07-26 13:29:27 +09:00
gellert
9d83ce1676 resolves 2016-07-25 21:09:49 +02:00
gellert
8fb7872b84 removes logs and adds webcontentsview init 2016-07-25 19:58:21 +02:00
gellert
0ad0c79202 adds beginframe scheduling 2016-07-25 19:58:14 +02:00
gellert
9e10f211d7 removes commented includes 2016-07-25 19:44:44 +02:00
gellert
8090278708 breaks down osr api to separate files 2016-07-25 19:44:44 +02:00
gellert
14836cef02 using damage_rect 2016-07-25 19:44:44 +02:00
gellert
96e1ba9c14 gpu acclereted osr added 2016-07-25 19:44:44 +02:00
Heilig Benedek
5371921f8a speed(up) bump 2016-07-25 19:44:44 +02:00
Heilig Benedek
4a0f0063a0 speedup base 2016-07-25 19:44:44 +02:00
liusi
8129c27a4a Merge branch 'master' of https://github.com/electron/electron into restore-issue 2016-07-25 22:53:18 +08:00
liusi
2cc01eea30 issue 6574 - Window position doesn't restore correctly 2016-07-25 22:51:27 +08:00
gellert
6eba509d53 removes logs and adds webcontentsview init 2016-07-25 15:55:00 +02:00
Cheng Zhao
fd8cc63ca9 Merge pull request #6558 from deepak1556/session_proxy_patch 
session: add proxyBypassRules option to setProxy api
 2016-07-25 16:03:50 +09:00
Cheng Zhao
c497765dea Merge pull request #6524 from liusy182/painted-event-6426 
add "view-painted" event to WebContent.
 2016-07-25 16:02:50 +09:00
Cheng Zhao
c0f81d14e4 Bump v1.3.0 2016-07-25 12:57:10 +09:00
Cheng Zhao
0c1d91a895 display.h needs to be used together with screen.h 2016-07-22 23:37:20 +09:00
gellert
81be0bc123 adds beginframe scheduling 2016-07-22 13:55:58 +02:00
Cheng Zhao
cf6f4708bc Fix building on Windows 2016-07-21 11:20:43 -06:00
Cheng Zhao
6850500a65 Fix building on Linux 2016-07-21 07:09:01 -06:00
Cheng Zhao
d22dc6c7d3 Update to Chrome 52.0.2743.82 2016-07-21 06:07:05 -06:00
Cheng Zhao
f6f7b41f0a Fix compilation error after merge 2016-07-21 06:03:38 -06:00
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
Cheng Zhao
39bd2bee8e Avoid using CHECK in files using node headesr 
Node has its own CHECK macro which requires linking with node::Assert.
 2016-07-21 16:56:48 +09:00
Cheng Zhao
cef86f5257 Use node::FreeEnvironment 2016-07-21 16:43:21 +09:00
Cheng Zhao
5fc0201ca1 There is no node_extern.h anymore 2016-07-21 16:36:31 +09:00
Cheng Zhao
7d42797c1f Update node headers including 2016-07-21 00:57:34 -06:00
Cheng Zhao
498e9089b3 Bump v1.2.8 2016-07-20 23:57:08 -06:00
deepak1556
aa6d79a3d8 session: add proxyBypassRules option to setProxy api 2016-07-21 10:14:54 +05:30
gellert
504c79cae7 removes commented includes 2016-07-20 11:32:59 +02:00
gellert
84a5c50b62 breaks down osr api to separate files 2016-07-20 11:30:06 +02:00
gellert
7fc9df4f8f using damage_rect 2016-07-19 23:50:49 +02:00
Anthony Tseng
9e6f623a5c Using base::HexEncode() 2016-07-19 11:06:56 +08:00
Anthony Tseng
42eb0c3eae serial number in hex string 2016-07-18 23:42:42 +08:00
Cheng Zhao
2ed733fedc Redirect relaunch process's stdout to /dev/null 2016-07-18 08:46:01 -06:00
gellert
50dc71d1c2 gpu acclereted osr added 2016-07-18 16:16:23 +02:00
liusi
d335d7d706 add "view-painted" event to WebContent. 2016-07-18 14:54:52 +08:00
Cheng Zhao
4d46189928 Fix cpplint warnings 2016-07-15 22:47:40 +09:00
liusi
154daa8d6a make Session::ClearStorageData's callback optional 2016-07-15 14:13:56 +08:00
Cheng Zhao
d186a01815 Merge pull request #6497 from electron/windows-thumbnail 
Add setThumbnailClip API on Windows
 2016-07-15 10:18:39 +09:00
Cheng Zhao
5db758297f Merge pull request #6486 from MarshallOfSound/master 
Add a getFeedURL API for the autoUpdater
 2016-07-15 10:02:05 +09:00
Cheng Zhao
16e43a7f15 Merge pull request #6490 from wilsonpage/add-drop-text-support 
Add support for dropped text in osx
 2016-07-15 09:12:35 +09:00
Cheng Zhao
3ace677b41 Merge pull request #6474 from darkdh/cert_detail 
Add more detail attributes for certificate-error
 2016-07-15 08:45:36 +09:00
Kevin Sawicki
ccee3e1fc2 Document setThumbnailClip 2016-07-14 15:54:57 -07:00
Kevin Sawicki
86218fe773 win: Add setThumbnailClip window API 2016-07-14 15:50:31 -07:00
Wilson Page
90f8a7e828 Add support for dropped text in osx 2016-07-14 18:25:58 +01:00
Samuel Attard
fa7526202b Remove unnecessary method 2016-07-15 00:13:04 +12:00
Samuel Attard
51687e1bc9 Add the getFeedURL API for macOS and Windows 2016-07-15 00:04:48 +12:00
Anthony Tseng
02e89d60f1 Use CalculateFingerprint256() 2016-07-14 19:09:11 +08:00
Cheng Zhao
ba887dbde7 Merge pull request #6482 from deepak1556/webcontents_navigation_obs_patch 
webcontents: replace deprecated navigation observers
 2016-07-14 12:57:26 +09:00
Cheng Zhao
21a2feaf23 Merge pull request #6480 from electron/webcontents-focus 
Execute role-based menu items on focused web contents
 2016-07-14 12:47:07 +09:00
deepak1556
c8bf6edcc6 webcontents: replace deprecated navigation observers 2016-07-14 06:47:38 +05:30
Kevin Sawicki
7877fa7c0a Add webContents.isFocused() 2016-07-13 14:16:56 -07:00
Heilig Benedek
6e25aea49f speed(up) bump 2016-07-13 17:43:00 +02:00
Anthony Tseng
db39867ad9 Add more detail attributes for certificate-error 2016-07-13 22:14:47 +08:00
Cheng Zhao
6db75a3458 Fix building on Linux 2016-07-13 12:23:14 +09:00
Cheng Zhao
753e92c845 Add cache option for session 2016-07-13 12:23:14 +09:00
Cheng Zhao
e213e09c3e Add options to session.fromPartition 2016-07-13 12:23:14 +09:00
Cheng Zhao
00804e5f98 Move the ability to create BrowserContext to embedder 2016-07-13 12:23:14 +09:00
Cheng Zhao
400bb8d0f3 Hide in_memory parameter in native interface 2016-07-13 12:23:14 +09:00
Cheng Zhao
06a41cedab Move check of isReady to native code 2016-07-13 12:23:14 +09:00
Cheng Zhao
4ebb83e999 Move the warning of registerStandardSchemes to native code 2016-07-13 12:23:14 +09:00
Cheng Zhao
13e1818bf7 Bump v1.2.7 2016-07-13 12:22:42 +09:00
Cheng Zhao
e5ccb3fd5d Remove lock in AtomCertVerifier 2016-07-13 12:07:57 +09:00
Cheng Zhao
24c60019b7 Create AtomCertVerifier on IO thread 2016-07-13 12:05:57 +09:00
Kevin Sawicki
15f7dc6609 Initialize to constraints to current constraints 2016-07-12 16:36:25 -07:00
Kevin Sawicki
afd5e51d6a Add Browser namespace 2016-07-12 09:10:48 -07:00
Kevin Sawicki
3d358ee7ea Fix Windows compilation issues 2016-07-12 09:10:47 -07:00
Kevin Sawicki
af907163a2 Enable LoginItemSettings converter on all platforms 2016-07-12 09:10:47 -07:00
Kevin Sawicki
5a36c5596c Add initial windows login item implementation 2016-07-12 09:10:47 -07:00
Kevin Sawicki
64f9c6a1d7 Add get/setLoginItemSettings on all platforms 2016-07-12 09:10:47 -07:00
Cheng Zhao
3335792200 Remove some unneeded hacks for old OS X versions 2016-07-12 15:15:47 +09:00
Cheng Zhao
2ee8142136 Fix transparent window having border on OS X 10.9 2016-07-12 15:01:37 +09:00
Cheng Zhao
5a604f8e79 Destroy the native tray in next tick 2016-07-12 14:23:38 +09:00
Cheng Zhao
df0d2b89cd Merge pull request #6446 from electron/accessibility-api 
Add API for Chrome's accessibility support state
 2016-07-12 10:59:12 +09:00
Kevin Sawicki
f5d371e180 Remove linter warnings 2016-07-11 14:46:28 -07:00
Kevin Sawicki
131bff48ea IsAccessibilitySupportEnabled -> isAccessibilitySupportEnabled 2016-07-11 14:44:32 -07:00
Kevin Sawicki
34f7ddec9f Update API to isAccessibilitySupportEnabled 2016-07-11 14:32:14 -07:00
Kevin Sawicki
3fcbac78ac Implement accessiblity change events on Windows 2016-07-11 14:23:25 -07:00
Kevin Sawicki
68d7ae75b0 Implement accessiblity change events on mac 2016-07-11 14:09:01 -07:00
Kevin Sawicki
fc36ac8c1b Add API for accessibility state and changes 2016-07-11 14:04:56 -07:00
Milan Burda
38016b8144 Remove unnecessary >= Windows Vista check 2016-07-11 18:23:33 +02:00
Cheng Zhao
5208bbd2e8 Remove unneeded include 2016-07-11 17:13:21 +09:00
Cheng Zhao
86338290fb win: Fix openExternal not working with non-ASCII characters 2016-07-11 17:12:11 +09:00
Cheng Zhao
31e67788a2 mac: Do not change window size when in fullscreen 2016-07-11 16:44:42 +09:00
Cheng Zhao
381366daf1 Fix indention 2016-07-11 16:43:01 +09:00
Cheng Zhao
db8787fce1 The fullscreen button should always be hidden for frameless window 2016-07-11 16:00:29 +09:00
Cheng Zhao
8269e7b1ef Suppress unresponsive event when showing menu 2016-07-11 15:31:24 +09:00
Cheng Zhao
7848608198 Replace DialogScope with UnresponsiveSuppressor 
The latter is global-wide.
 2016-07-11 15:29:03 +09:00
Cheng Zhao
fc72df3ba1 win: Use FOS_FORCESHOWHIDDEN for showHiddenFiles 2016-07-11 13:49:51 +09:00
Cheng Zhao
6e0fadbe26 gtk: Set show-hidden property for showHiddenFiles 2016-07-11 13:47:24 +09:00
Cheng Zhao
f08ac07737 mac: Add showHiddenFiles property for showOpenDialog 2016-07-11 13:30:18 +09:00
Cheng Zhao
a1a870fe43 Auto-hide menubar when in fullscreen 2016-07-11 13:10:19 +09:00
Cheng Zhao
e8e2763131 win: Add toolbar type for BrowserWindow 2016-07-11 12:46:50 +09:00
Haojian Wu
4ac4dacffe Some manual change to for-ranged loop. 
Use "const auto&" where possible.
 2016-07-10 15:57:51 +02:00
Haojian Wu
55b3f1936f Modernize to C++11: Use for-range loop. 2016-07-10 13:33:15 +02:00
Haojian Wu
3bdeac98bf Modernize to C++11: use override. 2016-07-10 13:21:42 +02:00
Haojian Wu
04f9d35312 Modernize to C++11: Use auto key to improve code readability and maintainability. 2016-07-10 13:11:47 +02:00
Haojian Wu
fab02809c6 Modernize to C++11: NULL => nullptr. 
No functional change.
 2016-07-10 11:57:04 +02:00
Cheng Zhao
f77b9db069 Fix unmaximize() not working 2016-07-09 23:16:57 +09:00
Cheng Zhao
5979c1464f Remember bounds instead of size 2016-07-09 23:10:36 +09:00
Cheng Zhao
c4de246bfb Correctly handle unmaximize 2016-07-09 23:04:42 +09:00
Cheng Zhao
baff744601 Use setBounds to implement maximize for window without thickFrame 2016-07-09 22:49:55 +09:00
Cheng Zhao
2ece9e2885 Add thickFrame option 2016-07-09 21:49:15 +09:00
Cheng Zhao
54f74e8160 Redirect relaunch process's stdout to /dev/null 2016-07-09 17:59:40 +09:00