Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 412615 | Differences between
and this patch

Collapse All | Expand All

(-)a/base/time_posix.cc (-1 / +1 lines)
Lines 34-40 struct timespec TimeDelta::ToTimeSpec() const { Link Here
34
  }
34
  }
35
  struct timespec result =
35
  struct timespec result =
36
      {seconds,
36
      {seconds,
37
       microseconds * Time::kNanosecondsPerMicrosecond};
37
       static_cast<long>(microseconds * Time::kNanosecondsPerMicrosecond)};
38
  return result;
38
  return result;
39
}
39
}
40
40
(-)a/chrome/browser/chromeos/process_proxy/process_output_watcher.cc (+1 lines)
Lines 10-15 Link Here
10
10
11
#include <sys/ioctl.h>
11
#include <sys/ioctl.h>
12
#include <sys/select.h>
12
#include <sys/select.h>
13
#include <unistd.h>
13
14
14
#include "base/eintr_wrapper.h"
15
#include "base/eintr_wrapper.h"
15
#include "base/logging.h"
16
#include "base/logging.h"
(-)a/chrome/browser/extensions/settings/settings_frontend.cc (-3 / +3 lines)
Lines 100-108 SettingsStorageQuotaEnforcer::Limits GetLocalLimits() { Link Here
100
100
101
SettingsStorageQuotaEnforcer::Limits GetSyncLimits() {
101
SettingsStorageQuotaEnforcer::Limits GetSyncLimits() {
102
  SettingsStorageQuotaEnforcer::Limits limits = {
102
  SettingsStorageQuotaEnforcer::Limits limits = {
103
    api::storage::sync::QUOTA_BYTES,
103
    static_cast<size_t>(api::storage::sync::QUOTA_BYTES),
104
    api::storage::sync::QUOTA_BYTES_PER_ITEM,
104
    static_cast<size_t>(api::storage::sync::QUOTA_BYTES_PER_ITEM),
105
    api::storage::sync::MAX_ITEMS
105
    static_cast<size_t>(api::storage::sync::MAX_ITEMS)
106
  };
106
  };
107
  return limits;
107
  return limits;
108
}
108
}
(-)a/chrome/browser/policy/policy_path_parser_linux.cc (-1 / +3 lines)
Lines 1-8 Link Here
1
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
2
// Use of this source code is governed by a BSD-style license that can be
2
// Use of this source code is governed by a BSD-style license that can be
3
// found in the LICENSE file.
3
// found in the LICENSE file.
4
4
5
#include <pwd.h>
5
#include <pwd.h>
6
#include <sys/types.h>
7
#include <unistd.h>
6
8
7
#include "chrome/browser/policy/policy_path_parser.h"
9
#include "chrome/browser/policy/policy_path_parser.h"
8
10
(-)a/content/public/common/sandbox_init.cc (-1 / +1 lines)
Lines 4-10 Link Here
4
4
5
#include "content/public/common/sandbox_init.h"
5
#include "content/public/common/sandbox_init.h"
6
6
7
#if defined(OS_ANDROID)
7
#if defined(OS_POSIX)
8
#include <unistd.h>
8
#include <unistd.h>
9
#endif
9
#endif
10
10
(-)a/crypto/ec_private_key_nss.cc (-6 / +7 lines)
Lines 1-4 Link Here
1
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
2
// Use of this source code is governed by a BSD-style license that can be
2
// Use of this source code is governed by a BSD-style license that can be
3
// found in the LICENSE file.
3
// found in the LICENSE file.
4
4
Lines 128-134 bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo( Link Here
128
  SECItem encoded_epki = {
128
  SECItem encoded_epki = {
129
    siBuffer,
129
    siBuffer,
130
    const_cast<unsigned char*>(encrypted_private_key_info),
130
    const_cast<unsigned char*>(encrypted_private_key_info),
131
    encrypted_private_key_info_len
131
    static_cast<unsigned>(encrypted_private_key_info_len)
132
  };
132
  };
133
  SECKEYEncryptedPrivateKeyInfo epki;
133
  SECKEYEncryptedPrivateKeyInfo epki;
134
  memset(&epki, 0, sizeof(epki));
134
  memset(&epki, 0, sizeof(epki));
Lines 150-156 bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo( Link Here
150
  SECItem password_item = {
150
  SECItem password_item = {
151
    siBuffer,
151
    siBuffer,
152
    reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())),
152
    reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())),
153
    password.size()
153
    static_cast<unsigned>(password.size())
154
  };
