Updated CEF 1 linux 64bit to Branch 1453, Chrome version 27.0.1453.93,

Czarek · Czarek · commit afb6a644696d · 2013-06-03T13:53:54.000+02:00
CEF revision 1268.

Fix to the create-setup.py script.
diff --git a/cefpython/.gitignore b/cefpython/.gitignore
@@ -31,3 +31,8 @@ ctags
 *.generated
 
 cython_debug/
+
+cefpython_py27.pyd
+cefpython_py32.pyd
+cefpython_py27.so
+cefpython_py32.so
diff --git a/cefpython/cef1/BUILD_COMPATIBILITY.txt b/cefpython/cef1/BUILD_COMPATIBILITY.txt
@@ -1,8 +1,8 @@
 Chromium/CEF branch:
-    1364
+    1453
 Chromium release url:
-    http://src.chromium.org/svn/releases/25.0.1364.172
+    http://src.chromium.org/svn/releases/27.0.1453.93
 CEF revision:
-    1248    
+    1268
 CEF repository url:
-    http://chromiumembedded.googlecode.com/svn/branches/1364/cef1@1248
+    http://chromiumembedded.googlecode.com/svn/branches/1453/cef1@1268
diff --git a/cefpython/cef1/include/cef_version.h b/cefpython/cef1/include/cef_version.h
@@ -35,13 +35,13 @@
 #ifndef CEF_INCLUDE_CEF_VERSION_H_
 #define CEF_INCLUDE_CEF_VERSION_H_
 
-#define CEF_REVISION 1123
+#define CEF_REVISION 1268
 #define COPYRIGHT_YEAR 2013
 
-#define CHROME_VERSION_MAJOR 25
+#define CHROME_VERSION_MAJOR 27
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 1364
-#define CHROME_VERSION_PATCH 152
+#define CHROME_VERSION_BUILD 1453
+#define CHROME_VERSION_PATCH 93
 
 #define DO_MAKE_STRING(p) #p
 #define MAKE_STRING(p) DO_MAKE_STRING(p)
