Skip to content

Commit e3d50a5

Browse files
committed
Work on offscreen rendering is not yet finished (Issue 36).
Changed visual C runtime DLLs to version 9.0.21022.8, the version 9.0.30729.6161 might have caused conflicts, as manifest embedded in python binaries points to version 9.0.21022.8 (Issue 37). Changes in cefpython module: CreateBrowser() renamed to CreateBrowserSync(), the first param windowID changed to WindowInfo class. GetBrowserByWindowID() renamed to GetBrowserByWindowHandle(). Changes in Frame object: GetURL() renamed to GetUrl(), LoadURL() renamed to LoadUrl(). Changes in Browser object: GetOpenerWindowID() renamed to GetOpenerWindowHandle(). GetWindowID() was removed (the substitute is to call SetUserData()/GetUserData on the browser object after the call to CreateBrowserSync, see cefadvanced.py example). GetInnerWindowID() renamed to GetWindowHandle().
1 parent 63ee3ba commit e3d50a5

57 files changed

Lines changed: 2297 additions & 1553 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cefpython/browser.pyx

Lines changed: 222 additions & 286 deletions
Large diffs are not rendered by default.

cefpython/cef1/include/cef_browser.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ class CefBrowser : public virtual CefBase {
147147
/*--cef()--*/
148148
virtual CefWindowHandle GetOpenerWindowHandle() =0;
149149

150+
///
151+
// Returns the globally unique identifier for this browser.
152+
///
153+
/*--cef()--*/
154+
virtual int GetIdentifier() =0;
155+
150156
///
151157
// Returns true if the window is a popup window.
152158
///

cefpython/cef1/include/cef_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#ifndef CEF_INCLUDE_CEF_VERSION_H_
3636
#define CEF_INCLUDE_CEF_VERSION_H_
3737

38-
#define CEF_REVISION 931
38+
#define CEF_REVISION 942
3939
#define COPYRIGHT_YEAR 2012
4040

4141
#define CHROME_VERSION_MAJOR 23
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
33
<noInheritable></noInheritable>
4-
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
5-
<file name="msvcr90.dll" hashalg="SHA1" hash="7021457b391b35606e708c69987e4b6f606609ee"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>S83+LBs1RkUxSkzia1WysaAhLbk=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="88549dd3ce8eaa62ca8aad0e96ddd9fec2203628"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>cKyCmIKF+fcGn6qaBhKuun+wAcQ=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="65ef374affa5b48827e539b35b3275c201b41fc9"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>r+4y/NnOFgaANxNXoHL1jF95DUg=</dsig:DigestValue></asmv2:hash></file>
4+
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
5+
<file name="msvcr90.dll" hashalg="SHA1" hash="e0dcdcbfcb452747da530fae6b000d47c8674671"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>KSaO8M0iCtPF6YEr79P1dZsnomY=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="81efe890e4ef2615c0bb4dda7b94bea177c86ebd"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>ojDmTgpYMFRKJYkPcM6ckpYkWUU=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="5470081b336abd7b82c6387567a661a729483b04"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>tVogb8kezDre2mXShlIqpp8ErIg=</dsig:DigestValue></asmv2:hash></file>
66
</assembly>
Lines changed: 80 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,60 @@
1-
CEF Python binary distribution
2-
------------------------------
1+
Chromium Embedded Framework (CEF) Binary Distribution
2+
-------------------------------------------------------------------------------
33

4-
EXAMPLES
4+
Date: $DATE$
5+
6+
CEF Version: $CEF_VER$
7+
CEF URL: $CEF_URL$@$CEF_REV$
8+
9+
Chromium Verison: $CHROMIUM_VER$
10+
Chromium URL: $CHROMIUM_URL$@$CHROMIUM_REV$
11+
12+
13+
This distribution contains all components necessary to build and distribute an
14+
application using CEF. Please see the LICENSING section of this document for
15+
licensing terms and conditions.
16+
17+
18+
CONTENTS
519
--------
620

7-
Examples using pywin32 extension:
8-
- cefsimple.py
9-
- cefadvanced.py
21+
cefclient Contains the cefclient sample application configured to build
22+
using the files in this distribution.
23+
24+
Debug Contains libcef.dll and other components required to run the debug
25+
version of CEF-based applications. Also acts as the build target for
26+
the Debug build of cefclient.
27+
28+
docs Contains C++ API documentation generated from the CEF header files.
29+
30+
include Contains all required CEF and NPAPI-related header files. Read
31+
the include/internal/npapi/README-TRANSFER.txt file for more
32+
information about the NPAPI-related header files.
33+
34+
lib Contains Debug and Release versions of the libcef.lib library file
35+
that all CEF-based applications must link against.
36+
37+
libcef_dll Contains the source code for the libcef_dll_wrapper static library
38+
that all applications using the CEF C++ API must link against.
39+
40+
Release Contains libcef.dll and other components required to run the release
41+
version of CEF-based applications. Also acts as the build target for
42+
the Release build of cefclient.
43+
44+
45+
USAGE
46+
-----
1047

11-
Embedding CEF in GUI frameworks:
12-
- pygtk_.py
13-
- wxpython.py
14-
- pyqt.py
15-
- pyside.py
48+
Visual Studio 2010: Open the cefclient2010.sln solution and build.
49+
Visual Studio 2008: Open the cefclient2008.sln solution and build.
50+
* If using VS2008 Express Edition add atlthunk.lib to the cefclient
51+
Configuration Properties > Linker > Input > Additional Dependencies
52+
Visual Studio 2005: Open the cefclient2005.sln solution and build.
1653

17-
A test browser:
18-
- cefclient.exe
54+
Please visit the CEF Website for additional usage information.
1955

20-
HELP
21-
----
56+
http://code.google.com/p/chromiumembedded
2257

23-
Project's website: http://code.google.com/p/cefpython/
24-
Wiki pages: http://code.google.com/p/cefpython/w/list
25-
Help forum: https://groups.google.com/group/cefpython?hl=en
26-
Report bugs, star issues: http://code.google.com/p/cefpython/issues/list
2758

2859
REDISTRIBUTION
2960
--------------
@@ -36,66 +67,46 @@ features will not be used.
3667
Required components:
3768

3869
* CEF core library
39-
libcef.dll
70+
libcef.dll
4071

4172
* Unicode support
42-
icudt.dll
73+
icudt.dll
4374

44-
* Localized resources
45-
locales/
75+
Optional components:
4676

47-
Note: A .pak file is loaded from this folder based on the value of
48-
ApplicationSettings.locale. Only configured locales need to be distributed. If no
49-
locale is configured the default locale of "en-US" will be used. The
50-
locales folder must exist in the same directory as libcef.dll.
77+
* Localized resources
78+
locales/
79+
Note: Contains localized strings for WebKit UI controls. A .pak file is loaded
80+
from this folder based on the CefSettings.locale value. Only configured
81+
locales need to be distributed. If no locale is configured the default locale
82+
of "en-US" will be used. Locale file loading can be disabled completely using
83+
CefSettings.pack_loading_disabled. The locales folder path can be customized
84+
using CefSettings.locales_dir_path.
5185

5286
* Other resources
53-
devtools_resources.pak
54-
55-
Note: Contains WebKit image and inspector resources. Pack file loading can be
56-
disabled completely using CefSettings.pack_loading_disabled. The resources
57-
directory path can be customized using CefSettings.resources_dir_path.
58-
59-
* cefpython.pyd - cefpython library compiled using Cython extension,
60-
this is a dll-like file in python world.
61-
* cefwindow.py - functions to create window using pywin32 extension.
62-
63-
* Manifest and msvcr90.dll are dependencies of cefpython.pyd:
64-
Microsoft.VC90.CRT.manifest
65-
msvcm90.dll (not really required but must be redistributed together)
66-
msvcp90.dll (not really required but must be redistributed together)
67-
msvcr90.dll
68-
69-
Optional components:
87+
devtools_resources.pak
88+
Note: Contains WebKit image and inspector resources. Pack file loading can be
89+
disabled completely using CefSettings.pack_loading_disabled. The resources
90+
directory path can be customized using CefSettings.resources_dir_path.
7091

7192
* Angle and Direct3D support
72-
d3dcompiler_43.dll
73-
d3dx9_43.dll
74-
libEGL.dll
75-
libGLESv2.dll
76-
77-
Note: Without these components the default ANGLE_IN_PROCESS graphics
78-
implementation for HTML5 accelerated content like 2D canvas, 3D CSS and
79-
WebGL will not function. To use the desktop GL graphics implementation which
80-
does not require these components (and does not work on all systems) set
81-
CefSettings.graphics_implementation to DESKTOP_IN_PROCESS.
82-
83-
Test components:
84-
85-
* cefclient application that does not need to be redistributed.
86-
cefclient.exe
93+
d3dcompiler_43.dll
94+
d3dx9_43.dll
95+
libEGL.dll
96+
libGLESv2.dll
97+
Note: Without these components the default ANGLE_IN_PROCESS graphics
98+
implementation for HTML5 accelerated content like 2D canvas, 3D CSS and
99+
WebGL will not function. To use the desktop GL graphics implementation which
100+
does not require these components (and does not work on all systems) set
101+
CefSettings.graphics_implementation to DESKTOP_IN_PROCESS.
87102

88103

89-
ICON
90-
----
91-
92-
icon.ico is from "FS Ubuntu Icons" by Frank Souza.
93-
Licensed under GNU General Public License.
94-
95104
LICENSING
96105
---------
97106

98-
The CEF Python project is BSD licensed (http://opensource.org/licenses/BSD-3-Clause).
99-
Other software included in this distribution is provided under other licenses.
100-
Please visit the below link for complete Chromium and third-party licensing information:
101-
http://code.google.com/chromium/terms.html
107+
The CEF project is BSD licensed. Please read the LICENSE.txt file included with
108+
this binary distribution for licensing terms and conditions. Other software
109+
included in this distribution is provided under other licenses. Please visit the
110+
below link for complete Chromium and third-party licensing information.
111+
112+
http://code.google.com/chromium/terms.html

0 commit comments

Comments
 (0)