From 6011d39ca1fc142c4a5e12f926c482abdfbfa142 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 6 May 2015 12:49:32 -0400 Subject: [PATCH] one more embedding interfaces update because they removed cef_url & time_t --- ports/cef/interfaces/cef_url.rs | 46 -------------------------- ports/cef/interfaces/cef_zip_reader.rs | 4 +-- ports/cef/interfaces/mod.rs | 2 -- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 ports/cef/interfaces/cef_url.rs diff --git a/ports/cef/interfaces/cef_url.rs b/ports/cef/interfaces/cef_url.rs deleted file mode 100644 index c8622bc9cc9..00000000000 --- a/ports/cef/interfaces/cef_url.rs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the name Chromium Embedded -// Framework nor the names of its contributors may be used to endorse -// or promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool and should not be edited -// by hand. See the translator.README.txt file in the tools directory for -// more information. -// - -#![allow(non_snake_case, unused_imports)] - -use eutil; -use interfaces; -use types; -use wrappers::CefWrap; - -use libc; -use std::collections::HashMap; -use std::ptr; diff --git a/ports/cef/interfaces/cef_zip_reader.rs b/ports/cef/interfaces/cef_zip_reader.rs index 39b104ae8cf..fa68644de81 100644 --- a/ports/cef/interfaces/cef_zip_reader.rs +++ b/ports/cef/interfaces/cef_zip_reader.rs @@ -106,7 +106,7 @@ pub struct _cef_zip_reader_t { // Returns the last modified timestamp for the file. // pub get_file_last_modified: Option libc::time_t>, + this: *mut cef_zip_reader_t) -> types::cef_time_t>, // // Opens the file for reading of uncompressed data. A read password may @@ -329,7 +329,7 @@ impl CefZipReader { // // Returns the last modified timestamp for the file. // - pub fn get_file_last_modified(&self) -> libc::time_t { + pub fn get_file_last_modified(&self) -> types::cef_time_t { if self.c_object.is_null() || self.c_object as usize == mem::POST_DROP_USIZE { panic!("called a CEF method on a null object") diff --git a/ports/cef/interfaces/mod.rs b/ports/cef/interfaces/mod.rs index b7c805007e7..19177845e01 100644 --- a/ports/cef/interfaces/mod.rs +++ b/ports/cef/interfaces/mod.rs @@ -52,7 +52,6 @@ pub use interfaces::cef_string_visitor::{CefStringVisitor,cef_string_visitor_t,} pub use interfaces::cef_task::{CefTask,CefTaskRunner,cef_task_t,cef_task_runner_t,}; pub use interfaces::cef_trace::{CefEndTracingCallback,cef_end_tracing_callback_t,}; pub use interfaces::cef_urlrequest::{CefURLRequest,CefURLRequestClient,cef_urlrequest_t,cef_urlrequest_client_t,}; -pub use interfaces::cef_url::{}; pub use interfaces::cef_v8::{CefV8Context,CefV8Handler,CefV8Accessor,CefV8Exception,CefV8Value,CefV8StackTrace,CefV8StackFrame,cef_v8context_t,cef_v8handler_t,cef_v8accessor_t,cef_v8exception_t,cef_v8value_t,cef_v8stack_trace_t,cef_v8stack_frame_t,}; pub use interfaces::cef_values::{CefValue,CefBinaryValue,CefDictionaryValue,CefListValue,cef_value_t,cef_binary_value_t,cef_dictionary_value_t,cef_list_value_t,}; pub use interfaces::cef_web_plugin::{CefWebPluginInfo,CefWebPluginInfoVisitor,CefWebPluginUnstableCallback,cef_web_plugin_info_t,cef_web_plugin_info_visitor_t,cef_web_plugin_unstable_callback_t,}; @@ -112,7 +111,6 @@ pub mod cef_string_visitor; pub mod cef_task; pub mod cef_trace; pub mod cef_urlrequest; -pub mod cef_url; pub mod cef_v8; pub mod cef_values; pub mod cef_web_plugin;