mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 11:51:47 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
174 lines
5.0 KiB
C++
174 lines
5.0 KiB
C++
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#ifndef CEF_LIBCEF_COMMON_REQUEST_IMPL_H_
|
|
#define CEF_LIBCEF_COMMON_REQUEST_IMPL_H_
|
|
#pragma once
|
|
|
|
#include "include/cef_request.h"
|
|
|
|
#include "base/synchronization/lock.h"
|
|
#include "third_party/WebKit/public/platform/WebHTTPBody.h"
|
|
|
|
namespace net {
|
|
class HttpRequestHeaders;
|
|
class UploadData;
|
|
class UploadDataStream;
|
|
class UploadElement;
|
|
class UploadElementReader;
|
|
class URLRequest;
|
|
};
|
|
|
|
namespace blink {
|
|
class WebURLRequest;
|
|
}
|
|
|
|
// Implementation of CefRequest
|
|
class CefRequestImpl : public CefRequest {
|
|
public:
|
|
CefRequestImpl();
|
|
~CefRequestImpl() {}
|
|
|
|
virtual bool IsReadOnly() OVERRIDE;
|
|
virtual CefString GetURL() OVERRIDE;
|
|
virtual void SetURL(const CefString& url) OVERRIDE;
|
|
virtual CefString GetMethod() OVERRIDE;
|
|
virtual void SetMethod(const CefString& method) OVERRIDE;
|
|
virtual CefRefPtr<CefPostData> GetPostData() OVERRIDE;
|
|
virtual void SetPostData(CefRefPtr<CefPostData> postData) OVERRIDE;
|
|
virtual void GetHeaderMap(HeaderMap& headerMap) OVERRIDE;
|
|
virtual void SetHeaderMap(const HeaderMap& headerMap) OVERRIDE;
|
|
virtual void Set(const CefString& url,
|
|
const CefString& method,
|
|
CefRefPtr<CefPostData> postData,
|
|
const HeaderMap& headerMap) OVERRIDE;
|
|
virtual int GetFlags() OVERRIDE;
|
|
virtual void SetFlags(int flags) OVERRIDE;
|
|
virtual CefString GetFirstPartyForCookies() OVERRIDE;
|
|
virtual void SetFirstPartyForCookies(const CefString& url) OVERRIDE;
|
|
virtual ResourceType GetResourceType() OVERRIDE;
|
|
virtual TransitionType GetTransitionType() OVERRIDE;
|
|
|
|
// Populate this object from the URLRequest object.
|
|
void Set(net::URLRequest* request);
|
|
|
|
// Populate the URLRequest object from this object.
|
|
void Get(net::URLRequest* request);
|
|
|
|
// Populate this object from a WebURLRequest object.
|
|
void Set(const blink::WebURLRequest& request);
|
|
|
|
// Populate the WebURLRequest object from this object.
|
|
void Get(blink::WebURLRequest& request);
|
|
|
|
void SetReadOnly(bool read_only);
|
|
|
|
static void GetHeaderMap(const net::HttpRequestHeaders& headers,
|
|
HeaderMap& map);
|
|
static void GetHeaderMap(const blink::WebURLRequest& request,
|
|
HeaderMap& map);
|
|
static void SetHeaderMap(const HeaderMap& map,
|
|
blink::WebURLRequest& request);
|
|
|
|
protected:
|
|
CefString url_;
|
|
CefString method_;
|
|
CefRefPtr<CefPostData> postdata_;
|
|
HeaderMap headermap_;
|
|
ResourceType resource_type_;
|
|
TransitionType transition_type_;
|
|
|
|
// The below members are used by CefURLRequest.
|
|
int flags_;
|
|
CefString first_party_for_cookies_;
|
|
|
|
// True if this object is read-only.
|
|
bool read_only_;
|
|
|
|
base::Lock lock_;
|
|
|
|
IMPLEMENT_REFCOUNTING(CefRequestImpl);
|
|
};
|
|
|
|
// Implementation of CefPostData
|
|
class CefPostDataImpl : public CefPostData {
|
|
public:
|
|
CefPostDataImpl();
|
|
~CefPostDataImpl() {}
|
|
|
|
virtual bool IsReadOnly() OVERRIDE;
|
|
virtual size_t GetElementCount() OVERRIDE;
|
|
virtual void GetElements(ElementVector& elements) OVERRIDE;
|
|
virtual bool RemoveElement(CefRefPtr<CefPostDataElement> element) OVERRIDE;
|
|
virtual bool AddElement(CefRefPtr<CefPostDataElement> element) OVERRIDE;
|
|
virtual void RemoveElements();
|
|
|
|
void Set(const net::UploadData& data);
|
|
void Set(const net::UploadDataStream& data_stream);
|
|
void Get(net::UploadData& data);
|
|
net::UploadDataStream* Get();
|
|
void Set(const blink::WebHTTPBody& data);
|
|
void Get(blink::WebHTTPBody& data);
|
|
|
|
void SetReadOnly(bool read_only);
|
|
|
|
protected:
|
|
ElementVector elements_;
|
|
|
|
// True if this object is read-only.
|
|
bool read_only_;
|
|
|
|
base::Lock lock_;
|
|
|
|
IMPLEMENT_REFCOUNTING(CefPostDataImpl);
|
|
};
|
|
|
|
// Implementation of CefPostDataElement
|
|
class CefPostDataElementImpl : public CefPostDataElement {
|
|
public:
|
|
CefPostDataElementImpl();
|
|
~CefPostDataElementImpl();
|
|
|
|
virtual bool IsReadOnly() OVERRIDE;
|
|
virtual void SetToEmpty() OVERRIDE;
|
|
virtual void SetToFile(const CefString& fileName) OVERRIDE;
|
|
virtual void SetToBytes(size_t size, const void* bytes) OVERRIDE;
|
|
virtual Type GetType() OVERRIDE;
|
|
virtual CefString GetFile() OVERRIDE;
|
|
virtual size_t GetBytesCount() OVERRIDE;
|
|
virtual size_t GetBytes(size_t size, void* bytes) OVERRIDE;
|
|
|
|
void* GetBytes() { return data_.bytes.bytes; }
|
|
|
|
void Set(const net::UploadElement& element);
|
|
void Set(const net::UploadElementReader& element_reader);
|
|
void Get(net::UploadElement& element);
|
|
net::UploadElementReader* Get();
|
|
void Set(const blink::WebHTTPBody::Element& element);
|
|
void Get(blink::WebHTTPBody::Element& element);
|
|
|
|
void SetReadOnly(bool read_only);
|
|
|
|
protected:
|
|
void Cleanup();
|
|
|
|
Type type_;
|
|
union {
|
|
struct {
|
|
void* bytes;
|
|
size_t size;
|
|
} bytes;
|
|
cef_string_t filename;
|
|
} data_;
|
|
|
|
// True if this object is read-only.
|
|
bool read_only_;
|
|
|
|
base::Lock lock_;
|
|
|
|
IMPLEMENT_REFCOUNTING(CefPostDataElementImpl);
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_COMMON_REQUEST_IMPL_H_
|