Remove the legacy off-screen rendering implementation. A new implementation is required (issue #1257).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1678 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/cpptoc/browser_host_cpptoc.cc

@@ -397,78 +397,6 @@ int CEF_CALLBACK browser_host_is_mouse_cursor_change_disabled(
   return _retval;
 }
 
-int CEF_CALLBACK browser_host_is_window_rendering_disabled(
-    struct _cef_browser_host_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return 0;
-
-  // Execute
-  bool _retval = CefBrowserHostCppToC::Get(self)->IsWindowRenderingDisabled();
-
-  // Return type: bool
-  return _retval;
-}
-
-void CEF_CALLBACK browser_host_was_resized(struct _cef_browser_host_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->WasResized();
-}
-
-void CEF_CALLBACK browser_host_was_hidden(struct _cef_browser_host_t* self,
-    int hidden) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->WasHidden(
-      hidden?true:false);
-}
-
-void CEF_CALLBACK browser_host_notify_screen_info_changed(
-    struct _cef_browser_host_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->NotifyScreenInfoChanged();
-}
-
-void CEF_CALLBACK browser_host_invalidate(struct _cef_browser_host_t* self,
-    const cef_rect_t* dirtyRect, cef_paint_element_type_t type) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: dirtyRect; type: simple_byref_const
-  DCHECK(dirtyRect);
-  if (!dirtyRect)
-    return;
-
-  // Translate param: dirtyRect; type: simple_byref_const
-  CefRect dirtyRectVal = dirtyRect?*dirtyRect:CefRect();
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->Invalidate(
-      dirtyRectVal,
-      type);
-}
-
 void CEF_CALLBACK browser_host_send_key_event(struct _cef_browser_host_t* self,
     const struct _cef_key_event_t* event) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -591,48 +519,6 @@ void CEF_CALLBACK browser_host_send_capture_lost_event(
   CefBrowserHostCppToC::Get(self)->SendCaptureLostEvent();
 }
 
-cef_text_input_context_t CEF_CALLBACK browser_host_get_nstext_input_context(
-    struct _cef_browser_host_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  cef_text_input_context_t _retval = CefBrowserHostCppToC::Get(
-      self)->GetNSTextInputContext();
-
-  // Return type: simple
-  return _retval;
-}
-
-void CEF_CALLBACK browser_host_handle_key_event_before_text_input_client(
-    struct _cef_browser_host_t* self, cef_event_handle_t keyEvent) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->HandleKeyEventBeforeTextInputClient(
-      keyEvent);
-}
-
-void CEF_CALLBACK browser_host_handle_key_event_after_text_input_client(
-    struct _cef_browser_host_t* self, cef_event_handle_t keyEvent) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-
-  // Execute
-  CefBrowserHostCppToC::Get(self)->HandleKeyEventAfterTextInputClient(
-      keyEvent);
-}
-
 
 // CONSTRUCTOR - Do not edit by hand.
 
@@ -659,13 +545,6 @@ CefBrowserHostCppToC::CefBrowserHostCppToC(CefBrowserHost* cls)
       browser_host_set_mouse_cursor_change_disabled;
   struct_.struct_.is_mouse_cursor_change_disabled =
       browser_host_is_mouse_cursor_change_disabled;
-  struct_.struct_.is_window_rendering_disabled =
-      browser_host_is_window_rendering_disabled;
-  struct_.struct_.was_resized = browser_host_was_resized;
-  struct_.struct_.was_hidden = browser_host_was_hidden;
-  struct_.struct_.notify_screen_info_changed =
-      browser_host_notify_screen_info_changed;
-  struct_.struct_.invalidate = browser_host_invalidate;
   struct_.struct_.send_key_event = browser_host_send_key_event;
   struct_.struct_.send_mouse_click_event = browser_host_send_mouse_click_event;
   struct_.struct_.send_mouse_move_event = browser_host_send_mouse_move_event;
@@ -673,12 +552,6 @@ CefBrowserHostCppToC::CefBrowserHostCppToC(CefBrowserHost* cls)
   struct_.struct_.send_focus_event = browser_host_send_focus_event;
   struct_.struct_.send_capture_lost_event =
       browser_host_send_capture_lost_event;
