Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDE-1135 Remove chrome rendering engine #565

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,10 @@ FIND_PATH(SCINTILLA_WIN32_DIR PlatWin.cxx HINTS ${VCPKG_ROOT_DIR}/share/scintill
FIND_PATH(BUGTRAP_DIR BugTrap.h HINTS ${VCPKG_ROOT_DIR}/share/bugtrap/source/Client)
FIND_PATH(BUGTRAP_ZLIB_DIR zlib.def HINTS ${VCPKG_ROOT_DIR}/share/bugtrap/source/zlib)

FILE(GLOB CEF_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/*")
FIND_PATH(CEF_ROOT_DIR
NAMES Release/libcef.lib
PATHS ${CEF_SEARCH_PATHS}
)

MESSAGE("includes")
MESSAGE(" - boost: ${Boost_INCLUDE_DIRS}")
MESSAGE(" - wtl: ${WTL_INCLUDE_DIR}")
MESSAGE(" - Scintilla: ${SCINTILLA_INCLUDE_DIR}")
MESSAGE(" - CEF: ${CEF_ROOT_DIR}")

MESSAGE("sources")
MESSAGE(" - Scintilla")
Expand Down
1 change: 0 additions & 1 deletion eclide/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ INCLUDE_DIRECTORIES (
${WTL_INCLUDE_DIR}
${SCINTILLA_INCLUDE_DIR}
${BUGTRAP_DIR}
${CEF_ROOT_DIR}
)

ADD_DEFINITIONS( -D_AFXDLL -D_USRDLL )
Expand Down
48 changes: 1 addition & 47 deletions eclide/QueryBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@
#include "aboutdlg.h"
#include <EclCC.h>

#include "include/cef_base.h"
#include "include/cef_app.h"

class CefMfcCefApp : public CefApp, public CefBrowserProcessHandler {
public:
CefMfcCefApp() {}

virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() OVERRIDE {
return this;
}

private:
IMPLEMENT_REFCOUNTING(CefMfcCefApp);
};

class CConfigCache
{
public:
Expand Down Expand Up @@ -74,14 +59,10 @@ BOOL CQueryBuilderApp::PumpMessage()
auto result = CWinAppEx::PumpMessage();

// If there are other messages on queue then return right away
// otherwise CEF has a habit of eating keystrokes not meant for it
MSG msg;
if (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
return result;

// Allow Cef to do his thing
CefDoMessageLoopWork();

return result;
}

Expand Down Expand Up @@ -118,9 +99,6 @@ BOOL CQueryBuilderApp::InitInstance()
InitCtrls.dwICC = ICC_WIN95_CLASSES;
InitCommonControlsEx(&InitCtrls);

if (!InitializeCef())
return FALSE;

CWinAppEx::InitInstance();

// Initialize OLE libraries
Expand Down Expand Up @@ -233,8 +211,6 @@ int CQueryBuilderApp::ExitInstance()
// Terminate ATL
_Module.Term();

UninitializeCef();

ResetIConfigs();

int retVal = CWinAppEx::ExitInstance();
Expand Down Expand Up @@ -265,26 +241,4 @@ void CQueryBuilderApp::LoadCustomState()

void CQueryBuilderApp::SaveCustomState()
{
}

bool CQueryBuilderApp::InitializeCef()
{
m_cefApp = new CefMfcCefApp();
CefMainArgs mainargs(m_hInstance);

const auto exit_code = CefExecuteProcess(mainargs, m_cefApp.get(), nullptr);
if (exit_code >= 0)
return false;

CefSettings settings;
settings.multi_threaded_message_loop = false;
settings.no_sandbox = true;
settings.ignore_certificate_errors = true;
return CefInitialize(mainargs, settings, m_cefApp.get(), nullptr);
}

void CQueryBuilderApp::UninitializeCef()
{
CefShutdown();
}

}
11 changes: 1 addition & 10 deletions eclide/QueryBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

#include "..\en_us\resource.h" // main symbols

#include "include/cef_base.h"
#include "include/cef_app.h"

// CQueryBuilderApp:
// See QueryBuilder.cpp for the implementation of this class
//
Expand Down Expand Up @@ -42,13 +39,7 @@ class CQueryBuilderApp : public CWinAppEx
virtual void SaveCustomState();

afx_msg void OnAppAbout();
DECLARE_MESSAGE_MAP()

private:
CefRefPtr<CefApp> m_cefApp;

bool InitializeCef();
void UninitializeCef();
DECLARE_MESSAGE_MAP();

};

Expand Down
2 changes: 0 additions & 2 deletions eclide/SummaryView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ CSummaryView::CSummaryView(IResultSlot *resultSlot)
m_browserEngine = GetIConfig(QUERYBUILDER_CFG)->Get(GLOBAL_BROWSER_ENGINE);
if (m_browserEngine.Compare(_T("IE")) == 0) {
m_view = CreateIEView();
} else if (m_browserEngine.Compare(_T("Chromium")) == 0) {
m_view = CreateChromiumView();
} else {
m_view = CreateWebView2View();
}
Expand Down
2 changes: 0 additions & 2 deletions en_us/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ ADD_LIBRARY (EN_US SHARED
ADD_CUSTOM_COMMAND(
TARGET EN_US
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CEF_ROOT_DIR}/Release ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CEF_ROOT_DIR}/Resources ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/docs ${EXECUTABLE_OUTPUT_PATH}/$<CONFIG>
)

Expand Down
Binary file removed third_party/cef/Debug/lib/libcef_dll_wrapper.lib
Binary file not shown.
Binary file removed third_party/cef/Debug/libcef.lib
Binary file not shown.
Binary file removed third_party/cef/Release/chrome_elf.dll
Binary file not shown.
Binary file removed third_party/cef/Release/d3dcompiler_47.dll
Binary file not shown.
Binary file removed third_party/cef/Release/libEGL.dll
Binary file not shown.
Binary file removed third_party/cef/Release/libGLESv2.dll
Binary file not shown.
Binary file removed third_party/cef/Release/libcef.dll
Binary file not shown.
Binary file removed third_party/cef/Release/libcef.lib
Binary file not shown.
Binary file removed third_party/cef/Release/natives_blob.bin
Binary file not shown.
Binary file removed third_party/cef/Release/snapshot_blob.bin
Binary file not shown.
Binary file removed third_party/cef/Release/swiftshader/libEGL.dll
Binary file not shown.
Binary file removed third_party/cef/Release/swiftshader/libGLESv2.dll
Binary file not shown.
Binary file removed third_party/cef/Release/v8_context_snapshot.bin
Binary file not shown.
Binary file removed third_party/cef/Resources/cef.pak
Binary file not shown.
Binary file removed third_party/cef/Resources/cef_100_percent.pak
Binary file not shown.
Binary file removed third_party/cef/Resources/cef_200_percent.pak
Binary file not shown.
Binary file removed third_party/cef/Resources/cef_extensions.pak
Binary file not shown.
Binary file removed third_party/cef/Resources/devtools_resources.pak
Binary file not shown.
Binary file removed third_party/cef/Resources/icudtl.dat
Binary file not shown.
Binary file removed third_party/cef/Resources/locales/en-US.pak
Binary file not shown.
165 changes: 0 additions & 165 deletions third_party/cef/include/base/cef_atomic_ref_count.h

This file was deleted.

Loading
Loading