Revert accidental commits

This reverts commit fb37284c027b494ed3ec21124001fcb729f42cc4.
This reverts commit 4db0f51b9aa76cfc7649787fe1970af606ce8dab.

5 files changed, 0 insertions, 130 deletions

diff --git a/core/os/shared_mem_access.cpp b/core/os/shared_mem_access.cpp
deleted file mode 100644
index a953206cda..0000000000
--- a/core/os/shared_mem_access.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************/
-/*  shared_mem_access.cpp                                                */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "shared_mem_access.h"
-
-#include "core/error_macros.h"
-
-SharedMemAccess *(*SharedMemAccess::create_func)(const String &p_name) = 0;
-
-SharedMemAccess *SharedMemAccess::create(const String &p_name) {
-
-	ERR_FAIL_COND_V(!create_func, 0);
-
-	return create_func(p_name);
-}
-
-SharedMemAccess::~SharedMemAccess() {
-}
diff --git a/core/os/shared_mem_access.h b/core/os/shared_mem_access.h
deleted file mode 100644
index 051b94f823..0000000000
--- a/core/os/shared_mem_access.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************/
-/*  shared_mem_access.h                                                  */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef SHARED_MEM_ACCESS
-#define SHARED_MEM_ACCESS
-
-#include "core/error_list.h"
-#include "core/int_types.h"
-
-class String;
-
-class SharedMemAccess {
-
-protected:
-	static SharedMemAccess *(*create_func)(const String &p_name);
-
-public:
-	static SharedMemAccess *create(const String &p_name);
-
-	virtual Error open() = 0;
-	virtual Error close() = 0;
-	virtual bool is_open() = 0;
-
-	virtual void *lock() = 0;
-	virtual void unlock() = 0;
-	virtual bool is_locking() = 0;
-
-	virtual void *set_size(uint64_t p_size) = 0;
-	virtual uint64_t get_size() = 0;
-
-	virtual ~SharedMemAccess();
-};
-
-#endif
diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp
index ad7a49451f..e7ff7a3aef 100644
--- a/core/script_debugger_remote.cpp
+++ b/core/script_debugger_remote.cpp
@@ -282,11 +282,6 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script, bool p_can_continue)
 				if (request_scene_tree)
 					request_scene_tree(request_scene_tree_ud);
 
-			} else if (command == "request_framebuffer") {
-
-				if (request_framebuffer)
-					request_framebuffer(request_framebuffer_ud);
-
 			} else if (command == "request_video_mem") {
 
 				_send_video_memory();
@@ -713,10 +708,6 @@ void ScriptDebuggerRemote::_poll_events() {
 
 			if (request_scene_tree)
 				request_scene_tree(request_scene_tree_ud);
-		} else if (command == "request_framebuffer") {
-
-			if (request_framebuffer)
-				request_framebuffer(request_framebuffer_ud);
 		} else if (command == "request_video_mem") {
 
 			_send_video_memory();
@@ -1018,12 +1009,6 @@ void ScriptDebuggerRemote::set_request_scene_tree_message_func(RequestSceneTreeM
 	request_scene_tree_ud = p_udata;
 }
 
-void ScriptDebuggerRemote::set_request_framebuffer_message_func(RequestFramebufferMessageFunc p_func, void *p_udata) {
-
-	request_framebuffer = p_func;
-	request_framebuffer_ud = p_udata;
-}
-
 void ScriptDebuggerRemote::set_live_edit_funcs(LiveEditFuncs *p_funcs) {
 
 	live_edit_funcs = p_funcs;
@@ -1094,7 +1079,6 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() :
 		locking(false),
 		poll_every(0),
 		request_scene_tree(NULL),
-		request_framebuffer(NULL),
 		live_edit_funcs(NULL) {
 
 	packet_peer_stream->set_stream_peer(tcp_client);
diff --git a/core/script_debugger_remote.h b/core/script_debugger_remote.h
index bf122abc67..1fc9d7c7f1 100644
--- a/core/script_debugger_remote.h
+++ b/core/script_debugger_remote.h
@@ -113,9 +113,6 @@ class ScriptDebuggerRemote : public ScriptDebugger {
 	RequestSceneTreeMessageFunc request_scene_tree;
 	void *request_scene_tree_ud;
 
-	RequestFramebufferMessageFunc request_framebuffer;
-	void *request_framebuffer_ud;
-
 	void _set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value);
 
 	void _send_object_id(ObjectID p_id);
@@ -168,8 +165,6 @@ public:
 	virtual void set_request_scene_tree_message_func(RequestSceneTreeMessageFunc p_func, void *p_udata);
 	virtual void set_live_edit_funcs(LiveEditFuncs *p_funcs);
 
-	virtual void set_request_framebuffer_message_func(RequestFramebufferMessageFunc p_func, void *p_udata);
-
 	virtual bool is_profiling() const;
 	virtual void add_profiling_frame_data(const StringName &p_name, const Array &p_data);
 
diff --git a/core/script_language.h b/core/script_language.h
index 704830d0b0..b6d7bea9c7 100644
--- a/core/script_language.h
+++ b/core/script_language.h
@@ -390,7 +390,6 @@ class ScriptDebugger {
 
 public:
 	typedef void (*RequestSceneTreeMessageFunc)(void *);
-	typedef void (*RequestFramebufferMessageFunc)(void *);
 
 	struct LiveEditFuncs {
 
@@ -446,8 +445,6 @@ public:
 	virtual void set_request_scene_tree_message_func(RequestSceneTreeMessageFunc p_func, void *p_udata) {}
 	virtual void set_live_edit_funcs(LiveEditFuncs *p_funcs) {}
 
-	virtual void set_request_framebuffer_message_func(RequestFramebufferMessageFunc p_func, void *p_udata) {}
-
 	virtual bool is_profiling() const = 0;
 	virtual void add_profiling_frame_data(const StringName &p_name, const Array &p_data) = 0;
 	virtual void profiling_start() = 0;