-  struct_.struct_.get_nstext_input_context =
-      browser_host_get_nstext_input_context;
-  struct_.struct_.handle_key_event_before_text_input_client =
-      browser_host_handle_key_event_before_text_input_client;
-  struct_.struct_.handle_key_event_after_text_input_client =
-      browser_host_handle_key_event_after_text_input_client;
 }
 
 #ifndef NDEBUG

libcef_dll/cpptoc/client_cpptoc.cc

@@ -22,7 +22,6 @@
 #include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/load_handler_cpptoc.h"
-#include "libcef_dll/cpptoc/render_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/request_handler_cpptoc.h"
 #include "libcef_dll/ctocpp/browser_ctocpp.h"
 #include "libcef_dll/ctocpp/process_message_ctocpp.h"
@@ -206,22 +205,6 @@ struct _cef_load_handler_t* CEF_CALLBACK client_get_load_handler(
   return CefLoadHandlerCppToC::Wrap(_retval);
 }
 
-struct _cef_render_handler_t* CEF_CALLBACK client_get_render_handler(
-    struct _cef_client_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefRefPtr<CefRenderHandler> _retval = CefClientCppToC::Get(
-      self)->GetRenderHandler();
-
-  // Return type: refptr_same
-  return CefRenderHandlerCppToC::Wrap(_retval);
-}
-
 struct _cef_request_handler_t* CEF_CALLBACK client_get_request_handler(
     struct _cef_client_t* self) {
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
@@ -281,7 +264,6 @@ CefClientCppToC::CefClientCppToC(CefClient* cls)
   struct_.struct_.get_keyboard_handler = client_get_keyboard_handler;
   struct_.struct_.get_life_span_handler = client_get_life_span_handler;
   struct_.struct_.get_load_handler = client_get_load_handler;
-  struct_.struct_.get_render_handler = client_get_render_handler;
   struct_.struct_.get_request_handler = client_get_request_handler;
   struct_.struct_.on_process_message_received =
       client_on_process_message_received;

libcef_dll/cpptoc/render_handler_cpptoc.cc

@@ -1,307 +0,0 @@
-// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-
-#include "libcef_dll/cpptoc/render_handler_cpptoc.h"
-#include "libcef_dll/ctocpp/browser_ctocpp.h"
-
-
-// MEMBER FUNCTIONS - Body may be edited by hand.
-
-int CEF_CALLBACK render_handler_get_root_screen_rect(
-    struct _cef_render_handler_t* self, cef_browser_t* browser,
-    cef_rect_t* rect) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return 0;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return 0;
-  // Verify param: rect; type: simple_byref
-  DCHECK(rect);
-  if (!rect)
-    return 0;
-
-  // Translate param: rect; type: simple_byref
-  CefRect rectVal = rect?*rect:CefRect();
-
-  // Execute
-  bool _retval = CefRenderHandlerCppToC::Get(self)->GetRootScreenRect(
-      CefBrowserCToCpp::Wrap(browser),
-      rectVal);
-
-  // Restore param: rect; type: simple_byref
-  if (rect)
-    *rect = rectVal;
-
-  // Return type: bool
-  return _retval;
-}
-
-int CEF_CALLBACK render_handler_get_view_rect(
-    struct _cef_render_handler_t* self, cef_browser_t* browser,
-    cef_rect_t* rect) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return 0;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return 0;
-  // Verify param: rect; type: simple_byref
-  DCHECK(rect);
-  if (!rect)
-    return 0;
-
-  // Translate param: rect; type: simple_byref
-  CefRect rectVal = rect?*rect:CefRect();
-
-  // Execute
-  bool _retval = CefRenderHandlerCppToC::Get(self)->GetViewRect(
-      CefBrowserCToCpp::Wrap(browser),
-      rectVal);
-
-  // Restore param: rect; type: simple_byref
-  if (rect)
-    *rect = rectVal;
-
-  // Return type: bool
-  return _retval;
-}
-
-int CEF_CALLBACK render_handler_get_screen_point(
-    struct _cef_render_handler_t* self, cef_browser_t* browser, int viewX,
-    int viewY, int* screenX, int* screenY) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return 0;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return 0;
-  // Verify param: screenX; type: simple_byref
-  DCHECK(screenX);
-  if (!screenX)
-    return 0;
-  // Verify param: screenY; type: simple_byref
-  DCHECK(screenY);
-  if (!screenY)
-    return 0;
-
-  // Translate param: screenX; type: simple_byref
-  int screenXVal = screenX?*screenX:0;
-  // Translate param: screenY; type: simple_byref
-  int screenYVal = screenY?*screenY:0;
-
-  // Execute
-  bool _retval = CefRenderHandlerCppToC::Get(self)->GetScreenPoint(
-      CefBrowserCToCpp::Wrap(browser),
-      viewX,
-      viewY,
-      screenXVal,
-      screenYVal);
-
-  // Restore param: screenX; type: simple_byref
-  if (screenX)
-    *screenX = screenXVal;
-  // Restore param: screenY; type: simple_byref
-  if (screenY)
-    *screenY = screenYVal;
-
-  // Return type: bool
-  return _retval;
-}
-
-int CEF_CALLBACK render_handler_get_screen_info(
-    struct _cef_render_handler_t* self, cef_browser_t* browser,
-    struct _cef_screen_info_t* screen_info) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return 0;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return 0;
-  // Verify param: screen_info; type: struct_byref
-  DCHECK(screen_info);
-  if (!screen_info)
-    return 0;
-
-  // Translate param: screen_info; type: struct_byref
-  CefScreenInfo screen_infoObj;
-  if (screen_info)
-    screen_infoObj.AttachTo(*screen_info);
-
-  // Execute
-  bool _retval = CefRenderHandlerCppToC::Get(self)->GetScreenInfo(
-      CefBrowserCToCpp::Wrap(browser),
-      screen_infoObj);
-
-  // Restore param: screen_info; type: struct_byref
-  if (screen_info)
-    screen_infoObj.DetachTo(*screen_info);
-
-  // Return type: bool
-  return _retval;
-}
-
-void CEF_CALLBACK render_handler_on_popup_show(
-    struct _cef_render_handler_t* self, cef_browser_t* browser, int show) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return;
-
-  // Execute
-  CefRenderHandlerCppToC::Get(self)->OnPopupShow(
-      CefBrowserCToCpp::Wrap(browser),
-      show?true:false);
-}
-
-void CEF_CALLBACK render_handler_on_popup_size(
-    struct _cef_render_handler_t* self, cef_browser_t* browser,
-    const cef_rect_t* rect) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return;
-  // Verify param: rect; type: simple_byref_const
-  DCHECK(rect);
-  if (!rect)
-    return;
-
-  // Translate param: rect; type: simple_byref_const
-  CefRect rectVal = rect?*rect:CefRect();
-
-  // Execute
-  CefRenderHandlerCppToC::Get(self)->OnPopupSize(
-      CefBrowserCToCpp::Wrap(browser),
-      rectVal);
-}
-
-void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self,
-    cef_browser_t* browser, cef_paint_element_type_t type,
-    size_t dirtyRectsCount, cef_rect_t const* dirtyRects, const void* buffer,
-    int width, int height) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return;
-  // Verify param: dirtyRects; type: simple_vec_byref_const
-  DCHECK(dirtyRectsCount == 0 || dirtyRects);
-  if (dirtyRectsCount > 0 && !dirtyRects)
-    return;
-  // Verify param: buffer; type: simple_byaddr
-  DCHECK(buffer);
-  if (!buffer)
-    return;
-
-  // Translate param: dirtyRects; type: simple_vec_byref_const
-  std::vector<CefRect > dirtyRectsList;
-  if (dirtyRectsCount > 0) {
-    for (size_t i = 0; i < dirtyRectsCount; ++i) {
-      dirtyRectsList.push_back(dirtyRects[i]);
-    }
-  }
-
-  // Execute
-  CefRenderHandlerCppToC::Get(self)->OnPaint(
-      CefBrowserCToCpp::Wrap(browser),
-      type,
-      dirtyRectsList,
-      buffer,
-      width,
-      height);
-}
-
-void CEF_CALLBACK render_handler_on_cursor_change(
-    struct _cef_render_handler_t* self, cef_browser_t* browser,
-    cef_cursor_handle_t cursor) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return;
-
-  // Execute
-  CefRenderHandlerCppToC::Get(self)->OnCursorChange(
-      CefBrowserCToCpp::Wrap(browser),
-      cursor);
-}
-
-void CEF_CALLBACK render_handler_on_scroll_offset_changed(
-    struct _cef_render_handler_t* self, cef_browser_t* browser) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return;
-
-  // Execute
-  CefRenderHandlerCppToC::Get(self)->OnScrollOffsetChanged(
-      CefBrowserCToCpp::Wrap(browser));
-}
-
-
-// CONSTRUCTOR - Do not edit by hand.
-
-CefRenderHandlerCppToC::CefRenderHandlerCppToC(CefRenderHandler* cls)
-    : CefCppToC<CefRenderHandlerCppToC, CefRenderHandler, cef_render_handler_t>(
-        cls) {
-  struct_.struct_.get_root_screen_rect = render_handler_get_root_screen_rect;
-  struct_.struct_.get_view_rect = render_handler_get_view_rect;
-  struct_.struct_.get_screen_point = render_handler_get_screen_point;
-  struct_.struct_.get_screen_info = render_handler_get_screen_info;
-  struct_.struct_.on_popup_show = render_handler_on_popup_show;
-  struct_.struct_.on_popup_size = render_handler_on_popup_size;
-  struct_.struct_.on_paint = render_handler_on_paint;
-  struct_.struct_.on_cursor_change = render_handler_on_cursor_change;
-  struct_.struct_.on_scroll_offset_changed =
-      render_handler_on_scroll_offset_changed;
-}
-
-#ifndef NDEBUG
-template<> long CefCppToC<CefRenderHandlerCppToC, CefRenderHandler,
-    cef_render_handler_t>::DebugObjCt = 0;
-#endif
-

