codeit
diff --git a/Collapse file
‎cefpython/browser.pyx‎
Copy file name to clipboardExpand all lines: cefpython/browser.pyx
+22-15Lines changed: 22 additions & 15 deletions b/Collapse file
‎cefpython/browser.pyx‎
Copy file name to clipboardExpand all lines: cefpython/browser.pyx
+22-15Lines changed: 22 additions & 15 deletions
diff --git a/Collapse file
‎cefpython/frame.pyx‎
Copy file name to clipboardExpand all lines: cefpython/frame.pyx
+12-42Lines changed: 12 additions & 42 deletions b/Collapse file
‎cefpython/frame.pyx‎
Copy file name to clipboardExpand all lines: cefpython/frame.pyx
+12-42Lines changed: 12 additions & 42 deletions
@@ -4,7 +4,7 @@
 
 IF CEF_VERSION == 1:
     # In CEF 1 there are both KT_KEYDOWN and KEYEVENT_KEYDOWN, and
-    # these are different constants, making a bit of confusion. 
+    # these are different constants, making a bit of confusion.
     # In CEF 1 KT_ is for SendKeyEvent, KEYEVENT_ is for OnKeyEvent().
     # In CEF 3 there are only KEYEVENT_* constants.
     KEYTYPE_KEYDOWN = cef_types.KT_KEYDOWN
@@ -179,7 +179,7 @@ cdef class PyBrowser:
     # -------------------------------------------------------------------------
     # CEF 1
     # -------------------------------------------------------------------------
-    cpdef py_void SetClientCallback_CEF1(self, 
+    cpdef py_void SetClientCallback_CEF1(self,
             py_string name, object callback):
         if not self.allowedClientCallbacks:
             # CefLoadHandler.
@@ -196,7 +196,7 @@ cdef class PyBrowser:
                     "OnResourceResponse", "OnProtocolExecution",
                     "GetDownloadHandler", "GetAuthCredentials",
                     "GetCookieManager"]
