mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Break cef.h into multiple headers (issue #142).
- Move wrapper classes from cef_wrapper.h to wrapper/ directory. - Move C API functions/classes from cef_capi.h to capi/ directory. - Move global function implementations from cef_context.cc to *_impl.cc files. - Output auto-generated file paths in cef_paths.gypi. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@442 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -41,7 +41,6 @@ bool CefBrowser::CreateBrowser(CefWindowInfo& windowInfo,
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
CefRefPtr<CefBrowser> CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo,
|
||||
CefRefPtr<CefClient> client, const CefString& url,
|
||||
const CefBrowserSettings& settings)
|
||||
@@ -66,7 +65,6 @@ CefRefPtr<CefBrowser> CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo,
|
||||
}
|
||||
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
||||
void CefBrowserCToCpp::ParentWindowWillClose()
|
||||
@@ -80,7 +78,6 @@ void CefBrowserCToCpp::ParentWindowWillClose()
|
||||
struct_->parent_window_will_close(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::CloseBrowser()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, close_browser))
|
||||
@@ -92,7 +89,6 @@ void CefBrowserCToCpp::CloseBrowser()
|
||||
struct_->close_browser(struct_);
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::CanGoBack()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, can_go_back))
|
||||
@@ -107,7 +103,6 @@ bool CefBrowserCToCpp::CanGoBack()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::GoBack()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, go_back))
|
||||
@@ -119,7 +114,6 @@ void CefBrowserCToCpp::GoBack()
|
||||
struct_->go_back(struct_);
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::CanGoForward()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, can_go_forward))
|
||||
@@ -134,7 +128,6 @@ bool CefBrowserCToCpp::CanGoForward()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::GoForward()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, go_forward))
|
||||
@@ -146,7 +139,6 @@ void CefBrowserCToCpp::GoForward()
|
||||
struct_->go_forward(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::Reload()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, reload))
|
||||
@@ -158,7 +150,6 @@ void CefBrowserCToCpp::Reload()
|
||||
struct_->reload(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::ReloadIgnoreCache()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, reload_ignore_cache))
|
||||
@@ -170,7 +161,6 @@ void CefBrowserCToCpp::ReloadIgnoreCache()
|
||||
struct_->reload_ignore_cache(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::StopLoad()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, stop_load))
|
||||
@@ -182,7 +172,6 @@ void CefBrowserCToCpp::StopLoad()
|
||||
struct_->stop_load(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SetFocus(bool enable)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, set_focus))
|
||||
@@ -195,7 +184,6 @@ void CefBrowserCToCpp::SetFocus(bool enable)
|
||||
enable);
|
||||
}
|
||||
|
||||
|
||||
CefWindowHandle CefBrowserCToCpp::GetWindowHandle()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_window_handle))
|
||||
@@ -210,7 +198,6 @@ CefWindowHandle CefBrowserCToCpp::GetWindowHandle()
|
||||
return _retval;
|
||||
}
|
||||
|
||||
|
||||
CefWindowHandle CefBrowserCToCpp::GetOpenerWindowHandle()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_opener_window_handle))
|
||||
@@ -225,7 +212,6 @@ CefWindowHandle CefBrowserCToCpp::GetOpenerWindowHandle()
|
||||
return _retval;
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::IsPopup()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, is_popup))
|
||||
@@ -240,7 +226,6 @@ bool CefBrowserCToCpp::IsPopup()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::HasDocument()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, has_document))
|
||||
@@ -255,7 +240,6 @@ bool CefBrowserCToCpp::HasDocument()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
CefRefPtr<CefClient> CefBrowserCToCpp::GetClient()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_client))
|
||||
@@ -270,7 +254,6 @@ CefRefPtr<CefClient> CefBrowserCToCpp::GetClient()
|
||||
return CefClientCppToC::Unwrap(_retval);
|
||||
}
|
||||
|
||||
|
||||
CefRefPtr<CefFrame> CefBrowserCToCpp::GetMainFrame()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_main_frame))
|
||||
@@ -285,7 +268,6 @@ CefRefPtr<CefFrame> CefBrowserCToCpp::GetMainFrame()
|
||||
return CefFrameCToCpp::Wrap(_retval);
|
||||
}
|
||||
|
||||
|
||||
CefRefPtr<CefFrame> CefBrowserCToCpp::GetFocusedFrame()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_focused_frame))
|
||||
@@ -300,7 +282,6 @@ CefRefPtr<CefFrame> CefBrowserCToCpp::GetFocusedFrame()
|
||||
return CefFrameCToCpp::Wrap(_retval);
|
||||
}
|
||||
|
||||
|
||||
CefRefPtr<CefFrame> CefBrowserCToCpp::GetFrame(const CefString& name)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_frame))
|
||||
@@ -321,7 +302,6 @@ CefRefPtr<CefFrame> CefBrowserCToCpp::GetFrame(const CefString& name)
|
||||
return CefFrameCToCpp::Wrap(_retval);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::GetFrameNames(std::vector<CefString>& names)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_frame_names))
|
||||
@@ -347,7 +327,6 @@ void CefBrowserCToCpp::GetFrameNames(std::vector<CefString>& names)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::Find(int identifier, const CefString& searchText,
|
||||
bool forward, bool matchCase, bool findNext)
|
||||
{
|
||||
@@ -370,7 +349,6 @@ void CefBrowserCToCpp::Find(int identifier, const CefString& searchText,
|
||||
findNext);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::StopFinding(bool clearSelection)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, stop_finding))
|
||||
@@ -383,7 +361,6 @@ void CefBrowserCToCpp::StopFinding(bool clearSelection)
|
||||
clearSelection);
|
||||
}
|
||||
|
||||
|
||||
double CefBrowserCToCpp::GetZoomLevel()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_zoom_level))
|
||||
@@ -398,7 +375,6 @@ double CefBrowserCToCpp::GetZoomLevel()
|
||||
return _retval;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SetZoomLevel(double zoomLevel)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, set_zoom_level))
|
||||
@@ -411,7 +387,6 @@ void CefBrowserCToCpp::SetZoomLevel(double zoomLevel)
|
||||
zoomLevel);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::ClearHistory()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, clear_history))
|
||||
@@ -423,7 +398,6 @@ void CefBrowserCToCpp::ClearHistory()
|
||||
struct_->clear_history(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::ShowDevTools()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, show_dev_tools))
|
||||
@@ -435,7 +409,6 @@ void CefBrowserCToCpp::ShowDevTools()
|
||||
struct_->show_dev_tools(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::CloseDevTools()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, close_dev_tools))
|
||||
@@ -447,7 +420,6 @@ void CefBrowserCToCpp::CloseDevTools()
|
||||
struct_->close_dev_tools(struct_);
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::IsWindowRenderingDisabled()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, is_window_rendering_disabled))
|
||||
@@ -462,7 +434,6 @@ bool CefBrowserCToCpp::IsWindowRenderingDisabled()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::GetSize(PaintElementType type, int& width, int& height)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, get_size))
|
||||
@@ -480,7 +451,6 @@ bool CefBrowserCToCpp::GetSize(PaintElementType type, int& width, int& height)
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SetSize(PaintElementType type, int width, int height)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, set_size))
|
||||
@@ -495,7 +465,6 @@ void CefBrowserCToCpp::SetSize(PaintElementType type, int width, int height)
|
||||
height);
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::IsPopupVisible()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, is_popup_visible))
|
||||
@@ -510,7 +479,6 @@ bool CefBrowserCToCpp::IsPopupVisible()
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::HidePopup()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, hide_popup))
|
||||
@@ -522,7 +490,6 @@ void CefBrowserCToCpp::HidePopup()
|
||||
struct_->hide_popup(struct_);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::Invalidate(const CefRect& dirtyRect)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, invalidate))
|
||||
@@ -535,7 +502,6 @@ void CefBrowserCToCpp::Invalidate(const CefRect& dirtyRect)
|
||||
&dirtyRect);
|
||||
}
|
||||
|
||||
|
||||
bool CefBrowserCToCpp::GetImage(PaintElementType type, int width, int height,
|
||||
void* buffer)
|
||||
{
|
||||
@@ -560,7 +526,6 @@ bool CefBrowserCToCpp::GetImage(PaintElementType type, int width, int height,
|
||||
return _retval?true:false;
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendKeyEvent(KeyType type, int key, int modifiers,
|
||||
bool sysChar, bool imeChar)
|
||||
{
|
||||
@@ -578,7 +543,6 @@ void CefBrowserCToCpp::SendKeyEvent(KeyType type, int key, int modifiers,
|
||||
imeChar);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendMouseClickEvent(int x, int y, MouseButtonType type,
|
||||
bool mouseUp, int clickCount)
|
||||
{
|
||||
@@ -596,7 +560,6 @@ void CefBrowserCToCpp::SendMouseClickEvent(int x, int y, MouseButtonType type,
|
||||
clickCount);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendMouseMoveEvent(int x, int y, bool mouseLeave)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, send_mouse_move_event))
|
||||
@@ -611,7 +574,6 @@ void CefBrowserCToCpp::SendMouseMoveEvent(int x, int y, bool mouseLeave)
|
||||
mouseLeave);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendMouseWheelEvent(int x, int y, int delta)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, send_mouse_wheel_event))
|
||||
@@ -626,7 +588,6 @@ void CefBrowserCToCpp::SendMouseWheelEvent(int x, int y, int delta)
|
||||
delta);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendFocusEvent(bool setFocus)
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, send_focus_event))
|
||||
@@ -639,7 +600,6 @@ void CefBrowserCToCpp::SendFocusEvent(bool setFocus)
|
||||
setFocus);
|
||||
}
|
||||
|
||||
|
||||
void CefBrowserCToCpp::SendCaptureLostEvent()
|
||||
{
|
||||
if (CEF_MEMBER_MISSING(struct_, send_capture_lost_event))
|
||||
@@ -652,7 +612,6 @@ void CefBrowserCToCpp::SendCaptureLostEvent()
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifndef NDEBUG
|
||||
template<> long CefCToCpp<CefBrowserCToCpp, CefBrowser,
|
||||
cef_browser_t>::DebugObjCt = 0;
|
||||
|
Reference in New Issue
Block a user