libcef_dll/cpptoc/render_handler_cpptoc.h

@@ -1,37 +0,0 @@
-// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-
-#ifndef CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_
-#define CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_
-#pragma once
-
-#ifndef USING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
-#else  // USING_CEF_SHARED
-
-#include "include/cef_render_handler.h"
-#include "include/capi/cef_render_handler_capi.h"
-#include "libcef_dll/cpptoc/cpptoc.h"
-
-// Wrap a C++ class with a C structure.
-// This class may be instantiated and accessed wrapper-side only.
-class CefRenderHandlerCppToC
-    : public CefCppToC<CefRenderHandlerCppToC, CefRenderHandler,
-        cef_render_handler_t> {
- public:
-  explicit CefRenderHandlerCppToC(CefRenderHandler* cls);
-  virtual ~CefRenderHandlerCppToC() {}
-};
-
-#endif  // USING_CEF_SHARED
-#endif  // CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_
-

libcef_dll/ctocpp/browser_host_ctocpp.cc

@@ -319,63 +319,6 @@ bool CefBrowserHostCToCpp::IsMouseCursorChangeDisabled() {
   return _retval?true:false;
 }
 
-bool CefBrowserHostCToCpp::IsWindowRenderingDisabled() {
-  if (CEF_MEMBER_MISSING(struct_, is_window_rendering_disabled))
-    return false;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  int _retval = struct_->is_window_rendering_disabled(struct_);
-
-  // Return type: bool
-  return _retval?true:false;
-}
-
-void CefBrowserHostCToCpp::WasResized() {
-  if (CEF_MEMBER_MISSING(struct_, was_resized))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->was_resized(struct_);
-}
-
-void CefBrowserHostCToCpp::WasHidden(bool hidden) {
-  if (CEF_MEMBER_MISSING(struct_, was_hidden))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->was_hidden(struct_,
-      hidden);
-}
-
-void CefBrowserHostCToCpp::NotifyScreenInfoChanged() {
-  if (CEF_MEMBER_MISSING(struct_, notify_screen_info_changed))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->notify_screen_info_changed(struct_);
-}
-
-void CefBrowserHostCToCpp::Invalidate(const CefRect& dirtyRect,
-    PaintElementType type) {
-  if (CEF_MEMBER_MISSING(struct_, invalidate))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->invalidate(struct_,
-      &dirtyRect,
-      type);
-}
-
 void CefBrowserHostCToCpp::SendKeyEvent(const CefKeyEvent& event) {
   if (CEF_MEMBER_MISSING(struct_, send_key_event))
     return;
@@ -450,43 +393,6 @@ void CefBrowserHostCToCpp::SendCaptureLostEvent() {
   struct_->send_capture_lost_event(struct_);
 }
 
-CefTextInputContext CefBrowserHostCToCpp::GetNSTextInputContext() {
-  if (CEF_MEMBER_MISSING(struct_, get_nstext_input_context))
-    return NULL;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  cef_text_input_context_t _retval = struct_->get_nstext_input_context(struct_);
-
-  // Return type: simple
-  return _retval;
-}
-
-void CefBrowserHostCToCpp::HandleKeyEventBeforeTextInputClient(
-    CefEventHandle keyEvent) {
-  if (CEF_MEMBER_MISSING(struct_, handle_key_event_before_text_input_client))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->handle_key_event_before_text_input_client(struct_,
-      keyEvent);
-}
-
-void CefBrowserHostCToCpp::HandleKeyEventAfterTextInputClient(
-    CefEventHandle keyEvent) {
-  if (CEF_MEMBER_MISSING(struct_, handle_key_event_after_text_input_client))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  struct_->handle_key_event_after_text_input_client(struct_,
-      keyEvent);
-}
-
 
 #ifndef NDEBUG
 template<> long CefCToCpp<CefBrowserHostCToCpp, CefBrowserHost,

libcef_dll/ctocpp/browser_host_ctocpp.h

@@ -61,12 +61,6 @@ class CefBrowserHostCToCpp
   virtual void CloseDevTools() OVERRIDE;
   virtual void SetMouseCursorChangeDisabled(bool disabled) OVERRIDE;
   virtual bool IsMouseCursorChangeDisabled() OVERRIDE;
-  virtual bool IsWindowRenderingDisabled() OVERRIDE;
-  virtual void WasResized() OVERRIDE;
-  virtual void WasHidden(bool hidden) OVERRIDE;
-  virtual void NotifyScreenInfoChanged() OVERRIDE;
-  virtual void Invalidate(const CefRect& dirtyRect,
-      PaintElementType type) OVERRIDE;
   virtual void SendKeyEvent(const CefKeyEvent& event) OVERRIDE;
   virtual void SendMouseClickEvent(const CefMouseEvent& event,
       MouseButtonType type, bool mouseUp, int clickCount) OVERRIDE;
@@ -76,11 +70,6 @@ class CefBrowserHostCToCpp
       int deltaY) OVERRIDE;
   virtual void SendFocusEvent(bool setFocus) OVERRIDE;
   virtual void SendCaptureLostEvent() OVERRIDE;