154
  };
155
155
156
  rv = ImportEncryptedECPrivateKeyInfoAndReturnKey(
156
  rv = ImportEncryptedECPrivateKeyInfoAndReturnKey(
Lines 185-191 bool ECPrivateKey::ExportEncryptedPrivateKey( Link Here
185
  SECItem password_item = {
185
  SECItem password_item = {
186
    siBuffer,
186
    siBuffer,
187
    reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())),
187
    reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())),
188
    password.size()
188
    static_cast<unsigned>(password.size())
189
  };
189
  };
190
190
191
  SECKEYEncryptedPrivateKeyInfo* encrypted = PK11_ExportEncryptedPrivKeyInfo(
191
  SECKEYEncryptedPrivateKeyInfo* encrypted = PK11_ExportEncryptedPrivKeyInfo(
Lines 264-270 ECPrivateKey* ECPrivateKey::CreateWithParams(bool permanent, Link Here
264
  DCHECK_LE(oid_data->oid.len, 127U);
264
  DCHECK_LE(oid_data->oid.len, 127U);
265
  std::vector<unsigned char> parameters_buf(2 + oid_data->oid.len);
265
  std::vector<unsigned char> parameters_buf(2 + oid_data->oid.len);
266
  SECKEYECParams ec_parameters = {
266
  SECKEYECParams ec_parameters = {
267
    siDEROID, &parameters_buf[0], parameters_buf.size()
267
    siDEROID, &parameters_buf[0],
268
    static_cast<unsigned>(parameters_buf.size())
268
  };
269
  };
269
270
270
  ec_parameters.data[0] = SEC_ASN1_OBJECT_ID;
271
  ec_parameters.data[0] = SEC_ASN1_OBJECT_ID;
Lines 300-306 ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfoWithParams( Link Here
300
  SECItem encoded_spki = {
301
  SECItem encoded_spki = {
301
    siBuffer,
302
    siBuffer,
302
    const_cast<unsigned char*>(&subject_public_key_info[0]),
303
    const_cast<unsigned char*>(&subject_public_key_info[0]),
303
    subject_public_key_info.size()
304
    static_cast<unsigned>(subject_public_key_info.size())
304
  };
305
  };
305
  CERTSubjectPublicKeyInfo* decoded_spki = SECKEY_DecodeDERSubjectPublicKeyInfo(
306
  CERTSubjectPublicKeyInfo* decoded_spki = SECKEY_DecodeDERSubjectPublicKeyInfo(
306
      &encoded_spki);
307
      &encoded_spki);
(-)a/crypto/ec_signature_creator_nss.cc (-2 / +7 lines)
Lines 8-13 Link Here
8
#include <pk11pub.h>
8
#include <pk11pub.h>
9
#include <secerr.h>
9
#include <secerr.h>
10
#include <sechash.h>
10
#include <sechash.h>
11
#if defined(OS_POSIX)
12
#include <unistd.h>
13
#endif
11
14
12
#include "base/logging.h"
15
#include "base/logging.h"
13
#include "crypto/ec_private_key.h"
16
#include "crypto/ec_private_key.h"
Lines 34-45 SECStatus SignData(SECItem* result, Link Here
34
      hash_type, &hash_data[0], input->data, input->len);
37
      hash_type, &hash_data[0], input->data, input->len);
35
  if (rv != SECSuccess)
38
  if (rv != SECSuccess)
36
    return rv;
39
    return rv;
37
  SECItem hash = {siBuffer, &hash_data[0], hash_data.size()};
40
  SECItem hash = {siBuffer, &hash_data[0],
41
                  static_cast<unsigned int>(hash_data.size())};
38
42
39
  // Compute signature of hash.
43
  // Compute signature of hash.
40
  int signature_len = PK11_SignatureLen(key);
44
  int signature_len = PK11_SignatureLen(key);
41
  std::vector<uint8> signature_data(signature_len);
45
  std::vector<uint8> signature_data(signature_len);
42
  SECItem sig = {siBuffer, &signature_data[0], signature_len};
46
  SECItem sig = {siBuffer, &signature_data[0],
47
                 static_cast<unsigned int>(signature_len)};
43
  rv = PK11_Sign(key, &sig, &hash);
48
  rv = PK11_Sign(key, &sig, &hash);
44
  if (rv != SECSuccess)
49
  if (rv != SECSuccess)
45
    return rv;
50
    return rv;
(-)a/crypto/third_party/nss/secsign.cc (-2 / +4 lines)
Lines 93-104 SECStatus DerSignData(PLArenaPool *arena, Link Here
93
      hash_type, &hash_data[0], input->data, input->len);
93
      hash_type, &hash_data[0], input->data, input->len);
94
  if (rv != SECSuccess)
94
  if (rv != SECSuccess)
95
    return rv;
95
    return rv;
96
  SECItem hash = {siBuffer, &hash_data[0], hash_data.size()};
96
  SECItem hash = {siBuffer, &hash_data[0], 
97
		  static_cast<unsigned int>(hash_data.size())};
97
98
98
  // Compute signature of hash.
99
  // Compute signature of hash.
99
  int signature_len = PK11_SignatureLen(key);
100
  int signature_len = PK11_SignatureLen(key);
100
  std::vector<uint8> signature_data(signature_len);
101
  std::vector<uint8> signature_data(signature_len);
101
  SECItem sig = {siBuffer, &signature_data[0], signature_len};
102
  SECItem sig = {siBuffer, &signature_data[0], 
103
		 static_cast<unsigned int>(signature_len)};
102
  rv = PK11_Sign(key, &sig, &hash);
104
  rv = PK11_Sign(key, &sig, &hash);
103
  if (rv != SECSuccess)
105
  if (rv != SECSuccess)
104
    return rv;
106
    return rv;
(-)a/ipc/ipc_channel.h (+4 lines)
Lines 8-13 Link Here
8
8
9
#include <string>
9
#include <string>
10
10
11
#if defined(OS_POSIX)
12
#include <sys/types.h>
13
#endif
14
11
#include "base/compiler_specific.h"
15
#include "base/compiler_specific.h"
12
#include "base/process.h"
16
#include "base/process.h"
13
#include "ipc/ipc_channel_handle.h"
17
#include "ipc/ipc_channel_handle.h"
(-)a/ipc/ipc_channel_posix.cc (-1 / +2 lines)
Lines 11-16 Link Here
11
#include <sys/socket.h>
11
#include <sys/socket.h>
12
#include <sys/stat.h>
12
#include <sys/stat.h>
13
#include <sys/un.h>
13
#include <sys/un.h>
14
#include <unistd.h>
14
15
15
#if defined(OS_OPENBSD)
16
#if defined(OS_OPENBSD)
16
#include <sys/uio.h>
17
#include <sys/uio.h>
Lines 898-904 Channel::ChannelImpl::ReadState Channel::ChannelImpl::ReadData( Link Here
898
899
899
  struct msghdr msg = {0};
900
  struct msghdr msg = {0};
900
901
901
  struct iovec iov = {buffer, buffer_len};
902
  struct iovec iov = {buffer, static_cast<size_t>(buffer_len)};
902
  msg.msg_iov = &iov;
903
  msg.msg_iov = &iov;
903
  msg.msg_iovlen = 1;
904
  msg.msg_iovlen = 1;
904
905
(-)a/ipc/ipc_platform_file.cc (-2 / +2 lines)
Lines 1-10 Link Here
1
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
2
// Use of this source code is governed by a BSD-style license that can be
2
// Use of this source code is governed by a BSD-style license that can be
3
// found in the LICENSE file.
3
// found in the LICENSE file.
4
4
5
#include "ipc/ipc_platform_file.h"
5
#include "ipc/ipc_platform_file.h"
6
6
7
#if defined(OS_ANDROID)
7
#if defined(OS_POSIX)
8
#include <unistd.h>
8
#include <unistd.h>
9
#endif
9
#endif
10
10
(-)a/net/base/x509_util_nss.cc (-1 / +1 lines)
Lines 196-202 bool CreateDomainBoundCertInternal( Link Here
196
  SECItem domain_string_item = {
196
  SECItem domain_string_item = {
197
    siAsciiString,
197
    siAsciiString,
198
    (unsigned char*)domain.data(),
198
    (unsigned char*)domain.data(),
199
    domain.size()
199
    static_cast<unsigned>(domain.size())
200
  };
200
  };
201
201
202
  // IA5Encode and arena allocate SECItem
202
  // IA5Encode and arena allocate SECItem
(-)a/ppapi/tests/test_broker.cc (+1 lines)
Lines 10-15 Link Here
10
#else
10
#else
11
#define OS_POSIX 1
11
#define OS_POSIX 1
12
#include <errno.h>
12
#include <errno.h>
13
#include <unistd.h>
13
#endif
14
#endif
14
15
15
#include <cstdio>
16
#include <cstdio>
(-)a/ui/gfx/skia_utils_gtk.cc (-4 / +4 lines)
Lines 1-4 Link Here
1
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
2
// Use of this source code is governed by a BSD-style license that can be
2
// Use of this source code is governed by a BSD-style license that can be
3
// found in the LICENSE file.
3
// found in the LICENSE file.
4
4
Lines 22-30 SkColor GdkColorToSkColor(GdkColor color) { Link Here
22
GdkColor SkColorToGdkColor(SkColor color) {
22
GdkColor SkColorToGdkColor(SkColor color) {
23
  GdkColor gdk_color = {
23
  GdkColor gdk_color = {
24
      0,
24
      0,
25
      SkColorGetR(color) * kSkiaToGDKMultiplier,
25
      static_cast<guint16>(SkColorGetR(color) * kSkiaToGDKMultiplier),
26
      SkColorGetG(color) * kSkiaToGDKMultiplier,
26
      static_cast<guint16>(SkColorGetG(color) * kSkiaToGDKMultiplier),
27
      SkColorGetB(color) * kSkiaToGDKMultiplier
27
      static_cast<guint16>(SkColorGetB(color) * kSkiaToGDKMultiplier)
28
  };
28
  };
29
  return gdk_color;
29
  return gdk_color;
30
}
30
}
(-)a/webkit/glue/webkit_glue.gypi (+6 lines)
Lines 12-17 Link Here
12
      }],
12
      }],
13
    ],
