From 4d07f406ca4dcc4cbd0fe26a8a56cbd43593c82a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 13 Sep 2012 14:51:07 -0700 Subject: [PATCH] Use message_translation from parent folder --- native/linux/atom.gyp | 2 +- native/linux/message_translation.cpp | 82 ---------------------------- native/linux/message_translation.h | 11 ---- 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 native/linux/message_translation.cpp delete mode 100644 native/linux/message_translation.h diff --git a/native/linux/atom.gyp b/native/linux/atom.gyp index 1f8e157d1..3e193212d 100644 --- a/native/linux/atom.gyp +++ b/native/linux/atom.gyp @@ -22,11 +22,11 @@ '../v8_extensions/atom_linux.cpp', '../v8_extensions/native_linux.cpp', '../v8_extensions/onig_reg_exp_linux.cpp', + '../message_translation.cpp', 'atom.cpp', 'atom_cef_render_process_handler.cpp', 'client_handler.cpp', 'io_utils.cpp', - 'message_translation.cpp', 'native_handler.cpp', 'onig_regexp_extension.cpp', ], diff --git a/native/linux/message_translation.cpp b/native/linux/message_translation.cpp deleted file mode 100644 index 0913279b9..000000000 --- a/native/linux/message_translation.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include "message_translation.h" - -// Transfer a V8 value to a List index. -void TranslateListValue(CefRefPtr list, int index, CefRefPtr value) { - if (value->IsArray()) { - CefRefPtr new_list = CefListValue::Create(); - TranslateList(value, new_list); - list->SetList(index, new_list); - } else if (value->IsString()) { - list->SetString(index, value->GetStringValue()); - } else if (value->IsBool()) { - list->SetBool(index, value->GetBoolValue()); - } else if (value->IsInt()) { - list->SetInt(index, value->GetIntValue()); - } else if (value->IsDouble()) { - list->SetDouble(index, value->GetDoubleValue()); - } -} - -// Transfer a V8 array to a List. -void TranslateList(CefRefPtr source, CefRefPtr target) { - assert(source->IsArray()); - - int arg_length = source->GetArrayLength(); - if (arg_length == 0) - return; - - // Start with null types in all spaces. - target->SetSize(arg_length); - - for (int i = 0; i < arg_length; ++i) { - TranslateListValue(target, i, source->GetValue(i)); - } -} - -// Transfer a List value to a V8 array index. -void TranslateListValue(CefRefPtr list, int index, CefRefPtr value) { - CefRefPtr new_value; - - CefValueType type = value->GetType(index); - switch (type) { - case VTYPE_LIST: { - CefRefPtr list = value->GetList(index); - new_value = CefV8Value::CreateArray(list->GetSize()); - TranslateList(list, new_value); - } break; - case VTYPE_BOOL: - new_value = CefV8Value::CreateBool(value->GetBool(index)); - break; - case VTYPE_DOUBLE: - new_value = CefV8Value::CreateDouble(value->GetDouble(index)); - break; - case VTYPE_INT: - new_value = CefV8Value::CreateInt(value->GetInt(index)); - break; - case VTYPE_STRING: - new_value = CefV8Value::CreateString(value->GetString(index)); - break; - default: - break; - } - - if (new_value.get()) { - list->SetValue(index, new_value); - } else { - list->SetValue(index, CefV8Value::CreateNull()); - } -} - -// Transfer a List to a V8 array. -void TranslateList(CefRefPtr source, CefRefPtr target) { - assert(target->IsArray()); - - int arg_length = source->GetSize(); - if (arg_length == 0) - return; - - for (int i = 0; i < arg_length; ++i) { - TranslateListValue(target, i, source); - } -} diff --git a/native/linux/message_translation.h b/native/linux/message_translation.h deleted file mode 100644 index e6caaf332..000000000 --- a/native/linux/message_translation.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef ATOM_CEF_CLIENT_H_ -#define ATOM_CEF_CLIENT_H_ -#pragma once - -#include "include/cef_v8.h" - -// IPC data translation functions: translate a V8 array to a List, and vice versa -void TranslateList(CefRefPtr source, CefRefPtr target); -void TranslateList(CefRefPtr source, CefRefPtr target); - -#endif \ No newline at end of file