bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac: Add support for cef_time_t.day_of_week (issue #629). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@690 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-06-11 20:35:26 +00:00
parent 11fb746e95
commit b900cdfc8b
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/cef_time.h
View File

@ -44,9 +44,7 @@ extern "C" {
typedef struct _cef_time_t { typedef struct _cef_time_t {
int year; // Four digit year "2007" int year; // Four digit year "2007"
int month; // 1-based month (values 1 = January, etc.) int month; // 1-based month (values 1 = January, etc.)
#if !defined(OS_MACOSX)
int day_of_week; // 0-based day of week (0 = Sunday, etc.) int day_of_week; // 0-based day of week (0 = Sunday, etc.)
#endif
int day_of_month; // 1-based day of month (1-31) int day_of_month; // 1-based day of month (1-31)
int hour; // Hour within the current day (0-23) int hour; // Hour within the current day (0-23)
int minute; // Minute within the current hour (0-59) int minute; // Minute within the current hour (0-59)

4
libcef/common/time_impl.cc
View File

@ -8,9 +8,7 @@ void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) {
base::Time::Exploded exploded; base::Time::Exploded exploded;
exploded.year = cef_time.year; exploded.year = cef_time.year;
exploded.month = cef_time.month; exploded.month = cef_time.month;
#if !defined(OS_MACOSX)
exploded.day_of_week = cef_time.day_of_week; exploded.day_of_week = cef_time.day_of_week;
#endif
exploded.day_of_month = cef_time.day_of_month; exploded.day_of_month = cef_time.day_of_month;
exploded.hour = cef_time.hour; exploded.hour = cef_time.hour;
exploded.minute = cef_time.minute; exploded.minute = cef_time.minute;
@ -24,9 +22,7 @@ void cef_time_from_basetime(const base::Time& time, cef_time_t& cef_time) {
time.UTCExplode(&exploded); time.UTCExplode(&exploded);
cef_time.year = exploded.year; cef_time.year = exploded.year;
cef_time.month = exploded.month; cef_time.month = exploded.month;
#if !defined(OS_MACOSX)
cef_time.day_of_week = exploded.day_of_week; cef_time.day_of_week = exploded.day_of_week;
#endif
cef_time.day_of_month = exploded.day_of_month; cef_time.day_of_month = exploded.day_of_month;
cef_time.hour = exploded.hour; cef_time.hour = exploded.hour;
cef_time.minute = exploded.minute; cef_time.minute = exploded.minute;

4
tests/unittests/cookie_unittest.cc
View File

@ -94,9 +94,7 @@ void CreateCookie(CefRefPtr<CefCookieManager> manager,
cookie.has_expires = true; cookie.has_expires = true;
cookie.expires.year = 2200; cookie.expires.year = 2200;
cookie.expires.month = 4; cookie.expires.month = 4;
#if !defined(OS_MACOSX)
cookie.expires.day_of_week = 5; cookie.expires.day_of_week = 5;
#endif
cookie.expires.day_of_month = 11; cookie.expires.day_of_month = 11;
CookieVector cookies; CookieVector cookies;
@ -131,9 +129,7 @@ void GetCookie(CefRefPtr<CefCookieManager> manager,
EXPECT_TRUE(cookie_read.has_expires); EXPECT_TRUE(cookie_read.has_expires);
EXPECT_EQ(cookie.expires.year, cookie_read.expires.year); EXPECT_EQ(cookie.expires.year, cookie_read.expires.year);
EXPECT_EQ(cookie.expires.month, cookie_read.expires.month); EXPECT_EQ(cookie.expires.month, cookie_read.expires.month);
#if !defined(OS_MACOSX)
EXPECT_EQ(cookie.expires.day_of_week, cookie_read.expires.day_of_week); EXPECT_EQ(cookie.expires.day_of_week, cookie_read.expires.day_of_week);
#endif
EXPECT_EQ(cookie.expires.day_of_month, cookie_read.expires.day_of_month); EXPECT_EQ(cookie.expires.day_of_month, cookie_read.expires.day_of_month);
EXPECT_EQ(cookie.expires.hour, cookie_read.expires.hour); EXPECT_EQ(cookie.expires.hour, cookie_read.expires.hour);
EXPECT_EQ(cookie.expires.minute, cookie_read.expires.minute); EXPECT_EQ(cookie.expires.minute, cookie_read.expires.minute);