Skip to content

Commit c756c6d

Browse files
cztomczakcztomczak
committed
Updated to Chrome 25.0.1364.68, CEF 3 branch 1364 revision 1094.
Updated wxPython example, added USE_EVT_IDLE constant, read the comment for an explanation of a use case.
1 parent de99944 commit c756c6d

33 files changed

+1448
-1613
lines changed

‎cefpython/cef1/windows/binaries/README.txt‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Chromium Embedded Framework (CEF) Binary Distribution
22
-------------------------------------------------------------------------------
33

4+
Date: March 04, 2013
5+
6+
CEF Version: 1.1364.1123
7+
CEF URL: https://chromiumembedded.googlecode.com/svn/branches/1364/cef1@1123
8+
9+
Chromium Verison: 25.0.1364.152
10+
Chromium URL: http://src.chromium.org/svn/branches/1364/src@185281
11+
12+
413
This distribution contains all components necessary to build and distribute an
514
application using CEF. Please see the LICENSING section of this document for
615
licensing terms and conditions.
@@ -36,11 +45,18 @@ Release Contains libcef.dll and other components required to run the release
3645
USAGE
3746
-----
3847

39-
Visual Studio 2010: Open the cefclient2010.sln solution and build.
40-
Visual Studio 2008: Open the cefclient2008.sln solution and build.
41-
* If using VS2008 Express Edition add atlthunk.lib to the cefclient
42-
Configuration Properties > Linker > Input > Additional Dependencies
43-
Visual Studio 2005: Open the cefclient2005.sln solution and build.
48+
Visual Studio 2012 and Visual Studio 2010:
49+
Open the cefclient2010.sln solution in Visual Studio and build.
50+
51+
Visual Studio 2008:
52+
Open the cefclient2008.sln solution in Visual Studio and build.
53+
54+
Visual Studio 2005:
55+
1. Open the cefclient.vcproj and libcef_dll_wrapper.vcproj files in a text
56+
editor. Change Version="9.00" to Version="8.00".
57+
2. Open the cefclient2005.sln file in a text editor. Change "Version 9.00" to
58+
"Version 8.00".
59+
3. Open the cefclient2005.sln solution in Visual Studio and build.
4460

4561
Please visit the CEF Website for additional usage information.
4662

@@ -100,4 +116,4 @@ this binary distribution for licensing terms and conditions. Other software
100116
included in this distribution is provided under other licenses. Please visit the
101117
below link for complete Chromium and third-party licensing information.
102118

103-
http://code.google.com/chromium/terms.html
119+
http://code.google.com/chromium/terms.html

‎cefpython/cef3/include/cef_application_mac.h‎

Lines changed: 0 additions & 137 deletions
This file was deleted.

