Attachment #306235 for bug #409225

View | Details | Raw Unified | Return to bug 409225
Collapse All | Expand All




++ b/ipc/chromium/src/base/task.h

 public:
  RunnableMethod(T* obj, Method meth, const Params& params)
      : obj_(obj), meth_(meth), params_(params) {
    this->RetainCallee(obj_);
  }
  ~RunnableMethod() {
    ReleaseCallee();
++ b/xpcom/base/nsAutoRef.h

    void SafeAddRef()
    {
        if (this->HaveResource())
            this->AddRef(this->get());
    }
};


    void SafeRelease()
    {
        if (this->HaveResource())
            this->Release(this->get());
    }
};

++ b/xpcom/glue/nsBaseHashtable.h

   */
  PRBool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const
  {
    EntryType* ent = this->GetEntry(aKey);

    if (!ent)
      return PR_FALSE;

   */
  PRBool Put(KeyType aKey, UserDataType aData)
  {
    EntryType* ent = this->PutEntry(aKey);

    if (!ent)
      return PR_FALSE;

   * remove the data for the associated key
   * @param aKey the key to remove from the hashtable
   */
  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }

  /**
   * function type provided by the application for enumeration.
++ b/xpcom/glue/nsClassHashtable.h

nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
{
  typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
    this->GetEntry(aKey);

  if (ent)
  {
++ b/xpcom/glue/nsRefPtrHashtable.h

  (KeyType aKey, UserDataType* pRefPtr) const
{
  typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
    this->GetEntry(aKey);

  if (ent)
  {

  (KeyType aKey, PRBool* aFound) const
{
  typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
    this->GetEntry(aKey);

  if (ent)
  {
++ b/xpcom/glue/nsInterfaceHashtable.h

  (KeyType aKey, UserDataType* pInterface) const
{
  typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
    this->GetEntry(aKey);

  if (ent)
  {

  (KeyType aKey, PRBool* aFound) const
{
  typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
    this->GetEntry(aKey);

  if (ent)
  {
++ b/xpcom/glue/nsTPtrArray.h


    // Initialize this array and pre-allocate some number of elements.
    explicit nsTPtrArray(size_type capacity) {
      this->SetCapacity(capacity);
    }
    
    // The array's copy-constructor performs a 'deep' copy of the given array.
++ b/ipc/chromium/src/base/file_util.cc

#include <io.h>
#endif
#include <stdio.h>
#include <unistd.h>
#include <fstream>

#include "base/file_path.h"
++ b/ipc/chromium/src/base/message_pump_libevent.cc


#include <errno.h>
#include <fcntl.h>
#include <unistd.h>

#include "eintr_wrapper.h"
#include "base/logging.h"
++ b/ipc/chromium/src/base/file_util_linux.cc

#include "base/file_util.h"

#include <fcntl.h>
#include <unistd.h>
#include <string>
#include <vector>

++ b/ipc/chromium/src/base/time_posix.cc


#include "base/time.h"

#include <unistd.h>
#ifdef OS_MACOSX
#include <mach/mach_time.h>
#endif

#include <sys/time.h>
#include <time.h>

++ b/ipc/chromium/src/chrome/common/file_descriptor_set_posix.cc

// found in the LICENSE file.

#include "chrome/common/file_descriptor_set_posix.h"
#include <unistd.h>
#include "base/eintr_wrapper.h"
#include "base/logging.h"

++ b/gfx/ots/src/os2.cc

// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include <cstddef>

#include "os2.h"

#include "head.h"

Return to bug 409225

Line Link Here

(-)file_not_specified_in_diff (-28 / +33 lines)
0	-- a/ipc/chromium/src/base/task.h	0	++ b/ipc/chromium/src/base/task.h
Lines 296-302 Link Here
296	public:	296	public:
297	RunnableMethod(T* obj, Method meth, const Params& params)	297	RunnableMethod(T* obj, Method meth, const Params& params)
298	: obj_(obj), meth_(meth), params_(params) {	298	: obj_(obj), meth_(meth), params_(params) {
299	RetainCallee(obj_);	299	this->RetainCallee(obj_);
300	}	300	}
301	~RunnableMethod() {	301	~RunnableMethod() {
302	ReleaseCallee();	302	ReleaseCallee();
303	-- a/xpcom/base/nsAutoRef.h	303	++ b/xpcom/base/nsAutoRef.h
Lines 323-329 Link Here
323	void SafeAddRef()	323	void SafeAddRef()
324	{	324	{
325	if (this->HaveResource())	325	if (this->HaveResource())
326	AddRef(this->get());	326	this->AddRef(this->get());
327	}	327	}
328	};	328	};
329		329
Lines 690-696 Link Here
690	void SafeRelease()	690	void SafeRelease()
691	{	691	{
692	if (this->HaveResource())	692	if (this->HaveResource())
693	Release(this->get());	693	this->Release(this->get());
694	}	694	}
695	};	695	};
696		696
697	-- a/xpcom/glue/nsBaseHashtable.h	697	++ b/xpcom/glue/nsBaseHashtable.h
Lines 123-129 Link Here
123	*/	123	*/
124	PRBool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const	124	PRBool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const
125	{	125	{
126	EntryType* ent = GetEntry(aKey);	126	EntryType* ent = this->GetEntry(aKey);
127		127
128	if (!ent)	128	if (!ent)
129	return PR_FALSE;	129	return PR_FALSE;
Lines 142-148 Link Here
142	*/	142	*/
143	PRBool Put(KeyType aKey, UserDataType aData)	143	PRBool Put(KeyType aKey, UserDataType aData)
144	{	144	{
145	EntryType* ent = PutEntry(aKey);	145	EntryType* ent = this->PutEntry(aKey);
146		146
147	if (!ent)	147	if (!ent)
148	return PR_FALSE;	148	return PR_FALSE;
Lines 156-162 Link Here
156	* remove the data for the associated key	156	* remove the data for the associated key
157	* @param aKey the key to remove from the hashtable	157	* @param aKey the key to remove from the hashtable
158	*/	158	*/
159	void Remove(KeyType aKey) { RemoveEntry(aKey); }	159	void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
160		160
161	/**	161	/**
162	* function type provided by the application for enumeration.	162	* function type provided by the application for enumeration.
163	-- a/xpcom/glue/nsClassHashtable.h	163	++ b/xpcom/glue/nsClassHashtable.h
Lines 98-104 Link Here
98	nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const	98	nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
99	{	99	{
100	typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T>::EntryType ent =	100	typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T>::EntryType ent =
101	GetEntry(aKey);	101	this->GetEntry(aKey);
102		102
103	if (ent)	103	if (ent)
104	{	104	{
105	-- a/xpcom/glue/nsRefPtrHashtable.h	105	++ b/xpcom/glue/nsRefPtrHashtable.h
Lines 112-118 Link Here
112	(KeyType aKey, UserDataType* pRefPtr) const	112	(KeyType aKey, UserDataType* pRefPtr) const
113	{	113	{
114	typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr>::EntryType ent =	114	typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr>::EntryType ent =
115	GetEntry(aKey);	115	this->GetEntry(aKey);
116		116
117	if (ent)	117	if (ent)
118	{	118	{
Lines 140-146 Link Here
140	(KeyType aKey, PRBool* aFound) const	140	(KeyType aKey, PRBool* aFound) const
141	{	141	{
142	typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr>::EntryType ent =	142	typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr>::EntryType ent =
143	GetEntry(aKey);	143	this->GetEntry(aKey);
144		144
145	if (ent)	145	if (ent)
146	{	146	{
147	-- a/xpcom/glue/nsInterfaceHashtable.h	147	++ b/xpcom/glue/nsInterfaceHashtable.h
Lines 111-117 Link Here
111	(KeyType aKey, UserDataType* pInterface) const	111	(KeyType aKey, UserDataType* pInterface) const
112	{	112	{
113	typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface>::EntryType ent =	113	typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface>::EntryType ent =
114	GetEntry(aKey);	114	this->GetEntry(aKey);
115		115
116	if (ent)	116	if (ent)
117	{	117	{
Lines 139-145 Link Here
139	(KeyType aKey, PRBool* aFound) const	139	(KeyType aKey, PRBool* aFound) const
140	{	140	{
141	typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface>::EntryType ent =	141	typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface>::EntryType ent =
142	GetEntry(aKey);	142	this->GetEntry(aKey);
143		143
144	if (ent)	144	if (ent)
145	{	145	{
146	-- a/xpcom/glue/nsTPtrArray.h	146	++ b/xpcom/glue/nsTPtrArray.h
Lines 64-70 Link Here
64		64
65	// Initialize this array and pre-allocate some number of elements.	65	// Initialize this array and pre-allocate some number of elements.
66	explicit nsTPtrArray(size_type capacity) {	66	explicit nsTPtrArray(size_type capacity) {
67	SetCapacity(capacity);	67	this->SetCapacity(capacity);
68	}	68	}
69		69
70	// The array's copy-constructor performs a 'deep' copy of the given array.	70	// The array's copy-constructor performs a 'deep' copy of the given array.
71	-- a/ipc/chromium/src/base/file_util.cc	71	++ b/ipc/chromium/src/base/file_util.cc
Lines 8-14 Link Here
8	#include <io.h>	8	#include <io.h>
9	#endif	9	#endif
10	#include <stdio.h>	10	#include <stdio.h>
11		11	#include <unistd.h>
12	#include <fstream>	12	#include <fstream>
13		13
14	#include "base/file_path.h"	14	#include "base/file_path.h"
15	-- a/ipc/chromium/src/base/message_pump_libevent.cc	15	++ b/ipc/chromium/src/base/message_pump_libevent.cc
Lines 6-11 Link Here
6		6
7	#include <errno.h>	7	#include <errno.h>
8	#include <fcntl.h>	8	#include <fcntl.h>
		9	#include <unistd.h>
9		10
10	#include "eintr_wrapper.h"	11	#include "eintr_wrapper.h"
11	#include "base/logging.h"	12	#include "base/logging.h"
12	-- a/ipc/chromium/src/base/file_util_linux.cc	13	++ b/ipc/chromium/src/base/file_util_linux.cc
Lines 5-11 Link Here
5	#include "base/file_util.h"	5	#include "base/file_util.h"
6		6
7	#include <fcntl.h>	7	#include <fcntl.h>
8		8	#include <unistd.h>
9	#include <string>	9	#include <string>
10	#include <vector>	10	#include <vector>
11		11
12	-- a/ipc/chromium/src/base/time_posix.cc	12	++ b/ipc/chromium/src/base/time_posix.cc
Lines 4-12 Link Here
4		4
5	#include "base/time.h"	5	#include "base/time.h"
6		6
		7	#include <unistd.h>
7	#ifdef OS_MACOSX	8	#ifdef OS_MACOSX
8	#include <mach/mach_time.h>	9	#include <mach/mach_time.h>
9	#endif	10	#endif
		11
10	#include <sys/time.h>	12	#include <sys/time.h>
11	#include <time.h>	13	#include <time.h>
12		14
13	-- a/ipc/chromium/src/chrome/common/file_descriptor_set_posix.cc	15	++ b/ipc/chromium/src/chrome/common/file_descriptor_set_posix.cc
Lines 3-9 Link Here
3	// found in the LICENSE file.	3	// found in the LICENSE file.
4		4
5	#include "chrome/common/file_descriptor_set_posix.h"	5	#include "chrome/common/file_descriptor_set_posix.h"
6		6	#include <unistd.h>
7	#include "base/eintr_wrapper.h"	7	#include "base/eintr_wrapper.h"
8	#include "base/logging.h"	8	#include "base/logging.h"
9		9
10	-- a/gfx/ots/src/os2.cc	10	++ b/gfx/ots/src/os2.cc
Lines 2-7 Link Here
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 <cstddef>
		6
5	#include "os2.h"	7	#include "os2.h"
6		8
7	#include "head.h"	9	#include "head.h"