-  virtual CefTextInputContext GetNSTextInputContext() OVERRIDE;
-  virtual void HandleKeyEventBeforeTextInputClient(
-      CefEventHandle keyEvent) OVERRIDE;
-  virtual void HandleKeyEventAfterTextInputClient(
-      CefEventHandle keyEvent) OVERRIDE;
 };
 
 #endif  // USING_CEF_SHARED

libcef_dll/ctocpp/client_ctocpp.cc

@@ -24,7 +24,6 @@
 #include "libcef_dll/ctocpp/keyboard_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/load_handler_ctocpp.h"
-#include "libcef_dll/ctocpp/render_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/request_handler_ctocpp.h"
 
 
@@ -175,19 +174,6 @@ CefRefPtr<CefLoadHandler> CefClientCToCpp::GetLoadHandler() {
   return CefLoadHandlerCToCpp::Wrap(_retval);
 }
 
-CefRefPtr<CefRenderHandler> CefClientCToCpp::GetRenderHandler() {
-  if (CEF_MEMBER_MISSING(struct_, get_render_handler))
-    return NULL;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  cef_render_handler_t* _retval = struct_->get_render_handler(struct_);
-
-  // Return type: refptr_same
-  return CefRenderHandlerCToCpp::Wrap(_retval);
-}
-
 CefRefPtr<CefRequestHandler> CefClientCToCpp::GetRequestHandler() {
   if (CEF_MEMBER_MISSING(struct_, get_request_handler))
     return NULL;

libcef_dll/ctocpp/client_ctocpp.h

@@ -43,7 +43,6 @@ class CefClientCToCpp
   virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() OVERRIDE;
   virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE;
   virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE;
-  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() OVERRIDE;
   virtual CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE;
   virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
       CefProcessId source_process,

libcef_dll/ctocpp/render_handler_ctocpp.cc

@@ -1,227 +0,0 @@
-// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-
-#include "libcef_dll/cpptoc/browser_cpptoc.h"
-#include "libcef_dll/ctocpp/render_handler_ctocpp.h"
-
-
-// VIRTUAL METHODS - Body may be edited by hand.
-
-bool CefRenderHandlerCToCpp::GetRootScreenRect(CefRefPtr<CefBrowser> browser,
-    CefRect& rect) {
-  if (CEF_MEMBER_MISSING(struct_, get_root_screen_rect))
-    return false;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return false;
-
-  // Execute
-  int _retval = struct_->get_root_screen_rect(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      &rect);
-
-  // Return type: bool
-  return _retval?true:false;
-}
-
-bool CefRenderHandlerCToCpp::GetViewRect(CefRefPtr<CefBrowser> browser,
-    CefRect& rect) {
-  if (CEF_MEMBER_MISSING(struct_, get_view_rect))
-    return false;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return false;
-
-  // Execute
-  int _retval = struct_->get_view_rect(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      &rect);
-
-  // Return type: bool
-  return _retval?true:false;
-}
-
-bool CefRenderHandlerCToCpp::GetScreenPoint(CefRefPtr<CefBrowser> browser,
-    int viewX, int viewY, int& screenX, int& screenY) {
-  if (CEF_MEMBER_MISSING(struct_, get_screen_point))
-    return false;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return false;
-
-  // Execute
-  int _retval = struct_->get_screen_point(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      viewX,
-      viewY,
-      &screenX,
-      &screenY);
-
-  // Return type: bool
-  return _retval?true:false;
-}
-
-bool CefRenderHandlerCToCpp::GetScreenInfo(CefRefPtr<CefBrowser> browser,
-    CefScreenInfo& screen_info) {
-  if (CEF_MEMBER_MISSING(struct_, get_screen_info))
-    return false;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return false;
-
-  // Execute
-  int _retval = struct_->get_screen_info(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      &screen_info);
-
-  // Return type: bool
-  return _retval?true:false;
-}
-
-void CefRenderHandlerCToCpp::OnPopupShow(CefRefPtr<CefBrowser> browser,
-    bool show) {
-  if (CEF_MEMBER_MISSING(struct_, on_popup_show))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return;
-
-  // Execute
-  struct_->on_popup_show(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      show);
-}
-
-void CefRenderHandlerCToCpp::OnPopupSize(CefRefPtr<CefBrowser> browser,
-    const CefRect& rect) {
-  if (CEF_MEMBER_MISSING(struct_, on_popup_size))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return;
-
-  // Execute
-  struct_->on_popup_size(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      &rect);
-}
-
-void CefRenderHandlerCToCpp::OnPaint(CefRefPtr<CefBrowser> browser,
-    PaintElementType type, const RectList& dirtyRects, const void* buffer,
-    int width, int height) {
-  if (CEF_MEMBER_MISSING(struct_, on_paint))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return;
-  // Verify param: buffer; type: simple_byaddr
-  DCHECK(buffer);
-  if (!buffer)
-    return;
-
-  // Translate param: dirtyRects; type: simple_vec_byref_const
-  const size_t dirtyRectsCount = dirtyRects.size();
-  cef_rect_t* dirtyRectsList = NULL;
-  if (dirtyRectsCount > 0) {
-    dirtyRectsList = new cef_rect_t[dirtyRectsCount];
-    DCHECK(dirtyRectsList);
-    if (dirtyRectsList) {
-      for (size_t i = 0; i < dirtyRectsCount; ++i) {
-        dirtyRectsList[i] = dirtyRects[i];
-      }
-    }
-  }
-
-  // Execute
-  struct_->on_paint(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      type,
-      dirtyRectsCount,
-      dirtyRectsList,
-      buffer,
-      width,
-      height);
-
-  // Restore param:dirtyRects; type: simple_vec_byref_const
-  if (dirtyRectsList)
-    delete [] dirtyRectsList;
-}
-
-void CefRenderHandlerCToCpp::OnCursorChange(CefRefPtr<CefBrowser> browser,
-    CefCursorHandle cursor) {
-  if (CEF_MEMBER_MISSING(struct_, on_cursor_change))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return;
-
-  // Execute
-  struct_->on_cursor_change(struct_,
-      CefBrowserCppToC::Wrap(browser),
-      cursor);
-}
-
-void CefRenderHandlerCToCpp::OnScrollOffsetChanged(
-    CefRefPtr<CefBrowser> browser) {
-  if (CEF_MEMBER_MISSING(struct_, on_scroll_offset_changed))
-    return;
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return;
-
-  // Execute
-  struct_->on_scroll_offset_changed(struct_,
-      CefBrowserCppToC::Wrap(browser));
-}
-
-
-#ifndef NDEBUG
-template<> long CefCToCpp<CefRenderHandlerCToCpp, CefRenderHandler,
-    cef_render_handler_t>::DebugObjCt = 0;
-#endif
-

libcef_dll/ctocpp/render_handler_ctocpp.h

@@ -1,58 +0,0 @@
-// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
-// reserved. Use of this source code is governed by a BSD-style license that
-// can be found in the LICENSE file.
-//
-// ---------------------------------------------------------------------------
-//
-// This file was generated by the CEF translator tool. If making changes by
-// hand only do so within the body of existing method and function
-// implementations. See the translator.README.txt file in the tools directory
-// for more information.
-//
-
-#ifndef CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_
-#define CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_
-#pragma once
-
-#ifndef BUILDING_CEF_SHARED
-#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
-#else  // BUILDING_CEF_SHARED
-
-#include "include/cef_render_handler.h"
-#include "include/capi/cef_render_handler_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
-
-// Wrap a C structure with a C++ class.
-// This class may be instantiated and accessed DLL-side only.
-class CefRenderHandlerCToCpp
-    : public CefCToCpp<CefRenderHandlerCToCpp, CefRenderHandler,
-        cef_render_handler_t> {
- public:
-  explicit CefRenderHandlerCToCpp(cef_render_handler_t* str)
-      : CefCToCpp<CefRenderHandlerCToCpp, CefRenderHandler,
-          cef_render_handler_t>(str) {}
-  virtual ~CefRenderHandlerCToCpp() {}
-
-  // CefRenderHandler methods
-  virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
-      CefRect& rect) OVERRIDE;
-  virtual bool GetViewRect(CefRefPtr<CefBrowser> browser,
-      CefRect& rect) OVERRIDE;
-  virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, int viewX,
-      int viewY, int& screenX, int& screenY) OVERRIDE;
-  virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
-      CefScreenInfo& screen_info) OVERRIDE;
-  virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) OVERRIDE;
-  virtual void OnPopupSize(CefRefPtr<CefBrowser> browser,
-      const CefRect& rect) OVERRIDE;
-  virtual void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
-      const RectList& dirtyRects, const void* buffer, int width,
-      int height) OVERRIDE;
-  virtual void OnCursorChange(CefRefPtr<CefBrowser> browser,
-      CefCursorHandle cursor) OVERRIDE;
-  virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser) OVERRIDE;
-};
-
-#endif  // BUILDING_CEF_SHARED
-#endif  // CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_
-

libcef_dll/libcef_dll.cc

@@ -89,7 +89,6 @@
 #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/load_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/read_handler_ctocpp.h"
-#include "libcef_dll/ctocpp/render_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/render_process_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/request_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h"
@@ -218,7 +217,6 @@ CEF_EXPORT void cef_shutdown() {
   DCHECK_EQ(CefProcessMessageCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefQuotaCallbackCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefReadHandlerCToCpp::DebugObjCt, 0);
-  DCHECK_EQ(CefRenderHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefRenderProcessHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefRequestHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefResourceBundleHandlerCToCpp::DebugObjCt, 0);

libcef_dll/wrapper/libcef_dll_wrapper.cc

@@ -53,7 +53,6 @@
 #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/load_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/read_handler_cpptoc.h"
-#include "libcef_dll/cpptoc/render_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/request_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h"
@@ -210,7 +209,6 @@ CEF_GLOBAL void CefShutdown() {
   DCHECK_EQ(CefProcessMessageCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefQuotaCallbackCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefReadHandlerCppToC::DebugObjCt, 0);
-  DCHECK_EQ(CefRenderHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefRenderProcessHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefRequestHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefResourceBundleHandlerCppToC::DebugObjCt, 0);