From 97d3edf7068212ff293dde2fd8567f18241bcac1 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Mon, 13 Aug 2012 09:25:40 -0700 Subject: [PATCH] remove string_util and its dependencies --- atom.gyp | 4 -- tests/cefclient/cefclient.cpp | 38 ----------------- tests/cefclient/cefclient.h | 20 --------- tests/cefclient/client_handler.cpp | 39 +----------------- tests/cefclient/string_util.cpp | 66 ------------------------------ tests/cefclient/string_util.h | 7 ---- 6 files changed, 1 insertion(+), 173 deletions(-) diff --git a/atom.gyp b/atom.gyp index cdcc267c8..55be4abe9 100644 --- a/atom.gyp +++ b/atom.gyp @@ -58,8 +58,6 @@ 'tests/cefclient/client_switches.cpp', 'tests/cefclient/client_switches.h', 'tests/cefclient/resource_util.h', - 'tests/cefclient/string_util.cpp', - 'tests/cefclient/string_util.h', 'tests/cefclient/util.h', ], 'mac_bundle_resources': [ @@ -286,8 +284,6 @@ 'tests/cefclient/process_helper_mac.cpp', 'tests/cefclient/resource_util.h', 'tests/cefclient/resource_util_mac.mm', - 'tests/cefclient/string_util.cpp', - 'tests/cefclient/string_util.h', 'tests/cefclient/util.h', ], # TODO(mark): Come up with a fancier way to do this. It should only diff --git a/tests/cefclient/cefclient.cpp b/tests/cefclient/cefclient.cpp index 6d8994b9f..e7f895f42 100644 --- a/tests/cefclient/cefclient.cpp +++ b/tests/cefclient/cefclient.cpp @@ -192,41 +192,3 @@ void AppGetBrowserSettings(CefBrowserSettings& settings) { settings.fullscreen_enabled = g_command_line->HasSwitch(cefclient::kFullscreenEnabled); } - -void RunGetSourceTest(CefRefPtr browser) { - class Visitor : public CefStringVisitor { - public: - explicit Visitor(CefRefPtr browser) : browser_(browser) {} - virtual void Visit(const CefString& string) OVERRIDE { - std::string source = StringReplace(string, "<", "<"); - source = StringReplace(source, ">", ">"); - std::stringstream ss; - ss << "Source:
" << source << "
"; - browser_->GetMainFrame()->LoadString(ss.str(), "http://tests/getsource"); - } - private: - CefRefPtr browser_; - IMPLEMENT_REFCOUNTING(Visitor); - }; - - browser->GetMainFrame()->GetSource(new Visitor(browser)); -} - -void RunGetTextTest(CefRefPtr browser) { - class Visitor : public CefStringVisitor { - public: - explicit Visitor(CefRefPtr browser) : browser_(browser) {} - virtual void Visit(const CefString& string) OVERRIDE { - std::string text = StringReplace(string, "<", "<"); - text = StringReplace(text, ">", ">"); - std::stringstream ss; - ss << "Text:
" << text << "
"; - browser_->GetMainFrame()->LoadString(ss.str(), "http://tests/gettext"); - } - private: - CefRefPtr browser_; - IMPLEMENT_REFCOUNTING(Visitor); - }; - - browser->GetMainFrame()->GetText(new Visitor(browser)); -} diff --git a/tests/cefclient/cefclient.h b/tests/cefclient/cefclient.h index cd01401f2..3b38f0b73 100644 --- a/tests/cefclient/cefclient.h +++ b/tests/cefclient/cefclient.h @@ -35,24 +35,4 @@ void AppGetSettings(CefSettings& settings, CefRefPtr app); // Returns the application browser settings based on command line arguments. void AppGetBrowserSettings(CefBrowserSettings& settings); -// Implementations for various tests. -void RunGetSourceTest(CefRefPtr browser); -void RunGetTextTest(CefRefPtr browser); -void RunRequestTest(CefRefPtr browser); -void RunPopupTest(CefRefPtr browser); -void RunDialogTest(CefRefPtr browser); -void RunPluginInfoTest(CefRefPtr browser); -void RunLocalStorageTest(CefRefPtr browser); -void RunAccelerated2DCanvasTest(CefRefPtr browser); -void RunAcceleratedLayersTest(CefRefPtr browser); -void RunWebGLTest(CefRefPtr browser); -void RunHTML5VideoTest(CefRefPtr browser); -void RunXMLHTTPRequestTest(CefRefPtr browser); -void RunDragDropTest(CefRefPtr browser); -void RunGeolocationTest(CefRefPtr browser); - -#if defined(OS_WIN) -void RunTransparentPopupTest(CefRefPtr browser); -#endif - #endif // CEF_TESTS_CEFCLIENT_CEFCLIENT_H_ diff --git a/tests/cefclient/client_handler.cpp b/tests/cefclient/client_handler.cpp index 10ff6c1c6..5c94a6a17 100644 --- a/tests/cefclient/client_handler.cpp +++ b/tests/cefclient/client_handler.cpp @@ -337,45 +337,8 @@ CefRefPtr ClientHandler::GetResourceHandler( CefRefPtr browser, CefRefPtr frame, CefRefPtr request) { - std::string url = request->GetURL(); - if (url == "http://tests/request") { - // Show the request contents - std::string dump; - DumpRequestContents(request, dump); - CefRefPtr stream = - CefStreamReader::CreateForData( - static_cast(const_cast(dump.c_str())), - dump.size()); - ASSERT(stream.get()); - return new CefStreamResourceHandler("text/plain", stream); - } else if (url == "http://tests/dialogs") { - // Show the dialogs contents - CefRefPtr stream = - GetBinaryResourceReader("dialogs.html"); - ASSERT(stream.get()); - return new CefStreamResourceHandler("text/html", stream); - } else if (url == "http://tests/localstorage") { - // Show the localstorage contents - CefRefPtr stream = - GetBinaryResourceReader("localstorage.html"); - ASSERT(stream.get()); - return new CefStreamResourceHandler("text/html", stream); - } else if (url == "http://tests/xmlhttprequest") { - // Show the xmlhttprequest contents - CefRefPtr stream = - GetBinaryResourceReader("xmlhttprequest.html"); - ASSERT(stream.get()); - return new CefStreamResourceHandler("text/html", stream); - } - CefRefPtr handler; - - // Execute delegate callbacks. - RequestDelegateSet::iterator it = request_delegates_.begin(); - for (; it != request_delegates_.end() && !handler.get(); ++it) - handler = (*it)->GetResourceHandler(this, browser, frame, request); - - return handler; + return NULL; } void ClientHandler::OnProtocolExecution(CefRefPtr browser, diff --git a/tests/cefclient/string_util.cpp b/tests/cefclient/string_util.cpp index ebeca5c03..35bf2ec19 100644 --- a/tests/cefclient/string_util.cpp +++ b/tests/cefclient/string_util.cpp @@ -6,69 +6,3 @@ #include #include #include "include/cef_request.h" - -void DumpRequestContents(CefRefPtr request, std::string& str) { - std::stringstream ss; - - ss << "URL: " << std::string(request->GetURL()); - ss << "\nMethod: " << std::string(request->GetMethod()); - - CefRequest::HeaderMap headerMap; - request->GetHeaderMap(headerMap); - if (headerMap.size() > 0) { - ss << "\nHeaders:"; - CefRequest::HeaderMap::const_iterator it = headerMap.begin(); - for (; it != headerMap.end(); ++it) { - ss << "\n\t" << std::string((*it).first) << ": " << - std::string((*it).second); - } - } - - CefRefPtr postData = request->GetPostData(); - if (postData.get()) { - CefPostData::ElementVector elements; - postData->GetElements(elements); - if (elements.size() > 0) { - ss << "\nPost Data:"; - CefRefPtr element; - CefPostData::ElementVector::const_iterator it = elements.begin(); - for (; it != elements.end(); ++it) { - element = (*it); - if (element->GetType() == PDE_TYPE_BYTES) { - // the element is composed of bytes - ss << "\n\tBytes: "; - if (element->GetBytesCount() == 0) { - ss << "(empty)"; - } else { - // retrieve the data. - size_t size = element->GetBytesCount(); - char* bytes = new char[size]; - element->GetBytes(size, bytes); - ss << std::string(bytes, size); - delete [] bytes; - } - } else if (element->GetType() == PDE_TYPE_FILE) { - ss << "\n\tFile: " << std::string(element->GetFile()); - } - } - } - } - - str = ss.str(); -} - -std::string StringReplace(const std::string& str, const std::string& from, - const std::string& to) { - std::string result = str; - std::string::size_type pos = 0; - std::string::size_type from_len = from.length(); - std::string::size_type to_len = to.length(); - do { - pos = result.find(from, pos); - if (pos != std::string::npos) { - result.replace(pos, from_len, to); - pos += to_len; - } - } while (pos != std::string::npos); - return result; -} diff --git a/tests/cefclient/string_util.h b/tests/cefclient/string_util.h index c43e6f210..6e679f812 100644 --- a/tests/cefclient/string_util.h +++ b/tests/cefclient/string_util.h @@ -11,11 +11,4 @@ class CefRequest; -// Dump the contents of the request into a string. -void DumpRequestContents(CefRefPtr request, std::string& str); - -// Replace all instances of |from| with |to| in |str|. -std::string StringReplace(const std::string& str, const std::string& from, - const std::string& to); - #endif // CEF_TESTS_CEFCLIENT_STRING_UTIL_H_