From 90aea07657f345c71d06ddada446c4b5c684984c Mon Sep 17 00:00:00 2001 From: shenxinchen Date: Tue, 31 Dec 2024 12:37:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E9=99=90=E5=88=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E5=8F=96=E5=80=BC=E8=8C=83=E5=9B=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8e7dbb9bce954a79c75bc44b3919c1fa9b8057c3. Signed-off-by: shenxinchen --- .../nweb_url_resource_response_impl.cc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc index 9fab603515..d9c4252bd8 100644 --- a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc +++ b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc @@ -101,22 +101,6 @@ bool NWebUrlResourceResponseImpl::ResponseIsFileHandle() { return isFileFd_; } -bool NWebUrlResourceResponseImpl::IsSupportedStatusCode(int status_code) { - if (status_code >= kMinStatusCode_ && status_code <= kMaxStatusCode_) { - return true; - } - - switch (status_code) { -#define NET_ERROR(label, value) \ - case value: \ - return true; -#include "net/base/net_error_list.h" -#undef NET_ERROR - default: - return false; - } -} - void NWebUrlResourceResponseImpl::PutResponseFileHandle(int fd) { dataType_ = NWebResponseDataType::NWEB_FILE_TYPE; fd_ = fd; -- Gitee From 879f936dffd2fb1b200ae26edb2b9cde08580df5 Mon Sep 17 00:00:00 2001 From: shenxinchen Date: Tue, 31 Dec 2024 12:37:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E9=99=90=E5=88=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E5=8F=96=E5=80=BC=E8=8C=83=E5=9B=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f360706ba0239463c0696908d7f9e4c3211b38b2. Signed-off-by: shenxinchen --- .../src/cef_delegate/nweb_url_resource_response_impl.cc | 6 +----- .../src/cef_delegate/nweb_url_resource_response_impl.h | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc index d9c4252bd8..85b08f5248 100644 --- a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc +++ b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.cc @@ -69,11 +69,7 @@ NWebUrlResourceResponseImpl::ResponseHeaders() { void NWebUrlResourceResponseImpl::PutResponseStateAndStatuscode( int status_code, const std::string &reason_phrase) { - if (IsSupportedStatusCode(status_code)) { - status_code_ = status_code; - } else { - status_code_ = net_failed_; - } + status_code_ = status_code; reason_phrase_ = reason_phrase; } diff --git a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.h b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.h index 413baf427f..748e1dc3d6 100644 --- a/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.h +++ b/ohos_nweb/src/cef_delegate/nweb_url_resource_response_impl.h @@ -153,9 +153,6 @@ public: size_t GetResponseDataBufferSize() override; -private: - static bool IsSupportedStatusCode(int status_code); - private: std::string mime_type_; std::string encoding_; @@ -171,9 +168,6 @@ private: std::shared_ptr readyCallback_ = nullptr; char* buffer_; size_t bufferSize_ = 0; - const int net_failed_ = -2; - static const int kMinStatusCode_ = 100; - static const int kMaxStatusCode_ = 599; }; } // namespace OHOS::NWeb -- Gitee