-            
+
             # CefDisplayHandler.
             self.allowedClientCallbacks += ["OnAddressChange",
                     "OnConsoleMessage", "OnContentsSizeChange",
@@ -219,7 +219,7 @@ cdef class PyBrowser:
     # -------------------------------------------------------------------------
     # CEF 3
     # -------------------------------------------------------------------------
-    cpdef py_void SetClientCallback_CEF3(self, 
+    cpdef py_void SetClientCallback_CEF3(self,
             py_string name, object callback):
         if not self.allowedClientCallbacks:
             # DisplayHandler
@@ -229,19 +229,19 @@ cdef class PyBrowser:
             # KeyboardHandler
             self.allowedClientCallbacks += ["OnPreKeyEvent", "OnKeyEvent"];
             # RequestHandler
-            # NOTE: OnCertificateError and OnBeforePluginLoad are not 
-            #       included as they must be set using 
+            # NOTE: OnCertificateError and OnBeforePluginLoad are not
+            #       included as they must be set using
             #       cefpython.SetGlobalClientCallback().
             self.allowedClientCallbacks += ["OnBeforeResourceLoad",
                     "OnResourceRedirect", "GetAuthCredentials",
-                    "OnQuotaRequest", "OnProtocolExecution", 
+                    "OnQuotaRequest", "OnProtocolExecution",
                     "GetResourceHandler",
                     "OnBeforeBrowse", "OnRendererProcessTerminated",
                     "OnPluginCrashed"]
             # RequestContextHandler
             self.allowedClientCallbacks += ["GetCookieManager"]
             # LoadHandler
-            self.allowedClientCallbacks += ["OnLoadingStateChange", 
+            self.allowedClientCallbacks += ["OnLoadingStateChange",
                     "OnLoadStart", "OnLoadEnd", "OnLoadError"]
             # LifespanHandler
             # NOTE: OnAfterCreated not included as it must be set using
@@ -335,18 +335,25 @@ cdef class PyBrowser:
             if len(g_pyBrowsers) == 1:
                 # This is the last browser remaining.
                 if g_sharedRequestContext.get():
-                    # A similar release is done in Shutdown 
+                    # A similar release is done in Shutdown
                     # and RemovePyBrowser.
                     Debug("CloseBrowser: releasing shared request context")
                     g_sharedRequestContext.Assign(NULL)
             Debug("CefBrowser::CloseBrowser(%s)" % forceClose)
             self.GetCefBrowserHost().get().CloseBrowser(bool(forceClose))
-        
+
     IF CEF_VERSION == 1:
 
         cpdef py_void CloseDevTools(self):
             self.GetCefBrowser().get().CloseDevTools()
 
+    def ExecuteFunction(self, *args):
+        self.GetMainFrame().ExecuteFunction(*args)
+
+    cpdef py_void ExecuteJavascript(self, py_string jsCode,
+            py_string scriptUrl="", int startLine=0):
+        self.GetMainFrame().ExecuteJavascript(jsCode, scriptUrl, startLine)
+
     cpdef py_void Find(self, int searchId, py_string searchText,
                        py_bool forward, py_bool matchCase,
                        py_bool findNext):
@@ -708,7 +715,7 @@ cdef class PyBrowser:
 
         cpdef py_void SendCaptureLostEvent(self):
             self.GetCefBrowser().get().SendCaptureLostEvent()
-    
+
     ELIF CEF_VERSION == 3:
         cpdef py_void SendKeyEvent(self, dict pyEvent):
             cdef CefKeyEvent cefEvent
@@ -731,7 +738,7 @@ cdef class PyBrowser:
                 cefEvent.focus_on_editable_field = \
                         bool(pyEvent["focus_on_editable_field"])
             self.GetCefBrowserHost().get().SendKeyEvent(cefEvent)
-        
+
         cpdef py_void SendMouseClickEvent(self, x, y,
                 cef_types.cef_mouse_button_type_t mouseButtonType,
                 py_bool mouseUp, int clickCount):
@@ -779,7 +786,7 @@ cdef class PyBrowser:
             mouseEvent.modifiers = 0
             self.GetCefBrowserHost().get().SendMouseWheelEvent(mouseEvent,
                     deltaX, deltaY)
-        
+
         cpdef py_void SendFocusEvent(self, py_bool setFocus):
             self.GetCefBrowserHost().get().SendFocusEvent(bool(setFocus))
 
@@ -812,7 +819,7 @@ cdef class PyBrowser:
         # virtual void HandleKeyEventBeforeTextInputClient(CefEventHandle keyEvent) =0;
         # virtual void HandleKeyEventAfterTextInputClient(CefEventHandle keyEvent) =0;
 
-        cdef void SendProcessMessage(self, cef_process_id_t targetProcess, 
+        cdef void SendProcessMessage(self, cef_process_id_t targetProcess,
                 object frameId, py_string messageName, list pyArguments
                 ) except *:
             cdef CefRefPtr[CefProcessMessage] message = \
@@ -826,7 +833,7 @@ cdef class PyBrowser:
             PyListToExistingCefListValue(self.GetIdentifier(), frameId,
                     pyArguments, messageArguments)
             Debug("SendProcessMessage(): message=%s, arguments size=%d" % (
-                    messageName, 
+                    messageName,
                     message.get().GetArgumentList().get().GetSize()))
             cdef cpp_bool success = \
                     self.GetCefBrowser().get().SendProcessMessage(
 
@@ -84,48 +84,10 @@ cdef class PyFrame:
                 return True
             return False
 
-    def ExecuteFunction(self, *args):
-        # No need to enter V8 context as we're calling javascript
-        # asynchronously using ExecuteJavascript() function.
-        funcName = args[0]
-        code = funcName+"("
-        for i in range(1, len(args)):
-            if i != 1:
-                code += ", "
-            code += json.dumps(args[i])
-        code += ")"
-        self.ExecuteJavascript(code)
-
     def CallFunction(self, *args):
         # DEPRECATED - keep for backwards compatibility.
         self.ExecuteFunction(*args)
 
-    # Synchronous javascript calls won't be supported as CEF 3
-    # does not support it, so supporting it in CEF 1 is probably
-    # not a good idea - porting to CEF 3 would be problematic.
-
-    # cpdef object CallFunctionSync(self, funcName, ...):
-        # CefV8 Objects, Arrays and Functions can be created only inside V8 context,
-        # you need to call CefV8Context::Enter() and CefV8Context::Exit():
-        # http://code.google.com/p/chromiumembedded/issues/detail?id=203
-        # Entering context should be done for Frame::CallFunction().
-        # You must check current context and Enter it if not same, before calling
-        # PyToV8Value().
-        # TODO: call Frame->GetV8Context?()->GetGlobal?() you get a window object,
-        # now iterate through its all properties and compare to funcName, you get a
-        # real javascript object which you can call and be able to get return value, also
-        # you can pass python callbacks this way.'''
-        # Example:
-        # cdef CefRefPtr[CefV8Context] v8Context = (
-        #         self.GetCefFrame().get().GetV8Context())
-        # sameContext = v8Context.get().IsSame(cef_v8_static.GetCurrentContext())
-        # if not sameContext:
-        #    assert v8Context.get().Enter(), "v8Context.Enter() failed"
-        # ... execute function here ...
-        # if not sameContext:
-        #     assert v8Context.get().Exit(), "v8Context.Exit() failed"
-    #    pass
-
     cpdef py_void Copy(self):
         self.GetCefFrame().get().Copy()
 
@@ -135,15 +97,23 @@ cdef class PyFrame:
     cpdef py_void Delete(self):
         self.GetCefFrame().get().Delete()
 
+    def ExecuteFunction(self, *args):
+        # No need to enter V8 context as we're calling javascript
+        # asynchronously using ExecuteJavascript() function.
+        funcName = args[0]
+        code = funcName+"("
+        for i in range(1, len(args)):
+            if i != 1:
+                code += ", "
+            code += json.dumps(args[i])
+        code += ")"
+        self.ExecuteJavascript(code)
+
     cpdef py_void ExecuteJavascript(self, py_string jsCode,
             py_string scriptUrl="", int startLine=0):
         self.GetCefFrame().get().ExecuteJavaScript(PyToCefStringValue(jsCode),
                 PyToCefStringValue(scriptUrl), startLine)
 
-    cpdef object EvalJavascript(self):
-        # TODO: CefV8Context > Eval
-        pass
-
     cpdef object GetIdentifier(self):
         # It is better to save browser and frame identifiers during
         # browser instantiation. When freeing PyBrowser and PyFrame