Update to Chromium revision 5fdc0fab (#520840)

- Windows now builds with clang by default.
This commit is contained in:
Marshall Greenblatt
2017-12-07 16:44:24 -05:00
parent d5e141648b
commit 8d51acb9be
153 changed files with 2189 additions and 3387 deletions

View File

@@ -214,13 +214,15 @@ struct CefIAccessible : public IAccessible {
EXCEPINFO FAR* pExcepInfo,
unsigned int FAR* puArgErr);
CefIAccessible(OsrAXNode* node) : node_(node), ref_count_(0) {}
CefIAccessible(OsrAXNode* node) : ref_count_(0), node_(node) {}
// Remove the node reference when OsrAXNode is destroyed, so that
// MSAA clients get CO_E_OBJNOTCONNECTED
void MarkDestroyed() { node_ = NULL; }
protected:
virtual ~CefIAccessible() {}
// Ref Count
ULONG ref_count_;
// OsrAXNode* proxy object
@@ -680,8 +682,7 @@ CefNativeAccessible* OsrAXNode::GetNativeAccessibleObject(OsrAXNode* parent) {
namespace client {
void OsrAXNode::NotifyAccessibilityEvent(std::string event_type) const {
}
void OsrAXNode::NotifyAccessibilityEvent(std::string event_type) const {}
void OsrAXNode::Destroy() {}

View File

@@ -69,7 +69,7 @@ template <typename T>
void GetStorageForString(STGMEDIUM* stgmed, const std::basic_string<T>& data) {
GetStorageForBytes(
stgmed, data.c_str(),
(data.size() + 1) * sizeof(std::basic_string<T>::value_type));
(data.size() + 1) * sizeof(typename std::basic_string<T>::value_type));
}
void GetStorageForFileDescriptor(STGMEDIUM* storage,
@@ -269,7 +269,7 @@ bool DragDataToDataObject(CefRefPtr<CefDragData> drag_data,
}
DCHECK_LT(curr_index, kMaxDataObjects);
CComPtr<IDataObject> obj =
CComPtr<DataObjectWin> obj =
DataObjectWin::Create(fmtetcs, stgmeds, curr_index);
(*data_object) = obj.Detach();
return true;
@@ -389,7 +389,7 @@ CefBrowserHost::DragOperationsMask DropTargetWin::StartDragging(
CComPtr<IDataObject> dataObject;
DWORD resEffect = DROPEFFECT_NONE;
if (DragDataToDataObject(drag_data, &dataObject)) {
CComPtr<IDropSource> dropSource = DropSourceWin::Create();
CComPtr<DropSourceWin> dropSource = DropSourceWin::Create();
DWORD effect = DragOperationToDropEffect(allowed_ops);
current_drag_data_ = drag_data->Clone();
current_drag_data_->ResetFileContents();

View File

@@ -130,7 +130,7 @@ class DragEnumFormatEtc : public IEnumFORMATETC {
// Construction / Destruction
//
DragEnumFormatEtc(FORMATETC* pFormatEtc, int nNumFormats);
~DragEnumFormatEtc();
virtual ~DragEnumFormatEtc();
static void DeepCopyFormatEtc(FORMATETC* dest, FORMATETC* source);
@@ -181,6 +181,7 @@ class DataObjectWin : public IDataObject {
int LookupFormatEtc(FORMATETC* pFormatEtc);
explicit DataObjectWin(FORMATETC* fmtetc, STGMEDIUM* stgmed, int count);
virtual ~DataObjectWin() {}
};
} // namespace client

View File

@@ -92,12 +92,11 @@ void GetCompositionUnderlines(
} // namespace
OsrImeHandlerWin::OsrImeHandlerWin(HWND hwnd)
: ime_status_(false),
hwnd_(hwnd),
: is_composing_(false),
input_language_id_(LANG_USER_DEFAULT),
is_composing_(false),
system_caret_(false),
cursor_index_(-1),
system_caret_(false) {
hwnd_(hwnd) {
ime_rect_ = {-1, -1, 0, 0};
}

View File

@@ -88,9 +88,6 @@ class OsrImeHandlerWin {
// The current composition character range and its bounds.
std::vector<CefRect> composition_bounds_;
// This value represents whether or not the current input context has IMEs.
bool ime_status_;
// The current input Language ID retrieved from Windows -
// used for processing language-specific operations in IME.
LANGID input_language_id_;

View File

@@ -11,7 +11,7 @@ namespace client {
int GetResourceId(const char* resource_name) {
// Map of resource labels to BINARY id values.
static struct _resource_map {
char* name;
const char* name;
int id;
} resource_map[] = {
{"binding.html", IDS_BINDING_HTML},
@@ -48,7 +48,7 @@ int GetResourceId(const char* resource_name) {
{"xmlhttprequest.html", IDS_XMLHTTPREQUEST_HTML},
};
for (int i = 0; i < sizeof(resource_map) / sizeof(_resource_map); ++i) {
for (size_t i = 0; i < sizeof(resource_map) / sizeof(_resource_map); ++i) {
if (!strcmp(resource_map[i].name, resource_name))
return resource_map[i].id;
}