diff options
Diffstat (limited to 'include/mbgl/platform')
-rw-r--r-- | include/mbgl/platform/platform.hpp | 13 | ||||
-rw-r--r-- | include/mbgl/platform/request.hpp | 41 | ||||
-rw-r--r-- | include/mbgl/platform/response.hpp | 29 |
3 files changed, 0 insertions, 83 deletions
diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index e08cac5312..6356d81bb1 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -1,8 +1,6 @@ #ifndef MBGL_PLATFORM_PLATFORM #define MBGL_PLATFORM_PLATFORM -#include <mbgl/platform/response.hpp> - #include <mbgl/util/uv.hpp> #include <memory> @@ -13,23 +11,12 @@ namespace platform { class Request; -// Makes an HTTP request of a URL, preferrably on a background thread, and calls a function with the -// results in the original thread (which runs the libuv loop). -// If the loop pointer is NULL, the callback function will be called on an arbitrary thread. -// Returns a cancellable request. -std::shared_ptr<Request> request_http(const std::string &url, - std::function<void(Response *)> callback, - std::shared_ptr<uv::loop> loop = nullptr); - // Uppercase a string, potentially using platform-specific routines. std::string uppercase(const std::string &string); // Lowercase a string, potentially using platform-specific routines. std::string lowercase(const std::string &string); -// Cancels an HTTP request. -void cancel_request_http(const std::shared_ptr<Request> &req); - // Shows an alpha image with the specified dimensions in a named window. void show_debug_image(std::string name, const char *data, size_t width, size_t height); diff --git a/include/mbgl/platform/request.hpp b/include/mbgl/platform/request.hpp deleted file mode 100644 index 0cbacf645d..0000000000 --- a/include/mbgl/platform/request.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef MBGL_PLATFORM_REQUEST -#define MBGL_PLATFORM_REQUEST - -#include <string> -#include <functional> -#include <memory> -#include <atomic> - -#include <mbgl/util/noncopyable.hpp> -#include <mbgl/util/uv.hpp> - -namespace mbgl { -namespace platform { - -struct Response; - -class Request : public std::enable_shared_from_this<Request>, private util::noncopyable { -public: - Request(const std::string &url, - std::function<void(Response *)> callback, - std::shared_ptr<uv::loop> loop); - ~Request(); - - void complete(); - -private: - static void complete(uv_async_t *async); - -public: - const std::string url; - std::unique_ptr<Response> res; - std::atomic<bool> cancelled; - -public: - uv_async_t *async = nullptr; - std::shared_ptr<uv::loop> loop; -}; -} -} - -#endif diff --git a/include/mbgl/platform/response.hpp b/include/mbgl/platform/response.hpp deleted file mode 100644 index 345a2ee3df..0000000000 --- a/include/mbgl/platform/response.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef MBGL_PLATFORM_RESPONSE -#define MBGL_PLATFORM_RESPONSE - -#include <string> -#include <functional> -#include <ctime> - -#include <mbgl/util/noncopyable.hpp> - -namespace mbgl { -namespace platform { - -struct Response : private util::noncopyable { - Response(std::function<void(Response *)> callback) : callback(callback) {} - int16_t code = -1; - std::string body; - std::string error_message; - std::time_t modified; - std::time_t expires; - std::function<void(Response *)> callback; - - void setCacheControl(const char *value); - void setLastModified(const char *value); -}; - -} -} - -#endif |