diff --git a/cefpython/cef1/include/internal/cef_types.h b/cefpython/cef1/include/internal/cef_types.h
@@ -471,11 +471,6 @@ typedef struct _cef_browser_settings_t {
   ///
   bool accelerated_2d_canvas_disabled;
 
-  ///
-  // Set to true (1) to disable accelerated painting.
-  ///
-  bool accelerated_painting_disabled;
-
   ///
   // Set to true (1) to disable accelerated filters.
   ///
diff --git a/cefpython/cef1/include/internal/cef_types_wrappers.h b/cefpython/cef1/include/internal/cef_types_wrappers.h
@@ -403,7 +403,6 @@ struct CefBrowserSettingsTraits {
     target->accelerated_video_disabled = src->accelerated_video_disabled;
     target->accelerated_2d_canvas_disabled =
         src->accelerated_2d_canvas_disabled;
-    target->accelerated_painting_disabled = src->accelerated_painting_disabled;
     target->accelerated_filters_disabled = src->accelerated_filters_disabled;
     target->accelerated_plugins_disabled = src->accelerated_plugins_disabled;
     target->developer_tools_disabled = src->developer_tools_disabled;
diff --git a/cefpython/cef1/linux/binaries_32bit/cefpython_py27.py b/cefpython/cef1/linux/binaries_32bit/cefpython_py27.py
@@ -91,7 +91,6 @@ def GetModuleDirectory():
     "accelerated_compositing_enabled": False,
     "accelerated_filters_disabled": False,
     "accelerated_layers_disabled": False,
-    "accelerated_painting_disabled": False,
     "accelerated_plugins_disabled": False,
     "accelerated_video_disabled": False,
     "animation_frame_rate": 0,
diff --git a/cefpython/cef1/linux/binaries_64bit/cefpython_py27.py b/cefpython/cef1/linux/binaries_64bit/cefpython_py27.py
@@ -91,7 +91,6 @@ def GetModuleDirectory():
     "accelerated_compositing_enabled": False,
     "accelerated_filters_disabled": False,
     "accelerated_layers_disabled": False,
-    "accelerated_painting_disabled": False,
     "accelerated_plugins_disabled": False,
     "accelerated_video_disabled": False,
     "animation_frame_rate": 0,
diff --git a/cefpython/cef1/linux/installer/create-setup.py b/cefpython/cef1/linux/installer/create-setup.py
@@ -65,11 +65,11 @@ def main():
     print("Copying binaries to package dir")
     ret = os.system("cp -rf "+binaries_dir+"/* "+package_dir)
     assert ret == 0
-    
+
     os.chdir(package_dir)
     print("Removing .log files from the package dir")
     ret = os.system("rm *.log")
-    assert ret == 0
+    # assert ret == 0 - if there are no .log files this assert would fail.
     os.chdir(installer_dir)
 
     print("Creating __init__.py from template")
diff --git a/cefpython/cef1/linux/setup/setup.py b/cefpython/cef1/linux/setup/setup.py
@@ -43,18 +43,18 @@ def CompileTimeConstants():
     ["cefpython.pyx"],
 
     cython_directives={
-        "c_string_type": C_STRING_TYPE, 
+        "c_string_type": C_STRING_TYPE,
         "c_string_encoding": C_STRING_ENCODING,
     },
 
     language='c++',
     include_dirs=[
-        r'./../', 
-        r'./../../', 
-        r'./../../../', 
+        r'./../',
+        r'./../../',
+        r'./../../../',
         r'./../../../cython_includes/',
-        '/usr/include/gtk-2.0', 
-        '/usr/include/glib-2.0', 
+        '/usr/include/gtk-2.0',
+        '/usr/include/glib-2.0',
         '/usr/lib/i386-linux-gnu/gtk-2.0/include',
         '/usr/lib/i386-linux-gnu/glib-2.0/include',
         '/usr/include/cairo',
@@ -78,7 +78,7 @@ def CompileTimeConstants():
         'cef_dll_wrapper',
         'v8function_handler',
         'client_handler',
-        'cpp_utils'        
+        'cpp_utils'
     ],
 
     # Loading libcef.so will only work when running scripts from the same
diff --git a/cefpython/cef1/windows/binaries/cefpython_py27.py b/cefpython/cef1/windows/binaries/cefpython_py27.py
@@ -91,7 +91,6 @@ def GetModuleDirectory():
     "accelerated_compositing_enabled": False,
     "accelerated_filters_disabled": False,
     "accelerated_layers_disabled": False,
-    "accelerated_painting_disabled": False,
     "accelerated_plugins_disabled": False,
     "accelerated_video_disabled": False,
     "animation_frame_rate": 0,
diff --git a/cefpython/cef1/windows/binaries/cefpython_py32.py b/cefpython/cef1/windows/binaries/cefpython_py32.py
@@ -88,7 +88,6 @@ def Shutdown():
     "accelerated_compositing_enabled": False,
     "accelerated_filters_disabled": False,
     "accelerated_layers_disabled": False,
-    "accelerated_painting_disabled": False,
     "accelerated_plugins_disabled": False,
     "accelerated_video_disabled": False,
     "animation_frame_rate": 0,
@@ -805,7 +804,7 @@ def RenderHandler_OnPopupShow(browser, show):
 def RenderHandler_OnPopupSize(browser, rect):
     return None
 
-def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects, 
+def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects,
         paintBuffer):
     return None
 
diff --git a/cefpython/cef1_api.py b/cefpython/cef1_api.py
@@ -91,7 +91,6 @@ def GetModuleDirectory():
     "accelerated_compositing_enabled": False,
     "accelerated_filters_disabled": False,
     "accelerated_layers_disabled": False,
-    "accelerated_painting_disabled": False,
     "accelerated_plugins_disabled": False,
     "accelerated_video_disabled": False,
     "animation_frame_rate": 0,
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -6,7 +6,7 @@
 #
 # - cdef/cpdef functions returning something other than a Python object
 #   should have in its declaration "except *", otherwise exceptions are
-#   ignored. Those cdef/cpdef that return "object" have "except *" by 
+#   ignored. Those cdef/cpdef that return "object" have "except *" by
 #   default. The setup/compile.py script will check for functions missing
 #   "except *" and will display an error message about that, but it's
 #   not perfect and won't detect all cases.
@@ -39,6 +39,13 @@
 # - CefString.c_str() is safe to use only on Windows, on Ubuntu 64bit
 #   for a "Pers" string it returns: "P\x00e\x00r\x00s\x00", which is
 #   most probably not what you expected.
+#
+# - You can rename methods when importing in pxd files:
+#   | cdef cppclass _Object "Object":
+#
+# - Supporting operators that are not yet supported:
+#   | CefRefPtr[T]& Assign "operator="(T* p)
+#   | cefBrowser.Assign(CefBrowser*)
 
 # Global variables.
 
diff --git a/cefpython/cython_includes/cef_ptr.pxd b/cefpython/cython_includes/cef_ptr.pxd
@@ -9,7 +9,7 @@ cdef extern from "include/internal/cef_ptr.h":
         CefRefPtr()
         CefRefPtr(T* p)
         CefRefPtr(const CefRefPtr[T]& r)
-        CefRefPtr[T]& Assign "operator="(T* p)
+        CefRefPtr[T]& Assign "operator="(T* p) # cefBrowser.Assign(CefBrowser*)
         T* get()
         void swap(CefRefPtr[T]& r)
 
diff --git a/cefpython/cython_includes/cef_types_wrappers.pxd b/cefpython/cython_includes/cef_types_wrappers.pxd
@@ -108,7 +108,6 @@ cdef extern from "include/internal/cef_types_wrappers.h":
             cpp_bool accelerated_layers_disabled
             cpp_bool accelerated_video_disabled
             cpp_bool accelerated_2d_canvas_disabled
-            cpp_bool accelerated_painting_disabled
             cpp_bool accelerated_filters_disabled
             cpp_bool accelerated_plugins_disabled
             cpp_bool developer_tools_disabled
diff --git a/cefpython/settings.pyx b/cefpython/settings.pyx
@@ -276,8 +276,6 @@ cdef void SetBrowserSettings(
                 cefBrowserSettings.accelerated_video_disabled = bool(browserSettings[key])
             elif key == "accelerated_2d_canvas_disabled":
                 cefBrowserSettings.accelerated_2d_canvas_disabled = bool(browserSettings[key])
-            elif key == "accelerated_painting_disabled":
-                cefBrowserSettings.accelerated_painting_disabled = bool(browserSettings[key])
             elif key == "accelerated_filters_disabled":
                 cefBrowserSettings.accelerated_filters_disabled = bool(browserSettings[key])
             elif key == "accelerated_plugins_disabled":