‎cefpython/cef3/include/cef_browser.h‎

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@ class CefBrowser : public virtual CefBase {
117117
/*--cef()--*/
118118
virtual int GetIdentifier() =0;
119119

120+
///
121+
// Returns true if this object is pointing to the same handle as |that|
122+
// object.
123+
///
124+
/*--cef()--*/
125+
virtual bool IsSame(CefRefPtr<CefBrowser> that) =0;
126+
120127
///
121128
// Returns true if the window is a popup window.
122129
///
@@ -211,14 +218,16 @@ class CefRunFileDialogCallback : public virtual CefBase {
211218
class CefBrowserHost : public virtual CefBase {
212219
public:
213220
typedef cef_file_dialog_mode_t FileDialogMode;
221+
typedef cef_mouse_button_type_t MouseButtonType;
222+
typedef cef_paint_element_type_t PaintElementType;
214223

215224
///
216225
// Create a new browser window using the window parameters specified by
217226
// |windowInfo|. All values will be copied internally and the actual window
218227
// will be created on the UI thread. This method can be called on any browser
219228
// process thread and will not block.
220229
///
221-
/*--cef(optional_param=url)--*/
230+
/*--cef(optional_param=client,optional_param=url)--*/
222231
static bool CreateBrowser(const CefWindowInfo& windowInfo,
223232
CefRefPtr<CefClient> client,
224233
const CefString& url,
@@ -229,7 +238,7 @@ class CefBrowserHost : public virtual CefBase {
229238
// |windowInfo|. This method can only be called on the browser process UI
230239
// thread.
231240
///
232-
/*--cef(optional_param=url)--*/
241+
/*--cef(optional_param=client,optional_param=url)--*/
233242
static CefRefPtr<CefBrowser> CreateBrowserSync(
234243
const CefWindowInfo& windowInfo,
235244
CefRefPtr<CefClient> client,
@@ -241,7 +250,7 @@ class CefBrowserHost : public virtual CefBase {
241250
///
242251
/*--cef()--*/
243252
virtual CefRefPtr<CefBrowser> GetBrowser() =0;
244-
253+
245254
///
246255
// Call this method before destroying a contained browser window. This method
247256
// performs any internal cleanup that may be needed before the browser window
@@ -329,6 +338,75 @@ class CefBrowserHost : public virtual CefBase {
329338
const CefString& default_file_name,
330339
const std::vector<CefString>& accept_types,
331340
CefRefPtr<CefRunFileDialogCallback> callback) =0;
341+
342+
///
343+
// Returns true if window rendering is disabled.
344+
///
345+
/*--cef()--*/
346+
virtual bool IsWindowRenderingDisabled() =0;
347+
348+
///
349+
// Notify the browser that the widget has been resized. The browser will first
350+
// call CefRenderHandler::GetViewRect to get the new size and then call
351+
// CefRenderHandler::OnPaint asynchronously with the updated regions. This
352+
// method is only used when window rendering is disabled.
353+
///
354+
/*--cef()--*/
355+
virtual void WasResized() =0;
356+
357+
///
358+
// Invalidate the |dirtyRect| region of the view. The browser will call
359+
// CefRenderHandler::OnPaint asynchronously with the updated regions. This
360+
// method is only used when window rendering is disabled.
361+
///
362+
/*--cef()--*/
363+
virtual void Invalidate(const CefRect& dirtyRect, PaintElementType type) =0;
364+
365+
///
366+
// Send a key event to the browser.
367+
///
368+
/*--cef()--*/
369+
virtual void SendKeyEvent(const CefKeyEvent& event) =0;
370+
371+
///
372+
// Send a mouse click event to the browser. The |x| and |y| coordinates are
373+
// relative to the upper-left corner of the view.
374+
///
375+
/*--cef()--*/
376+
virtual void SendMouseClickEvent(const CefMouseEvent& event,
377+
MouseButtonType type,
378+
bool mouseUp, int clickCount) =0;
379+
380+
///
381+
// Send a mouse move event to the browser. The |x| and |y| coordinates are
382+
// relative to the upper-left corner of the view.
383+
///
384+
/*--cef()--*/
385+
virtual void SendMouseMoveEvent(const CefMouseEvent& event,
386+
bool mouseLeave) =0;
387+
388+
///
389+
// Send a mouse wheel event to the browser. The |x| and |y| coordinates are
390+
// relative to the upper-left corner of the view. The |deltaX| and |deltaY|
391+
// values represent the movement delta in the X and Y directions respectively.
392+
// In order to scroll inside select popups with window rendering disabled
393+
// CefRenderHandler::GetScreenPoint should be implemented properly.
394+
///
395+
/*--cef()--*/
396+
virtual void SendMouseWheelEvent(const CefMouseEvent& event,
397+
int deltaX, int deltaY) =0;
398+
399+
///
400+
// Send a focus event to the browser.
401+
///
402+
/*--cef()--*/
403+
virtual void SendFocusEvent(bool setFocus) =0;
404+
405+
///
406+
// Send a capture lost event to the browser.
407+
///
408+
/*--cef()--*/
409+
virtual void SendCaptureLostEvent() =0;
332410
};
333411

334412
#endif // CEF_INCLUDE_CEF_BROWSER_H_

‎cefpython/cef3/include/cef_browser_process_handler.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
#include "include/cef_base.h"
4242
#include "include/cef_command_line.h"
43-
#include "include/cef_proxy_handler.h"
4443
#include "include/cef_values.h"
4544

4645
///
@@ -50,16 +49,6 @@
5049
/*--cef(source=client)--*/
5150
class CefBrowserProcessHandler : public virtual CefBase {
5251
public:
53-
///
54-
// Return the handler for proxy events. If no handler is returned the default
55-
// system handler will be used. This method is called on the browser process
56-
// IO thread.
57-
///
58-
/*--cef()--*/
59-
virtual CefRefPtr<CefProxyHandler> GetProxyHandler() {
60-
return NULL;
61-
}
62-
6352
///
6453
// Called on the browser process UI thread immediately after the CEF context
6554
// has been initialized.

‎cefpython/cef3/include/cef_client.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include "include/cef_life_span_handler.h"
5151
#include "include/cef_load_handler.h"
5252
#include "include/cef_process_message.h"
53+
#include "include/cef_render_handler.h"
5354
#include "include/cef_request_handler.h"
5455

5556
///
@@ -143,6 +144,14 @@ class CefClient : public virtual CefBase {
143144
return NULL;
144145
}
145146

147+
///
148+
// Return the handler for off-screen rendering events.
149+
///
150+
/*--cef()--*/
151+
virtual CefRefPtr<CefRenderHandler> GetRenderHandler() {
152+
return NULL;
153+
}
154+
146155
///
147156
// Return the handler for browser request events.
148157
///

‎cefpython/cef3/include/cef_display_handler.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ class CefDisplayHandler : public virtual CefBase {
7878
// text that will be displayed in the tooltip. To handle the display of the
7979
// tooltip yourself return true. Otherwise, you can optionally modify |text|
8080
// and then return false to allow the browser to display the tooltip.
81+
// When window rendering is disabled the application is responsible for
82+
// drawing tooltips and the return value is ignored.
8183
///
8284
/*--cef(optional_param=text)--*/
8385
virtual bool OnTooltip(CefRefPtr<CefBrowser> browser,

‎cefpython/cef3/include/cef_download_item.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@ class CefDownloadItem : public virtual CefBase {
143143
///
144144
/*--cef()--*/
145145
virtual CefString GetMimeType() =0;
146-
147-
///
148-
// Returns the referrer character set.
149-
///
150-
/*--cef()--*/
151-
virtual CefString GetReferrerCharset() =0;
152146
};
153147

154148
#endif // CEF_INCLUDE_CEF_DOWNLOAD_ITEM_H_

0 commit comments

Comments
 (0)