13
    ],
14
  },
14
  },
15
  'target_defaults': {
16
     # Disable narrowing-conversion-in-initialization-list warnings in that we
17
     # do not want to fix it in data file "webcursor_gtk_data.h".
18
     'cflags+': ['-Wno-narrowing'],
19
     'cflags_cc+': ['-Wno-narrowing'],
20
  },
15
  'targets': [
21
  'targets': [
16
    {
22
    {
17
      'target_name': 'webkit_resources',
23
      'target_name': 'webkit_resources',
(-)a/webkit/plugins/ppapi/ppb_flash_impl.cc (-3 / +4 lines)
Lines 124-132 PP_Bool PPB_Flash_Impl::DrawGlyphs(PP_Instance instance, Link Here
124
  SkAutoCanvasRestore acr(canvas, true);
124
  SkAutoCanvasRestore acr(canvas, true);
125
125
126
  // Clip is applied in pixels before the transform.
126
  // Clip is applied in pixels before the transform.
127
  SkRect clip_rect = { clip->point.x, clip->point.y,
127
  SkRect clip_rect = { SkIntToScalar(clip->point.x),
128
                       clip->point.x + clip->size.width,
128
                       SkIntToScalar(clip->point.y),
129
                       clip->point.y + clip->size.height };
129
                       SkIntToScalar(clip->point.x + clip->size.width),
130
                       SkIntToScalar(clip->point.y + clip->size.height) };
130
  canvas->clipRect(clip_rect);
131
  canvas->clipRect(clip_rect);
131
132
132
  // Convert & set the matrix.
133
  // Convert & set the matrix.
(-)a/webkit/plugins/ppapi/ppb_video_capture_impl.cc (-3 / +3 lines)
Lines 118-126 void PPB_VideoCapture_Impl::OnDeviceInfoReceived( Link Here
118
    media::VideoCapture* capture,
118
    media::VideoCapture* capture,
119
    const media::VideoCaptureParams& device_info) {
119
    const media::VideoCaptureParams& device_info) {
120
  PP_VideoCaptureDeviceInfo_Dev info = {
120
  PP_VideoCaptureDeviceInfo_Dev info = {
121
    device_info.width,
121
    static_cast<uint32_t>(device_info.width),
122
    device_info.height,
122
    static_cast<uint32_t>(device_info.height),
123
    device_info.frame_per_second
123
    static_cast<uint32_t>(device_info.frame_per_second)
124
  };
124
  };
125
  ReleaseBuffers();
125
  ReleaseBuffers();
126
126

Return to bug 412615