From 2688603fa8d76eea4d53434ea57730116794b688 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Sat, 14 Aug 2010 08:34:13 +0200 Subject: [PATCH 001/109] Bug 586909: Discard D2D surfaces for a window when it's hidden. r=robarnold --- widget/src/windows/nsWindow.cpp | 32 ++++++++++++++++++++++++++++++++ widget/src/windows/nsWindow.h | 6 ++++++ 2 files changed, 38 insertions(+) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 76dbb7911f1f..c831bb878ece 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -176,6 +176,7 @@ #endif #include "LayerManagerOGL.h" #endif +#include "BasicLayers.h" #if !defined(WINCE) #include "nsUXThemeConstants.h" @@ -1141,6 +1142,12 @@ NS_METHOD nsWindow::Show(PRBool bState) // SetWindowPos would get the correct answer. mIsVisible = bState; +#ifdef CAIRO_HAS_D2D_SURFACE + if (!mIsVisible && wasVisible) { + ClearD2DSurface(); + } +#endif + if (mWnd) { if (bState) { if (!wasVisible && mWindowType == eWindowType_toplevel) { @@ -7861,6 +7868,31 @@ VOID CALLBACK nsWindow::HookTimerForPopups(HWND hwnd, UINT uMsg, UINT idEvent, D } #endif // WinCE +#ifdef CAIRO_HAS_D2D_SURFACE +BOOL CALLBACK nsWindow::ClearD2DSurfaceCallback(HWND aWnd, LPARAM aMsg) +{ + nsWindow *window = nsWindow::GetNSWindowPtr(aWnd); + if (window) { + window->ClearD2DSurface(); + } + return TRUE; +} + +void +nsWindow::ClearD2DSurface() +{ + mD2DWindowSurface = nsnull; + if (gfxWindowsPlatform::GetPlatform()->GetRenderMode() == + gfxWindowsPlatform::RENDER_DIRECT2D) { + // The layer manager holds onto a bunch of buffers created with create + // similar surface. This can consume quite a bit of VMEM for each tab, + // if a window is hidden we clear the layer manager to conserve VRAM. + mLayerManager = nsnull; + } + ::EnumChildWindows(mWnd, nsWindow::ClearD2DSurfaceCallback, NULL); +} +#endif + static PRBool IsDifferentThreadWindow(HWND aWnd) { return ::GetCurrentThreadId() != ::GetWindowThreadProcessId(aWnd, NULL); diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index 107f56f10aec..a545ac015bc6 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -288,6 +288,9 @@ protected: static LRESULT CALLBACK MozSpecialWndProc(int code, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK MozSpecialMouseProc(int code, WPARAM wParam, LPARAM lParam); static VOID CALLBACK HookTimerForPopups( HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime ); +#ifdef CAIRO_HAS_D2D_SURFACE + static BOOL CALLBACK ClearD2DSurfaceCallback(HWND aChild, LPARAM aParam); +#endif /** * Window utilities @@ -445,6 +448,9 @@ protected: #ifdef ACCESSIBILITY static STDMETHODIMP_(LRESULT) LresultFromObject(REFIID riid, WPARAM wParam, LPUNKNOWN pAcc); #endif // ACCESSIBILITY +#ifdef CAIRO_HAS_D2D_SURFACE + void ClearD2DSurface(); +#endif protected: nsCOMPtr mParent; From c2dc430b377ce5dc34e7c26834518c11378c7048 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Sat, 14 Aug 2010 08:34:16 +0200 Subject: [PATCH 002/109] Bug 573229: Part 1 - Allow creating a d2d device from an existing d3d10 device. r=jrmuizel --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 138 +++++++++++++--------- gfx/cairo/cairo/src/cairo-win32.h | 3 + 2 files changed, 83 insertions(+), 58 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index a6d2ff55abef..1bad67a12b70 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -162,8 +162,9 @@ _cairo_d2d_set_operator(cairo_d2d_device_t *device, } cairo_device_t * -cairo_d2d_create_device() +cairo_d2d_create_device_from_d3d10device(ID3D10Device1 *d3d10device) { + HRESULT hr; D3D10_RASTERIZER_DESC rastDesc; D3D10_INPUT_ELEMENT_DESC layout[] = { @@ -176,68 +177,15 @@ cairo_d2d_create_device() D3D10_SUBRESOURCE_DATA data; cairo_d2d_device_t *device = new cairo_d2d_device_t; + + device->mD3D10Device = d3d10device; + device->mD3D10_1 = LoadLibraryA("d3d10_1.dll"); - D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) - GetProcAddress(device->mD3D10_1, "D3D10CreateDevice1"); D3D10CreateEffectFromMemoryFunc createEffect = (D3D10CreateEffectFromMemoryFunc) GetProcAddress(device->mD3D10_1, "D3D10CreateEffectFromMemory"); D2D1CreateFactoryFunc createD2DFactory; - if (!createD3DDevice || !createEffect) { - goto FAILED; - } - - /** - * On usage of D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS: - * documentation on D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS - * can be misleading. In fact, that flag gives no such indication. I pointed this - * out to Bas in my email. However, Microsoft is in fact using this flag to - * indicate "light weight" DX applications. By light weight they are essentially - * referring to applications that are not games. The idea is that when you create - * a DX game, the driver assumes that you will pretty much have a single instance - * and therefore it doesn't try to hold back when it comes to GPU resource - * allocation as long as it can crank out performance. In other words, the - * priority in regular DX applications is to make that one application run as fast - * as you can. For "light weight" applications, including D2D applications, the - * priorities are a bit different. Now you are no longer going to have a single - * (or very few) instances. You can have a lot of them (say, for example, a - * separate DX context/device per browser tab). In such cases, the GPU resource - * allocation scheme changes. - */ - HRESULT hr = createD3DDevice( - NULL, - D3D10_DRIVER_TYPE_HARDWARE, - NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT | - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, - D3D10_FEATURE_LEVEL_10_1, - D3D10_1_SDK_VERSION, - &device->mD3D10Device); - if (FAILED(hr)) { - hr = createD3DDevice( - NULL, - D3D10_DRIVER_TYPE_HARDWARE, - NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT | - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, - D3D10_FEATURE_LEVEL_10_0, - D3D10_1_SDK_VERSION, - &device->mD3D10Device); - if (FAILED(hr)) { - /* This is not guaranteed to be too fast! */ - hr = createD3DDevice( - NULL, - D3D10_DRIVER_TYPE_HARDWARE, - NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT | - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, - D3D10_FEATURE_LEVEL_9_3, - D3D10_1_SDK_VERSION, - &device->mD3D10Device); - - } - } - if (FAILED(hr)) { + if (!createEffect) { goto FAILED; } @@ -302,6 +250,80 @@ FAILED: return NULL; } +cairo_device_t * +cairo_d2d_create_device() +{ + HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); + D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) + GetProcAddress(d3d10module, "D3D10CreateDevice1"); + + if (!createD3DDevice) { + return NULL; + } + + RefPtr d3ddevice; + + /** + * On usage of D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS: + * documentation on D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS + * can be misleading. In fact, that flag gives no such indication. I pointed this + * out to Bas in my email. However, Microsoft is in fact using this flag to + * indicate "light weight" DX applications. By light weight they are essentially + * referring to applications that are not games. The idea is that when you create + * a DX game, the driver assumes that you will pretty much have a single instance + * and therefore it doesn't try to hold back when it comes to GPU resource + * allocation as long as it can crank out performance. In other words, the + * priority in regular DX applications is to make that one application run as fast + * as you can. For "light weight" applications, including D2D applications, the + * priorities are a bit different. Now you are no longer going to have a single + * (or very few) instances. You can have a lot of them (say, for example, a + * separate DX context/device per browser tab). In such cases, the GPU resource + * allocation scheme changes. + */ + HRESULT hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_1, + D3D10_1_SDK_VERSION, + &d3ddevice); + if (FAILED(hr)) { + hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_0, + D3D10_1_SDK_VERSION, + &d3ddevice); + if (FAILED(hr)) { + /* This is not guaranteed to be too fast! */ + hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_9_3, + D3D10_1_SDK_VERSION, + &d3ddevice); + + } + } + if (FAILED(hr)) { + return NULL; + } + + cairo_device_t *device = cairo_d2d_create_device_from_d3d10device(d3ddevice); + + // Free our reference to the modules. The created device should have its own. + FreeLibrary(d3d10module); + return device; +} + int cairo_release_device(cairo_device_t *device) { diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h index e6e7feea0106..7506971e86ce 100644 --- a/gfx/cairo/cairo/src/cairo-win32.h +++ b/gfx/cairo/cairo/src/cairo-win32.h @@ -142,6 +142,9 @@ typedef struct _cairo_device cairo_device_t; cairo_device_t * cairo_d2d_create_device(); +cairo_device_t * +cairo_d2d_create_device_from_d3d10device(struct ID3D10Device1 *device); + /** * Releases a D2D device. * From cdda35a60e1aaba792f54a2d53075511c81d824d Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Sat, 14 Aug 2010 08:34:55 +0200 Subject: [PATCH 003/109] Bug 573229: Part 2 - Enable D2D by default on DX 10 hardware. r=jrmuizel --- gfx/thebes/gfxWindowsPlatform.cpp | 80 +++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index ae50a3969917..99759d187e7b 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -76,6 +76,8 @@ #ifdef CAIRO_HAS_D2D_SURFACE #include "gfxD2DSurface.h" +#include + #include "nsIMemoryReporter.h" #include "nsMemory.h" @@ -135,6 +137,18 @@ typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)( __out IUnknown **factory ); #endif + +#ifdef CAIRO_HAS_D2D_SURFACE +typedef HRESULT (WINAPI*D3D10CreateDevice1Func)( + IDXGIAdapter *pAdapter, + D3D10_DRIVER_TYPE DriverType, + HMODULE Software, + UINT Flags, + D3D10_FEATURE_LEVEL1 HardwareLevel, + UINT SDKVersion, + ID3D10Device1 **ppDevice +); +#endif static __inline void BuildKeyNameFromFontName(nsAString &aName) @@ -167,11 +181,65 @@ gfxWindowsPlatform::gfxWindowsPlatform() #endif nsCOMPtr pref = do_GetService(NS_PREFSERVICE_CONTRACTID); + + OSVERSIONINFOA versionInfo; + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + ::GetVersionExA(&versionInfo); + bool isVistaOrHigher = versionInfo.dwMajorVersion >= 6; #ifdef CAIRO_HAS_D2D_SURFACE NS_RegisterMemoryReporter(new D2DCacheReporter()); mD2DDevice = NULL; + + if (isVistaOrHigher) { + // We need a DWriteFactory to work. + HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); + D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) + GetProcAddress(d3d10module, "D3D10CreateDevice1"); + nsRefPtr device; + + if (createD3DDevice) { + // We try 10.0 first even though we prefer 10.1, since we want to + // fail as fast as possible if 10.x isn't supported. + HRESULT hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_0, + D3D10_1_SDK_VERSION, + getter_AddRefs(device)); + + if (SUCCEEDED(hr)) { + // We have 10.0, let's try 10.1. + // XXX - This adds an additional 10-20ms for people who are + // getting direct2d. We'd really like to do something more + // clever. + nsRefPtr device1; + hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_1, + D3D10_1_SDK_VERSION, + getter_AddRefs(device1)); + + if (SUCCEEDED(hr)) { + device = device1; + } + + mD2DDevice = cairo_d2d_create_device_from_d3d10device(device); + if (mD2DDevice) { + mRenderMode = RENDER_DIRECT2D; + } + } + } + } #endif + #ifdef CAIRO_HAS_DWRITE_FONT nsresult rv; PRBool useDirectWrite = PR_FALSE; @@ -181,8 +249,10 @@ gfxWindowsPlatform::gfxWindowsPlatform() if (NS_FAILED(rv)) { useDirectWrite = PR_FALSE; } - - if (useDirectWrite) { + + // Enable when it's preffed on -and- we're using Vista or higher. Or when + // we're going to use D2D. + if ((useDirectWrite && isVistaOrHigher) || mRenderMode == RENDER_DIRECT2D) { DWriteCreateFactoryFunc createDWriteFactory = (DWriteCreateFactoryFunc) GetProcAddress(LoadLibraryW(L"dwrite.dll"), "DWriteCreateFactory"); @@ -214,9 +284,11 @@ gfxWindowsPlatform::gfxWindowsPlatform() #ifndef CAIRO_HAS_D2D_SURFACE return; #else - mD2DDevice = cairo_d2d_create_device(); if (!mD2DDevice) { - return; + mD2DDevice = cairo_d2d_create_device(); + if (!mD2DDevice) { + return; + } } #ifdef CAIRO_HAS_DWRITE_FONT if (!GetDWriteFactory()) { From e2ac46d9db77478442004b1b6a6bc76bee16f368 Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Sat, 14 Aug 2010 00:05:03 -0700 Subject: [PATCH 004/109] Bug 579593 - Reorganize how theme library loading works. [r=robarnold] --- widget/src/windows/nsUXThemeData.cpp | 46 ++++++++++++++++++---------- widget/src/windows/nsUXThemeData.h | 2 ++ widget/src/windows/nsWinGesture.cpp | 4 +-- widget/src/windows/nsWinGesture.h | 1 - 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/widget/src/windows/nsUXThemeData.cpp b/widget/src/windows/nsUXThemeData.cpp index fda4648f9f53..52113a8c6edb 100644 --- a/widget/src/windows/nsUXThemeData.cpp +++ b/widget/src/windows/nsUXThemeData.cpp @@ -114,8 +114,12 @@ nsUXThemeData::Initialize() { ::ZeroMemory(sThemes, sizeof(sThemes)); NS_ASSERTION(!sThemeDLL, "nsUXThemeData being initialized twice!"); - sThemeDLL = ::LoadLibraryW(kThemeLibraryName); - if (sThemeDLL) { + + PRInt32 version = nsWindow::GetWindowsVersion(); + sIsXPOrLater = version >= WINXP_VERSION; + sIsVistaOrLater = version >= VISTA_VERSION; + + if (GetThemeDLL()) { openTheme = (OpenThemeDataPtr)GetProcAddress(sThemeDLL, "OpenThemeData"); closeTheme = (CloseThemeDataPtr)GetProcAddress(sThemeDLL, "CloseThemeData"); drawThemeBG = (DrawThemeBackgroundPtr)GetProcAddress(sThemeDLL, "DrawThemeBackground"); @@ -132,22 +136,18 @@ nsUXThemeData::Initialize() isThemeBackgroundPartiallyTransparent = (IsThemeBackgroundPartiallyTransparentPtr)GetProcAddress(sThemeDLL, "IsThemeBackgroundPartiallyTransparent"); } #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN - sDwmDLL = ::LoadLibraryW(kDwmLibraryName); - if(sDwmDLL) { - dwmExtendFrameIntoClientAreaPtr = (DwmExtendFrameIntoClientAreaProc)::GetProcAddress(sDwmDLL, "DwmExtendFrameIntoClientArea"); - dwmIsCompositionEnabledPtr = (DwmIsCompositionEnabledProc)::GetProcAddress(sDwmDLL, "DwmIsCompositionEnabled"); - dwmSetIconicThumbnailPtr = (DwmSetIconicThumbnailProc)::GetProcAddress(sDwmDLL, "DwmSetIconicThumbnail"); - dwmSetIconicLivePreviewBitmapPtr = (DwmSetIconicLivePreviewBitmapProc)::GetProcAddress(sDwmDLL, "DwmSetIconicLivePreviewBitmap"); - dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDLL, "DwmSetWindowAttribute"); - dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDLL, "DwmInvalidateIconicBitmaps"); - dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDLL, "DwmDefWindowProc"); - CheckForCompositor(); - } + if (GetDwmDLL()) { + dwmExtendFrameIntoClientAreaPtr = (DwmExtendFrameIntoClientAreaProc)::GetProcAddress(sDwmDLL, "DwmExtendFrameIntoClientArea"); + dwmIsCompositionEnabledPtr = (DwmIsCompositionEnabledProc)::GetProcAddress(sDwmDLL, "DwmIsCompositionEnabled"); + dwmSetIconicThumbnailPtr = (DwmSetIconicThumbnailProc)::GetProcAddress(sDwmDLL, "DwmSetIconicThumbnail"); + dwmSetIconicLivePreviewBitmapPtr = (DwmSetIconicLivePreviewBitmapProc)::GetProcAddress(sDwmDLL, "DwmSetIconicLivePreviewBitmap"); + dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDLL, "DwmSetWindowAttribute"); + dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDLL, "DwmInvalidateIconicBitmaps"); + dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDLL, "DwmDefWindowProc"); + CheckForCompositor(); + } #endif - PRInt32 version = nsWindow::GetWindowsVersion(); - sIsXPOrLater = version >= WINXP_VERSION; - sIsVistaOrLater = version >= VISTA_VERSION; Invalidate(); } @@ -186,6 +186,20 @@ nsUXThemeData::GetTheme(nsUXThemeClass cls) { return sThemes[cls]; } +HMODULE +nsUXThemeData::GetThemeDLL() { + if (!sThemeDLL && sIsXPOrLater) + sThemeDLL = ::LoadLibraryW(kThemeLibraryName); + return sThemeDLL; +} + +HMODULE +nsUXThemeData::GetDwmDLL() { + if (!sDwmDLL && sIsVistaOrLater) + sDwmDLL = ::LoadLibraryW(kDwmLibraryName); + return sDwmDLL; +} + const wchar_t *nsUXThemeData::GetClassName(nsUXThemeClass cls) { switch(cls) { case eUXButton: diff --git a/widget/src/windows/nsUXThemeData.h b/widget/src/windows/nsUXThemeData.h index a5c1d09316bb..0db117ea073f 100644 --- a/widget/src/windows/nsUXThemeData.h +++ b/widget/src/windows/nsUXThemeData.h @@ -120,6 +120,8 @@ public: static void Teardown(); static void Invalidate(); static HANDLE GetTheme(nsUXThemeClass cls); + static HMODULE GetThemeDLL(); + static HMODULE GetDwmDLL(); // nsWindow calls this to update desktop settings info static void InitTitlebarInfo(); diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp index 5b67e9dc9bb9..40ef2c3a77d0 100644 --- a/widget/src/windows/nsWinGesture.cpp +++ b/widget/src/windows/nsWinGesture.cpp @@ -42,6 +42,7 @@ #include "nscore.h" #include "nsWinGesture.h" +#include "nsUXThemeData.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" #include "nsIServiceManager.h" @@ -53,7 +54,6 @@ #endif const PRUnichar nsWinGesture::kGestureLibraryName[] = L"user32.dll"; -const PRUnichar nsWinGesture::kThemeLibraryName[] = L"uxtheme.dll"; HMODULE nsWinGesture::sLibraryHandle = nsnull; nsWinGesture::GetGestureInfoPtr nsWinGesture::getGestureInfo = nsnull; nsWinGesture::CloseGestureInfoHandlePtr nsWinGesture::closeGestureInfoHandle = nsnull; @@ -96,7 +96,7 @@ PRBool nsWinGesture::InitLibrary() } sLibraryHandle = ::LoadLibraryW(kGestureLibraryName); - HMODULE hTheme = ::LoadLibraryW(kThemeLibraryName); + HMODULE hTheme = nsUXThemeData::GetThemeDLL(); // gesture interfaces if (sLibraryHandle) { diff --git a/widget/src/windows/nsWinGesture.h b/widget/src/windows/nsWinGesture.h index ce4538cc3ed8..e72747f23d80 100644 --- a/widget/src/windows/nsWinGesture.h +++ b/widget/src/windows/nsWinGesture.h @@ -300,7 +300,6 @@ private: static HMODULE sLibraryHandle; static const PRUnichar kGestureLibraryName[]; - static const PRUnichar kThemeLibraryName[]; // Pan and feedback state nsPointWin mPanIntermediate; From 3160729d09b277fb1f76977fa6ae991b9f2be77f Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Sat, 14 Aug 2010 09:56:19 +0200 Subject: [PATCH 005/109] Backed out changeset dfd35987dd82 (WAL journaling - bug 573492) due to Ts regressions --- toolkit/components/places/src/Makefile.in | 3 - .../components/places/src/nsNavHistory.cpp | 160 +++++++----------- toolkit/components/places/src/nsNavHistory.h | 19 --- .../components/places/src/nsPlacesDBFlush.js | 12 -- 4 files changed, 57 insertions(+), 137 deletions(-) diff --git a/toolkit/components/places/src/Makefile.in b/toolkit/components/places/src/Makefile.in index ded0ff87015f..7cc1047eb920 100644 --- a/toolkit/components/places/src/Makefile.in +++ b/toolkit/components/places/src/Makefile.in @@ -82,9 +82,6 @@ EXTRA_DSO_LDOPTS += \ LOCAL_INCLUDES += -I$(srcdir)/../../build -# This is the default value. Must be in sync with the one defined in SQLite. -DEFINES += -DSQLITE_DEFAULT_PAGE_SIZE=32768 - EXTRA_COMPONENTS = \ toolkitplaces.manifest \ nsLivemarkService.js \ diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp index d57e4e5db03f..8bedf32fed2c 100644 --- a/toolkit/components/places/src/nsNavHistory.cpp +++ b/toolkit/components/places/src/nsNavHistory.cpp @@ -65,7 +65,6 @@ #include "nsThreadUtils.h" #include "nsAppDirectoryServiceDefs.h" #include "nsMathUtils.h" -#include "mozIStorageAsyncStatement.h" #include "nsNavBookmarks.h" #include "nsAnnotationService.h" @@ -142,6 +141,10 @@ using namespace mozilla::places; // Filename used to backup corrupt databases. #define DATABASE_CORRUPT_FILENAME NS_LITERAL_STRING("places.sqlite.corrupt") +// We use the TRUNCATE journal mode to reduce the number of fsyncs. Without +// this setting we had a Ts hit on Linux. See bug 460315 for details. +#define DATABASE_JOURNAL_MODE "TRUNCATE" + // Fraction of free pages in the database to force a vacuum between // DATABASE_MAX_TIME_BEFORE_VACUUM and DATABASE_MIN_TIME_BEFORE_VACUUM. #define DATABASE_VACUUM_FREEPAGES_THRESHOLD 0.1 @@ -374,8 +377,6 @@ PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsNavHistory, gHistoryService) nsNavHistory::nsNavHistory() : mBatchLevel(0) , mBatchDBTransaction(nsnull) -, mDBPageSize(0) -, mCurrentJournalMode(JOURNAL_DELETE) , mCachedNow(0) , mExpireNowTimer(nsnull) , mLastSessionID(0) @@ -619,83 +620,26 @@ nsNavHistory::InitDBFile(PRBool aForceInit) } -nsresult -nsNavHistory::SetJournalMode(enum JournalMode aJournalMode) { - nsCAutoString journalMode; - switch (aJournalMode) { - case JOURNAL_DELETE: - journalMode.AssignLiteral("delete"); - break; - case JOURNAL_TRUNCATE: - journalMode.AssignLiteral("truncate"); - break; - case JOURNAL_MEMORY: - journalMode.AssignLiteral("memory"); - break; - case JOURNAL_WAL: - journalMode.AssignLiteral("wal"); - break; - default: - NS_ABORT_IF_FALSE(false, "Trying to set an unknown journal mode."); - } - - nsCOMPtr statement; - nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING( - "PRAGMA journal_mode = ") + journalMode, - getter_AddRefs(statement)); - NS_ENSURE_SUCCESS(rv, rv); - - mozStorageStatementScoper scoper(statement); - PRBool hasResult; - rv = statement->ExecuteStep(&hasResult); - NS_ENSURE_SUCCESS(rv, rv); - NS_ENSURE_TRUE(hasResult, NS_ERROR_FAILURE); - - nsCAutoString currentJournalMode; - rv = statement->GetUTF8String(0, currentJournalMode); - NS_ENSURE_SUCCESS(rv, rv); - bool succeeded = currentJournalMode.Equals(journalMode); - NS_WARN_IF_FALSE(succeeded, - nsPrintfCString(128, "Setting journal mode failed: %s", - PromiseFlatCString(journalMode).get()).get()); - if (succeeded) { - mCurrentJournalMode = aJournalMode; - } - else { - return NS_ERROR_FAILURE; - } - - return NS_OK; -} - - nsresult nsNavHistory::InitDB() { - // WARNING: - // Any unfinalized statement will cause failure on setting WAL journal mode. - // Be sure to avoid them till journal mode has been set. - // Get the database schema version. PRInt32 currentSchemaVersion = 0; nsresult rv = mDBConn->GetSchemaVersion(¤tSchemaVersion); NS_ENSURE_SUCCESS(rv, rv); - { - // Get the page size. This may be different than the default if the - // database file already existed with a different page size. - nsCOMPtr statement; - rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("PRAGMA page_size"), - getter_AddRefs(statement)); - NS_ENSURE_SUCCESS(rv, rv); - PRBool hasResult; - mozStorageStatementScoper scoper(statement); - rv = statement->ExecuteStep(&hasResult); - NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE); - rv = statement->GetInt32(0, &mDBPageSize); - NS_ENSURE_SUCCESS(rv, rv); - NS_ENSURE_TRUE(mDBPageSize > 0, NS_ERROR_UNEXPECTED); - } + // Get the page size. This may be different than the default if the + // database file already existed with a different page size. + nsCOMPtr statement; + rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("PRAGMA page_size"), + getter_AddRefs(statement)); + NS_ENSURE_SUCCESS(rv, rv); + + PRBool hasResult; + mozStorageStatementScoper scoper(statement); + rv = statement->ExecuteStep(&hasResult); + NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE); + PRInt32 pageSize = statement->AsInt32(0); // Ensure that temp tables are held in memory, not on disk. We use temp // tables mainly for fsync and I/O reduction. @@ -727,10 +671,10 @@ nsNavHistory::InitDB() PRInt64 cacheSize = physMem * cachePercentage / 100; // Compute number of cached pages, this will be our cache size. - PRInt64 cachePages = cacheSize / mDBPageSize; - nsCAutoString cacheSizePragma("PRAGMA cache_size = "); - cacheSizePragma.AppendInt(cachePages); - rv = mDBConn->ExecuteSimpleSQL(cacheSizePragma); + PRInt64 cachePages = cacheSize / pageSize; + nsCAutoString pageSizePragma("PRAGMA cache_size = "); + pageSizePragma.AppendInt(cachePages); + rv = mDBConn->ExecuteSimpleSQL(pageSizePragma); NS_ENSURE_SUCCESS(rv, rv); // Lock the database file. This is done partly to avoid third party @@ -739,14 +683,9 @@ nsNavHistory::InitDB() "PRAGMA locking_mode = EXCLUSIVE")); NS_ENSURE_SUCCESS(rv, rv); - // Be sure to set journal mode after page_size, WAL would prevent the change - // otherwise. - if (NS_FAILED(SetJournalMode(JOURNAL_WAL))) { - // Ignore errors, if we fail here the database could be considered corrupt - // and we won't be able to go on, even if it's just matter of a bogus - // filesystem. The default mode (DELETE) will be fine in such a case. - (void)SetJournalMode(JOURNAL_TRUNCATE); - } + rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "PRAGMA journal_mode = " DATABASE_JOURNAL_MODE)); + NS_ENSURE_SUCCESS(rv, rv); // We are going to initialize tables, so everything from now on should be in // a transaction for performances. @@ -1841,7 +1780,9 @@ nsNavHistory::MigrateV9Up(mozIStorageConnection *aDBConn) // reducing write times by a half, but will temporary consume more memory // and increase risks of corruption if we should crash in the middle of this // update. - (void)SetJournalMode(JOURNAL_MEMORY); + rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "PRAGMA journal_mode = MEMORY")); + NS_ENSURE_SUCCESS(rv, rv); rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "UPDATE moz_places SET last_visit_date = " @@ -1851,9 +1792,9 @@ nsNavHistory::MigrateV9Up(mozIStorageConnection *aDBConn) NS_ENSURE_SUCCESS(rv, rv); // Restore the default journal mode. - if (NS_FAILED(SetJournalMode(JOURNAL_WAL))) { - (void)SetJournalMode(JOURNAL_TRUNCATE); - } + rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "PRAGMA journal_mode = " DATABASE_JOURNAL_MODE)); + NS_ENSURE_SUCCESS(rv, rv); } return transaction.Commit(); @@ -5953,25 +5894,38 @@ nsNavHistory::VacuumDatabase() nsnull); } - // If journal mode is WAL, a VACUUM cannot upgrade page_size value. - // If current page_size is not the expected one, journal mode must be - // changed to a rollback one. Once done we won't be able to go back to WAL - // mode though, since unfinalized statements exist. Just keep using - // compatible mode till next restart. - // See http://www.sqlite.org/wal.html - if (mCurrentJournalMode == JOURNAL_WAL && - mDBPageSize != SQLITE_DEFAULT_PAGE_SIZE) { - (void)SetJournalMode(JOURNAL_TRUNCATE); - } + // Actually vacuuming a database is a slow operation, since it could take + // seconds. Part of the time is spent in updating the journal file on disk + // and this is particularly bad on devices with slow I/O. Temporary + // moving the journal to memory could increase a bit the possibility of + // corruption if we crash during this time, but makes the process really + // faster. + nsCOMPtr journalToMemory; + rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING( + "PRAGMA journal_mode = MEMORY"), + getter_AddRefs(journalToMemory)); + NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr vacuum; - rv = mDBConn->CreateAsyncStatement(NS_LITERAL_CSTRING("VACUUM"), - getter_AddRefs(vacuum)); + nsCOMPtr vacuum; + rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("VACUUM"), + getter_AddRefs(vacuum)); NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr journalToDefault; + rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING( + "PRAGMA journal_mode = " DATABASE_JOURNAL_MODE), + getter_AddRefs(journalToDefault)); + NS_ENSURE_SUCCESS(rv, rv); + + mozIStorageBaseStatement *stmts[] = { + journalToMemory, + vacuum, + journalToDefault + }; nsCOMPtr ps; - rv = vacuum->ExecuteAsync(nsnull, getter_AddRefs(ps)); + rv = mDBConn->ExecuteAsync(stmts, NS_ARRAY_LENGTH(stmts), nsnull, + getter_AddRefs(ps)); NS_ENSURE_SUCCESS(rv, rv); - vacuum->Finalize(); if (mPrefBranch) { (void)mPrefBranch->SetIntPref(PREF_LAST_VACUUM, diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h index 045dea4d4239..3614c87e0690 100644 --- a/toolkit/components/places/src/nsNavHistory.h +++ b/toolkit/components/places/src/nsNavHistory.h @@ -122,18 +122,6 @@ namespace places { , DB_SET_PLACE_TITLE = 9 }; - enum JournalMode { - // Default SQLite jousrnal mode. - JOURNAL_DELETE = 0 - // Can reduce fsyncs on Linux when journal is deleted (See bug 460315). - // We fallback to this mode when WAL is unavailable. - , JOURNAL_TRUNCATE - // Unsafe in case of crashes on database swap or low memory. - , JOURNAL_MEMORY - // Can reduce number of fsyncs. We try to use this mode by default. - , JOURNAL_WAL - }; - } // namespace places } // namespace mozilla @@ -481,7 +469,6 @@ protected: nsCOMPtr mDBService; nsCOMPtr mDBConn; nsCOMPtr mDBFile; - PRInt32 mDBPageSize; nsCOMPtr mDBGetURLPageInfo; // kGetInfoIndex_* results nsCOMPtr mDBGetIdPageInfo; // kGetInfoIndex_* results @@ -549,12 +536,6 @@ protected: */ nsresult InitDBFile(PRBool aForceInit); - /** - * Set journal mode on the database. - */ - nsresult SetJournalMode(enum mozilla::places::JournalMode aJournalMode); - enum mozilla::places::JournalMode mCurrentJournalMode; - /** * Initializes the database. This performs any necessary migrations for the * database. All migration is done inside a transaction that is rolled back diff --git a/toolkit/components/places/src/nsPlacesDBFlush.js b/toolkit/components/places/src/nsPlacesDBFlush.js index 09ce78d48dd8..e797b9b2721e 100644 --- a/toolkit/components/places/src/nsPlacesDBFlush.js +++ b/toolkit/components/places/src/nsPlacesDBFlush.js @@ -138,18 +138,6 @@ nsPlacesDBFlush.prototype = { // Close the database connection, this was the last sync and we can't // ensure database coherence from now on. this._self._finalizeInternalStatements(); - - // Before closing the connection we have to set back journal mode to - // a backwards compatible value. Newer journal modes like WAL make - // the database incompatible with old versions of the browser, setting - // an old mode restores database version. - // See http://www.sqlite.org/draft/wal.html - let journalStmt = this._self._db.createAsyncStatement( - "PRAGMA journal_mode = truncate" - ); - journalStmt.executeAsync(); - journalStmt.finalize(); - this._self._db.asyncClose(); } }, Ci.nsIThread.DISPATCH_NORMAL); From 0154d3137a72ec10b9903e8cf1980097ed32ebb0 Mon Sep 17 00:00:00 2001 From: Michael Yoshitaka Erlewine Date: Thu, 12 Aug 2010 18:32:18 -0500 Subject: [PATCH 006/109] Bug 586685: All user-facing strings in JS are now localizable via stringbundle [r=dolske a=dolske] NOT. Everything but user facing strings being localized. Random whitespace fixes. Random styling changes. Also has Bug 587158 - Update intro-video URL to CDN'ed version And string changes. And Bug 586814 - Unable to close Tab groups --HG-- extra : rebase_source : 75a5ef7e1cedfd180358b0fb2e6ea02b1ecb8f0e --- browser/base/content/tabview/drag.js | 4 ++-- browser/base/content/tabview/groupitems.js | 19 +++++++++---------- browser/base/content/tabview/items.js | 2 +- browser/base/content/tabview/tabview.css | 6 +++--- browser/base/content/tabview/ui.js | 9 ++++++--- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/browser/base/content/tabview/drag.js b/browser/base/content/tabview/drag.js index 2b28780e6c4a..26fe16b6ead3 100644 --- a/browser/base/content/tabview/drag.js +++ b/browser/base/content/tabview/drag.js @@ -108,8 +108,8 @@ Drag.prototype = { // proportionally or not // checkItemStatus - (boolean) make sure this is a valid item which should be snapped snapBounds: function Drag_snapBounds(bounds, stationaryCorner, assumeConstantSize, keepProportional, checkItemStatus) { - if (!stationaryCorner) - stationaryCorner || 'topleft'; + if (!stationaryCorner) + stationaryCorner || 'topleft'; var update = false; // need to update var updateX = false; var updateY = false; diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js index 8026426bf2e2..89fa4b089b9a 100644 --- a/browser/base/content/tabview/groupitems.js +++ b/browser/base/content/tabview/groupitems.js @@ -126,15 +126,13 @@ let GroupItem = function GroupItem(listOfEls, options) { // ___ New Tab Button this.$ntb = iQ("
") - .appendTo($container); - - this.$ntb .addClass('newTabButton') .click(function() { self.newTab(); - }); - - (this.$ntb)[0].title = 'New tab'; + }) + .attr('title', + "New tab") + .appendTo($container); // ___ Resizer this.$resizer = iQ("
") @@ -169,7 +167,7 @@ let GroupItem = function GroupItem(listOfEls, options) { this.$titleContainer = iQ('.title-container', this.$titlebar); this.$title = iQ('.name', this.$titlebar); this.$titleShield = iQ('.title-shield', this.$titlebar); - this.setTitle(options.title || ""); + this.setTitle(options.title || this.defaultName); var titleUnfocus = function() { self.$titleShield.show(); @@ -298,7 +296,7 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), { // ---------- // Variable: defaultName // The prompt text for the title field. - defaultName: "name this groupItem...", + defaultName: "Name this tab group…", // ----------- // Function: setActiveTab @@ -374,7 +372,7 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), { adjustTitleSize: function() { Utils.assert(this.bounds, 'bounds needs to have been set'); let closeButton = iQ('.close', this.container); - var w = Math.min(this.bounds.width - closeButton.width() - closeButton.css('right'), + var w = Math.min(this.bounds.width - parseInt(closeButton.width()) - parseInt(closeButton.css('right')), Math.max(150, this.getTitle().length * 6)); // The * 6 multiplier calculation is assuming that characters in the title // are approximately 6 pixels wide. Bug 586545 @@ -1797,8 +1795,9 @@ window.GroupItems = { // Function: killNewTabGroup // Removes the New Tab Group, which is now defunct. See bug 575851 and comments therein. killNewTabGroup: function() { + let newTabGroupTitle = "New Tabs"; this.groupItems.forEach(function(groupItem) { - if (groupItem.getTitle() == 'New Tabs' && groupItem.locked.title) { + if (groupItem.getTitle() == newTabGroupTitle && groupItem.locked.title) { groupItem.removeAll(); groupItem.close(); } diff --git a/browser/base/content/tabview/items.js b/browser/base/content/tabview/items.js index fff99e3ca511..d77083315684 100644 --- a/browser/base/content/tabview/items.js +++ b/browser/base/content/tabview/items.js @@ -1048,7 +1048,7 @@ window.Items = { var bounds2 = pair2.bounds; if (bounds2.intersects(newBounds)) blocked = true; - return; + return; }); if (!blocked) { diff --git a/browser/base/content/tabview/tabview.css b/browser/base/content/tabview/tabview.css index 6e6179a9fd39..9a2ec1fd3a61 100644 --- a/browser/base/content/tabview/tabview.css +++ b/browser/base/content/tabview/tabview.css @@ -347,11 +347,11 @@ input.name { padding-left: 20px; } -input.name:hover { +.title-container:hover input.name { border: 1px solid #ddd; } -input.name-locked:hover { +.title-container:hover input.name-locked { border: 1px solid transparent !important; cursor: default; } @@ -366,7 +366,7 @@ input.defaultName { color: transparent; } -input.defaultName:hover { +.title-container:hover input.defaultName { color: #CCC; } diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index dea337aeaa0b..e598704eefa9 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -180,11 +180,14 @@ var UIManager = { }); // ___ make info item + let welcome = "How to organize your tabs"; + let more = ""; + let video = "http://videos-cdn.mozilla.net/firefox4beta/tabcandy_howto.webm"; var html = "
" - + "

Welcome to Firefox Tab Sets

" // TODO: This needs to be localized if it's kept in - + "
(more goes here)

" - + "
"; From 44f06cfe7b283c291fc774fa80a1e4548eae36b2 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 12 Aug 2010 17:28:45 -0700 Subject: [PATCH 007/109] + partial fix for 586721: Kill dev menu [r=dolske a=dolske] --HG-- extra : rebase_source : 9ee847d90a3f517474e6982e6d0b3ae8a8f2ec9c --- browser/base/content/tabview/ui.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index e598704eefa9..7a9bc333ecf6 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -107,7 +107,12 @@ var UIManager = { this._currentTab = gBrowser.selectedTab; // ___ Dev Menu - this._addDevMenu(); + // This dev menu is not meant for shipping, nor is it of general + // interest, but we still need it for the time being. Change the + // false below to enable; just remember to change back before + // committing. Bug 586721 will track the ultimate removal. + if (false) + this._addDevMenu(); // When you click on the background/empty part of TabView, // we create a new groupItem. From f395962d2c40a395515d4bd67449488ac4da0ae6 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 12 Aug 2010 17:37:22 -0700 Subject: [PATCH 008/109] Bug 586834 - Reinstate the Tab Candy bounce [r=dolske a=dolske] --HG-- extra : rebase_source : c855277103725aa905c4adba18b1f0b6cc65e2ad --- browser/base/content/tabview/iq.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/browser/base/content/tabview/iq.js b/browser/base/content/tabview/iq.js index 690874d51280..08983a83133f 100644 --- a/browser/base/content/tabview/iq.js +++ b/browser/base/content/tabview/iq.js @@ -531,9 +531,7 @@ iQClass.prototype = { options = {}; let easings = { - tabviewBounce: "cubic-bezier(0.0, 0.63, .6, 1.0)", - // TODO: change 1.0 above to 1.29 after bug 575672 is fixed - + tabviewBounce: "cubic-bezier(0.0, 0.63, .6, 1.29)", easeInQuad: 'ease-in', // TODO: make it a real easeInQuad, or decide we don't care fast: 'cubic-bezier(0.7,0,1,1)' }; From 64262f7d4fcaea7126e38fa04a57f7e8b4a5bdd5 Mon Sep 17 00:00:00 2001 From: Edward Lee Date: Thu, 12 Aug 2010 15:00:39 -0700 Subject: [PATCH 009/109] Bug 586777 - Restore ctrl-space activation for on windows/linux [r=dolske a=dolske] Switch back to ctrl-space and check for certain nodes where we shouldn't handle it. --HG-- extra : rebase_source : 8ee74987148606472893f5230eaf4486f431c1fc --- browser/base/content/browser-tabview.js | 28 ++++++++++++++++++- browser/base/content/tabview/ui.js | 2 +- .../test/tabview/browser_tabview_launch.js | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js index 1305d62a4ec0..998bdf54f3ba 100644 --- a/browser/base/content/browser-tabview.js +++ b/browser/base/content/browser-tabview.js @@ -197,8 +197,34 @@ let TabView = { charCode == 160) { // alt + space #else if (event.ctrlKey && !event.metaKey && !event.shiftKey && - event.altKey && charCode == 32) { // ctrl + alt + space + !event.altKey && charCode == 32) { // ctrl + space #endif + + // Don't handle this event if it's coming from a node that might allow + // multiple keyboard selection like selects or trees + let node = event.target; + switch (node.namespaceURI) { + case "http://www.w3.org/1999/xhtml": + // xhtml:select only allows multiple when the attr is set + if (node.localName == "select" && node.hasAttribute("multiple")) + return; + break; + + case "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul": + switch (node.localName) { + case "listbox": + // xul:listbox is by default single + if (node.getAttribute("seltype") == "multiple") + return; + break; + case "tree": + // xul:tree is by default multiple + if (node.getAttribute("seltype") != "single") + return; + break; + } + } + event.stopPropagation(); event.preventDefault(); self.show(); diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index 7a9bc333ecf6..9e941dd29aff 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -644,7 +644,7 @@ var UIManager = { !event.ctrlKey) { #else if (event.ctrlKey && !event.metaKey && !event.shiftKey && - event.altKey) { + !event.altKey) { #endif var activeTab = self.getActiveTab(); if (activeTab) diff --git a/browser/base/content/test/tabview/browser_tabview_launch.js b/browser/base/content/test/tabview/browser_tabview_launch.js index 6391c0b9a73b..8fc13ac95993 100644 --- a/browser/base/content/test/tabview/browser_tabview_launch.js +++ b/browser/base/content/test/tabview/browser_tabview_launch.js @@ -56,7 +56,7 @@ function test() { eventObject = { altKey: true }; } else { charCode = 32; - eventObject = { altKey: true, ctrlKey: true }; + eventObject = { ctrlKey: true }; } var modifiers = EventUtils._parseModifiers(eventObject); var keyDownDefaultHappened = From 2fb80c29efc51caf2a33b29068097d3321799824 Mon Sep 17 00:00:00 2001 From: Honza Bambas Date: Sat, 14 Aug 2010 20:45:46 -0400 Subject: [PATCH 010/109] Bug 585214 - Favicon fails to load on some sites. r=jst --- toolkit/mozapps/shared/CertUtils.jsm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/mozapps/shared/CertUtils.jsm index a02f16f7c916..2c9c479dc5e5 100644 --- a/toolkit/mozapps/shared/CertUtils.jsm +++ b/toolkit/mozapps/shared/CertUtils.jsm @@ -144,8 +144,10 @@ BadCertHandler.prototype = { // nsIChannelEventSink asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback) { - if (this.allowNonBuiltInCerts) + if (this.allowNonBuiltInCerts) { + callback.onRedirectVerifyCallback(Components.results.NS_OK); return; + } // make sure the certificate of the old channel checks out before we follow // a redirect from it. See bug 340198. @@ -154,7 +156,7 @@ BadCertHandler.prototype = { checkCert(oldChannel); callback.onRedirectVerifyCallback(Components.results.NS_OK); - }, + }, // Suppress any certificate errors notifyCertProblem: function(socketInfo, status, targetSite) { From f73ff7c2624d49e5bcaf922deeeb59093b15b666 Mon Sep 17 00:00:00 2001 From: "timeless@mozdev.org" Date: Fri, 13 Aug 2010 16:15:31 +0200 Subject: [PATCH 011/109] Bug 578718 Rename unix directory to reflect that it is in fact bindings for emacs r=ted a=blocking-fennec2.0b1 --HG-- rename : content/xbl/builtin/unix/Makefile.in => content/xbl/builtin/emacs/Makefile.in rename : content/xbl/builtin/unix/jar.mn => content/xbl/builtin/emacs/jar.mn rename : content/xbl/builtin/unix/platformHTMLBindings.xml => content/xbl/builtin/emacs/platformHTMLBindings.xml --- content/xbl/builtin/Makefile.in | 2 +- content/xbl/builtin/{unix => emacs}/Makefile.in | 0 content/xbl/builtin/{unix => emacs}/jar.mn | 0 content/xbl/builtin/{unix => emacs}/platformHTMLBindings.xml | 0 toolkit/toolkit-makefiles.sh | 1 + 5 files changed, 2 insertions(+), 1 deletion(-) rename content/xbl/builtin/{unix => emacs}/Makefile.in (100%) rename content/xbl/builtin/{unix => emacs}/jar.mn (100%) rename content/xbl/builtin/{unix => emacs}/platformHTMLBindings.xml (100%) diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in index 03f0aee63b8b..0d21f19ecc7e 100644 --- a/content/xbl/builtin/Makefile.in +++ b/content/xbl/builtin/Makefile.in @@ -51,7 +51,7 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) DIRS = gtk2 else -DIRS = unix +DIRS = emacs endif endif endif diff --git a/content/xbl/builtin/unix/Makefile.in b/content/xbl/builtin/emacs/Makefile.in similarity index 100% rename from content/xbl/builtin/unix/Makefile.in rename to content/xbl/builtin/emacs/Makefile.in diff --git a/content/xbl/builtin/unix/jar.mn b/content/xbl/builtin/emacs/jar.mn similarity index 100% rename from content/xbl/builtin/unix/jar.mn rename to content/xbl/builtin/emacs/jar.mn diff --git a/content/xbl/builtin/unix/platformHTMLBindings.xml b/content/xbl/builtin/emacs/platformHTMLBindings.xml similarity index 100% rename from content/xbl/builtin/unix/platformHTMLBindings.xml rename to content/xbl/builtin/emacs/platformHTMLBindings.xml diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index c5d43f53e790..c2b6812f53a7 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -254,6 +254,7 @@ MAKEFILES_content=" content/xbl/public/Makefile content/xbl/src/Makefile content/xbl/builtin/Makefile + content/xbl/builtin/emacs/Makefile content/xbl/builtin/gtk2/Makefile content/xbl/builtin/mac/Makefile content/xslt/Makefile From 2302921eddf1a4a8e099dbe658314b0270c593dd Mon Sep 17 00:00:00 2001 From: "timeless@mozdev.org" Date: Fri, 13 Aug 2010 16:15:32 +0200 Subject: [PATCH 012/109] Bug 578718 Qt should use modern unix keybindings instead of classic keybindings r=ted a=blocking-fennec2.0b1 --HG-- rename : content/xbl/builtin/gtk2/Makefile.in => content/xbl/builtin/unix/Makefile.in rename : content/xbl/builtin/gtk2/jar.mn => content/xbl/builtin/unix/jar.mn rename : content/xbl/builtin/gtk2/platformHTMLBindings.xml => content/xbl/builtin/unix/platformHTMLBindings.xml --- content/xbl/builtin/Makefile.in | 4 ++-- content/xbl/builtin/{gtk2 => unix}/Makefile.in | 0 content/xbl/builtin/{gtk2 => unix}/jar.mn | 0 content/xbl/builtin/{gtk2 => unix}/platformHTMLBindings.xml | 0 toolkit/toolkit-makefiles.sh | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename content/xbl/builtin/{gtk2 => unix}/Makefile.in (100%) rename content/xbl/builtin/{gtk2 => unix}/jar.mn (100%) rename content/xbl/builtin/{gtk2 => unix}/platformHTMLBindings.xml (100%) diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in index 0d21f19ecc7e..157465ce1c83 100644 --- a/content/xbl/builtin/Makefile.in +++ b/content/xbl/builtin/Makefile.in @@ -48,8 +48,8 @@ else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) DIRS = mac else -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -DIRS = gtk2 +ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT))) +DIRS = unix else DIRS = emacs endif diff --git a/content/xbl/builtin/gtk2/Makefile.in b/content/xbl/builtin/unix/Makefile.in similarity index 100% rename from content/xbl/builtin/gtk2/Makefile.in rename to content/xbl/builtin/unix/Makefile.in diff --git a/content/xbl/builtin/gtk2/jar.mn b/content/xbl/builtin/unix/jar.mn similarity index 100% rename from content/xbl/builtin/gtk2/jar.mn rename to content/xbl/builtin/unix/jar.mn diff --git a/content/xbl/builtin/gtk2/platformHTMLBindings.xml b/content/xbl/builtin/unix/platformHTMLBindings.xml similarity index 100% rename from content/xbl/builtin/gtk2/platformHTMLBindings.xml rename to content/xbl/builtin/unix/platformHTMLBindings.xml diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index c2b6812f53a7..1dbb498bdb7f 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -255,8 +255,8 @@ MAKEFILES_content=" content/xbl/src/Makefile content/xbl/builtin/Makefile content/xbl/builtin/emacs/Makefile - content/xbl/builtin/gtk2/Makefile content/xbl/builtin/mac/Makefile + content/xbl/builtin/unix/Makefile content/xslt/Makefile content/xslt/public/Makefile content/xslt/src/Makefile From 925f76f9f63872716a18860be39a983bd7dfab89 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 13 Aug 2010 18:37:13 -0700 Subject: [PATCH 013/109] Bug 587187 - test for window.TabView rather than just TabView [r=dolske a=dolske] Check the global object for existence to avoid ReferenceError. --HG-- extra : rebase_source : 71a843015f6c58795ce1eb543762df61679baf46 --- browser/base/content/tabbrowser.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 86359f96fbf0..72ce1abded2e 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -726,7 +726,7 @@ Date: Fri, 13 Aug 2010 18:51:32 -0700 Subject: [PATCH 014/109] Bug 587039 - Rename View > TabView And All Instances of Tab Sets to "Group my tabs..." [r=dolske a=dolske] --HG-- extra : rebase_source : 2bbd91c3222fe301f75870a07ee84fb1947d748d --- browser/base/content/browser-menubar.inc | 4 ++-- browser/base/content/browser-tabview.js | 2 +- browser/base/content/browser.xul | 4 ++-- browser/locales/en-US/chrome/browser/browser.dtd | 8 ++++---- browser/locales/en-US/chrome/browser/browser.properties | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index d630737d2ae7..52f9a2b3e687 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -209,8 +209,8 @@ accesskey="&viewMenu.accesskey;"> - - + + @@ -240,8 +240,8 @@ - - + + diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index 3c9cdf8501cc..082be0c7db29 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -276,7 +276,7 @@ ctrlTab.showAll.label=;Show all #1 tabs addKeywordTitleAutoFill=Search %S # TabView -tabView.title=%S Tab Sets +tabView2.title=%S - Group Your Tabs extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme. From 8f7e4eb44054879ea7483dd75779498a8d008914 Mon Sep 17 00:00:00 2001 From: Frank Yan Date: Fri, 13 Aug 2010 19:36:47 -0700 Subject: [PATCH 015/109] Bug 581820 - Minimize/Maximize/Close buttons missing when Firefox is in TabView [r=dolske a=dolske] Give some margin to show the buttons even when in TabView. --HG-- extra : rebase_source : 45918646e8b111deb67a1695faaaaada6c5ff6e8 --- browser/base/content/tabview/ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index 9e941dd29aff..50bbe54e0706 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -312,7 +312,7 @@ var UIManager = { #ifdef XP_WIN // Restore the full height when showing TabView - gTabViewFrame.style.marginTop = 0; + gTabViewFrame.style.marginTop = "22px"; #endif gTabViewDeck.selectedIndex = 1; gTabViewFrame.contentWindow.focus(); From cfae18edb4c464cb710527d7cac7373159970119 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Sat, 14 Aug 2010 10:18:05 +0200 Subject: [PATCH 016/109] Bug 587289: Unload D3D10_1.dll at the right place. r=joe a=blocking-beta4+ --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index 1bad67a12b70..a51252df304a 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -331,9 +331,10 @@ cairo_release_device(cairo_device_t *device) if (!newrefcnt) { // Call the correct destructor cairo_d2d_device_t *d2d_device = reinterpret_cast(device); - FreeLibrary(d2d_device->mD3D10_1); + HMODULE d3d10_1 = d2d_device->mD3D10_1; delete d2d_device; _cairo_d2d_release_factory(); + FreeLibrary(d3d10_1); } return newrefcnt; } From 421ee71541021050eb23e0d853a6cb9ac25a24ad Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Sat, 14 Aug 2010 08:32:38 -0400 Subject: [PATCH 017/109] Bug 586835. Disable a couple more intermittent reftest fails with D2D. Not sure what's going on with these yet... --- layout/reftests/bugs/reftest.list | 6 +++--- layout/reftests/native-theme/reftest.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 02977ee5d819..564618d66155 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -617,7 +617,7 @@ asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1-ref.html == 373298-1.html 373298-1-ref.html == 373381-1.html 373381-1-ref.html == 373381-2.html 373381-2-ref.html -== 373381-3.html 373381-3-ref.html +random-if(d2d) == 373381-3.html 373381-3-ref.html == 373381-4.html 373381-4-ref.html == 375508-1.html 375508-1-ref.html == 373433-1.html 373433-1-ref.html @@ -625,7 +625,7 @@ asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1-ref.html == 372768-1.html 372768-1-ref.html == 373383-1.html 373383-1-ref.html == 374038-1.xul 374038-1-ref.xul -== 374719-1.xul 374719-1-ref.xul +random-if(d2d) == 374719-1.xul 374719-1-ref.xul == 374038-2.xul 374038-2-ref.xul fails == 374927-1.html 374927-1-ref.html # Was broken by patch for bug 368600; fails until bug 400776 is fixed == 375716-1.html 375716-1-ref.html @@ -1245,7 +1245,7 @@ fails == 472020-2.xul 472020-2-ref.xul == 478614-5.html 478614-5-ref.html == 478614-6.html 478614-6-ref.html == 478614-7.html 478614-7-ref.html -== 478377-1.xul 478377-1-ref.xul +random-if(d2d) == 478377-1.xul 478377-1-ref.xul == 478811-1.html 478811-1-ref.html == 478811-2.html 478811-2-ref.html == 478811-3.html 478811-3-ref.html diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list index 1ad32434511c..7ef16db1a2e6 100644 --- a/layout/reftests/native-theme/reftest.list +++ b/layout/reftests/native-theme/reftest.list @@ -49,7 +49,7 @@ skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-r skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl-ref.xul skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl-ref.html != resizer-bottomend.xul blank-window.xul -== resizer-bottomend.xul resizer-bottomright.xul +random-if(d2d) == resizer-bottomend.xul resizer-bottomright.xul != resizer-bottomend.xul resizer-bottomend-rtl.xul skip-if(gtk2Widget) != resizer-bottomend-rtl.xul blank-window.xul skip-if(gtk2Widget) == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul From c4d7b8f41c142eb8dc274415ae0c7ee5c2ec9877 Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Sat, 14 Aug 2010 08:43:27 -0400 Subject: [PATCH 018/109] Bug 573229. Disable D2D to fix all the orange it's causing. There are a bunch of failing mochitests that I don't have an answer for, so just disable D2D for now. --- gfx/thebes/gfxWindowsPlatform.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 99759d187e7b..72b1e7429d7a 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -191,7 +191,7 @@ gfxWindowsPlatform::gfxWindowsPlatform() NS_RegisterMemoryReporter(new D2DCacheReporter()); mD2DDevice = NULL; - if (isVistaOrHigher) { + if (isVistaOrHigher && 0) { // We need a DWriteFactory to work. HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) @@ -627,4 +627,4 @@ gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aP } gfxTextRunWordCache::Flush(); } -} \ No newline at end of file +} From c7c2d6cb93c14f3fc89fd58489423517d7d03032 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Sat, 14 Aug 2010 16:41:51 +0200 Subject: [PATCH 019/109] Bug 585295 - Broken GLContextProviderEGL.cpp compilation on mingw-w64 r=vladimir a=joe --HG-- extra : rebase_source : 62a8074c8edfe982e6ddbbc6df6d57b41744aeb1 --- gfx/thebes/GLContextProviderEGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/thebes/GLContextProviderEGL.cpp b/gfx/thebes/GLContextProviderEGL.cpp index 439c7c195f2e..97e86e6c1810 100644 --- a/gfx/thebes/GLContextProviderEGL.cpp +++ b/gfx/thebes/GLContextProviderEGL.cpp @@ -437,7 +437,7 @@ public: } \ } while(0) - printf_stderr("EGL Config: %d [0x%08x]", (int)cfg, (PRUint32)cfg); + printf_stderr("EGL Config: %d [%p]", (int)(intptr_t)cfg, cfg); ATTR(BUFFER_SIZE); ATTR(ALPHA_SIZE); From aac1a9302f0d87d04405b8b9f69736670262f7c3 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Sat, 14 Aug 2010 16:43:14 +0200 Subject: [PATCH 020/109] Bug 586279 - Broken DeviceManagerD3D9.h compilation on mingw r=bas.schouten a=joe --HG-- extra : rebase_source : c3c6d40e0adbfa705759cb238ea10fc0e12e0d4a --- gfx/layers/d3d9/DeviceManagerD3D9.cpp | 5 +++++ gfx/layers/d3d9/DeviceManagerD3D9.h | 9 +++------ gfx/layers/d3d9/LayerManagerD3D9.cpp | 4 +--- gfx/layers/d3d9/LayerManagerD3D9.h | 5 +++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gfx/layers/d3d9/DeviceManagerD3D9.cpp b/gfx/layers/d3d9/DeviceManagerD3D9.cpp index 25eedc2f460b..ebeca7b30680 100644 --- a/gfx/layers/d3d9/DeviceManagerD3D9.cpp +++ b/gfx/layers/d3d9/DeviceManagerD3D9.cpp @@ -182,6 +182,11 @@ DeviceManagerD3D9::DeviceManagerD3D9() { } +DeviceManagerD3D9::~DeviceManagerD3D9() +{ + LayerManagerD3D9::OnDeviceManagerDestroy(this); +} + bool DeviceManagerD3D9::Init() { diff --git a/gfx/layers/d3d9/DeviceManagerD3D9.h b/gfx/layers/d3d9/DeviceManagerD3D9.h index b3b921142447..13a4a6fcbd7c 100644 --- a/gfx/layers/d3d9/DeviceManagerD3D9.h +++ b/gfx/layers/d3d9/DeviceManagerD3D9.h @@ -106,9 +106,7 @@ class THEBES_API DeviceManagerD3D9 public: DeviceManagerD3D9(); - // We want the nsrefcnt return value. So we cannot use the inline refcnt macro - NS_IMPL_ADDREF(DeviceManagerD3D9) - NS_IMPL_RELEASE(DeviceManagerD3D9) + NS_INLINE_DECL_REFCOUNTING(DeviceManagerD3D9) bool Init(); @@ -144,6 +142,8 @@ public: private: friend class SwapChainD3D9; + ~DeviceManagerD3D9(); + /** * This function verifies the device is ready for rendering, internally this * will test the cooperative level of the device and reset the device if @@ -192,9 +192,6 @@ private: /* If this device supports dynamic textures */ bool mHasDynamicTextures; - nsAutoRefCnt mRefCnt; - NS_DECL_OWNINGTHREAD - /** * Verifies all required device capabilities are present. */ diff --git a/gfx/layers/d3d9/LayerManagerD3D9.cpp b/gfx/layers/d3d9/LayerManagerD3D9.cpp index 13a5d56bca63..581e6fbd9d35 100644 --- a/gfx/layers/d3d9/LayerManagerD3D9.cpp +++ b/gfx/layers/d3d9/LayerManagerD3D9.cpp @@ -63,9 +63,7 @@ LayerManagerD3D9::~LayerManagerD3D9() mSwapChain = nsnull; if (mDeviceManager) { - if (!mDeviceManager->Release()) { - mDeviceManager = nsnull; - } + mDeviceManager->Release(); } } diff --git a/gfx/layers/d3d9/LayerManagerD3D9.h b/gfx/layers/d3d9/LayerManagerD3D9.h index 56f7bcaad45c..5e91a80f37d7 100644 --- a/gfx/layers/d3d9/LayerManagerD3D9.h +++ b/gfx/layers/d3d9/LayerManagerD3D9.h @@ -130,6 +130,11 @@ public: IDirect3DDevice9 *device() const { return mDeviceManager->device(); } DeviceManagerD3D9 *deviceManager() const { return mDeviceManager; } + static void OnDeviceManagerDestroy(DeviceManagerD3D9 *aDeviceManager) { + if(aDeviceManager == mDeviceManager) + mDeviceManager = nsnull; + } + private: /* Device manager instance */ static DeviceManagerD3D9 *mDeviceManager; From 1c1f4fa927905a73f01faacbbcd1de2b0f510c4b Mon Sep 17 00:00:00 2001 From: Gavin Sharp Date: Sat, 14 Aug 2010 18:15:21 +0200 Subject: [PATCH 021/109] Bug 586821 - Add affiliate URL queries to location bar search r,a=jst --HG-- rename : toolkit/components/search/nsIBrowserSearchService.idl => netwerk/base/public/nsIBrowserSearchService.idl extra : rebase_source : 77a06966db94e05fafdcb152bb6d5f40bef350ee --- browser/installer/package-manifest.in | 1 - .../chrome/browser-region/region.properties | 2 +- docshell/base/nsDefaultURIFixup.cpp | 44 +++++++++++++++---- netwerk/base/public/Makefile.in | 1 + .../base/public}/nsIBrowserSearchService.idl | 0 toolkit/components/search/Makefile.in | 5 --- 6 files changed, 38 insertions(+), 15 deletions(-) rename {toolkit/components/search => netwerk/base/public}/nsIBrowserSearchService.idl (100%) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index a355aea99233..91d3332108c0 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -235,7 +235,6 @@ #ifdef MOZ_ENABLE_XREMOTE @BINPATH@/components/toolkitremote.xpt #endif -@BINPATH@/components/toolkitsearch.xpt @BINPATH@/components/txtsvc.xpt @BINPATH@/components/txmgr.xpt #ifdef MOZ_USE_NATIVE_UCONV diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 85387186a628..f0003524ffa5 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -15,7 +15,7 @@ browser.contentHandlers.types.2.title=Google browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q= +keyword.URL= # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site diff --git a/docshell/base/nsDefaultURIFixup.cpp b/docshell/base/nsDefaultURIFixup.cpp index 0f5504a7ea44..0cd4006c4df9 100644 --- a/docshell/base/nsDefaultURIFixup.cpp +++ b/docshell/base/nsDefaultURIFixup.cpp @@ -48,6 +48,7 @@ #include "nsIPrefLocalizedString.h" #include "nsIPlatformCharset.h" #include "nsILocalFile.h" +#include "nsIBrowserSearchService.h" #include "nsIURIFixup.h" #include "nsDefaultURIFixup.h" @@ -388,16 +389,43 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword, mPrefBranch->GetCharPref("keyword.URL", getter_Copies(url)); } - // if we can't find a keyword.URL keywords won't work. - if (url.IsEmpty()) - return NS_ERROR_NOT_AVAILABLE; + // If the pref is set and non-empty, use it. + if (!url.IsEmpty()) { + nsCAutoString spec; + nsresult rv = MangleKeywordIntoURI(PromiseFlatCString(aKeyword).get(), + url.get(), spec); + if (NS_FAILED(rv)) return rv; - nsCAutoString spec; - nsresult rv = MangleKeywordIntoURI(PromiseFlatCString(aKeyword).get(), - url.get(), spec); - if (NS_FAILED(rv)) return rv; + return NS_NewURI(aURI, spec); + } - return NS_NewURI(aURI, spec); + // Try falling back to the search service's default search engine + nsCOMPtr searchSvc = do_GetService("@mozilla.org/browser/search-service;1"); + if (searchSvc) { + nsCOMPtr defaultEngine; + searchSvc->GetDefaultEngine(getter_AddRefs(defaultEngine)); + if (defaultEngine) { + nsCOMPtr submission; + defaultEngine->GetSubmission(NS_ConvertUTF8toUTF16(aKeyword), + EmptyString(), + getter_AddRefs(submission)); + if (submission) { + // The submission depends on POST data (i.e. the search engine's + // "method" is POST), we can't use this engine for keyword + // searches + nsCOMPtr postData; + submission->GetPostData(getter_AddRefs(postData)); + if (postData) { + return NS_ERROR_NOT_AVAILABLE; + } + + return submission->GetUri(aURI); + } + } + } + + // out of options + return NS_ERROR_NOT_AVAILABLE; } PRBool nsDefaultURIFixup::MakeAlternateURI(nsIURI *aURI) diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in index 191f97869823..dfeb78e87617 100644 --- a/netwerk/base/public/Makefile.in +++ b/netwerk/base/public/Makefile.in @@ -140,6 +140,7 @@ XPIDLSRCS = \ nsIURIWithPrincipal.idl \ nsIURIClassifier.idl \ nsIRedirectResultListener.idl \ + nsIBrowserSearchService.idl \ $(NULL) EXPORTS = \ diff --git a/toolkit/components/search/nsIBrowserSearchService.idl b/netwerk/base/public/nsIBrowserSearchService.idl similarity index 100% rename from toolkit/components/search/nsIBrowserSearchService.idl rename to netwerk/base/public/nsIBrowserSearchService.idl diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in index 5a5994911ae4..f8033b4a162e 100644 --- a/toolkit/components/search/Makefile.in +++ b/toolkit/components/search/Makefile.in @@ -43,11 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = toolkitsearch -XPIDL_MODULE = toolkitsearch - -XPIDLSRCS = nsIBrowserSearchService.idl - EXTRA_COMPONENTS = toolkitsearch.manifest EXTRA_PP_COMPONENTS = nsSearchService.js \ nsSearchSuggestions.js From ee43066f69e8ef54e1230a1c46d0857f7e2f5b7d Mon Sep 17 00:00:00 2001 From: Andreas Gal Date: Sat, 14 Aug 2010 10:52:08 -0700 Subject: [PATCH 022/109] b=586387; Problem with Typed Float32 Arrays and canonicalizeNaNs() / LIR_cmovd; r=nnethercote/edwsmith --- js/src/nanojit/NativeARM.cpp | 10 +++++++--- js/src/nanojit/NativeX64.cpp | 10 +++++++--- js/src/nanojit/Nativei386.cpp | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/js/src/nanojit/NativeARM.cpp b/js/src/nanojit/NativeARM.cpp index 656366ca91c0..a871b7680ac3 100644 --- a/js/src/nanojit/NativeARM.cpp +++ b/js/src/nanojit/NativeARM.cpp @@ -2777,13 +2777,14 @@ Assembler::asm_cmov(LIns* ins) Register rf = findRegFor(iffalse, allow & ~rmask(rr)); - // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. - Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; - if (ins->isop(LIR_cmovd)) { NIns* target = _nIns; asm_nongp_copy(rr, rf); asm_branch(false, condval, target); + + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + if (rr != rt) asm_nongp_copy(rr, rt); freeResourcesOf(ins); @@ -2794,6 +2795,9 @@ Assembler::asm_cmov(LIns* ins) return; } + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + // WARNING: We cannot generate any code that affects the condition // codes between the MRcc generation here and the asm_cmp() call // below. See asm_cmp() for more details. diff --git a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp index 2bfe515f1512..7132d33edfa9 100644 --- a/js/src/nanojit/NativeX64.cpp +++ b/js/src/nanojit/NativeX64.cpp @@ -1119,13 +1119,14 @@ namespace nanojit Register rf = findRegFor(iffalse, allow & ~rmask(rr)); - // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. - Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; - if (ins->isop(LIR_cmovd)) { NIns* target = _nIns; asm_nongp_copy(rr, rf); asm_branch(false, cond, target); + + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + if (rr != rt) asm_nongp_copy(rr, rt); freeResourcesOf(ins); @@ -1136,6 +1137,9 @@ namespace nanojit return; } + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + // WARNING: We cannot generate any code that affects the condition // codes between the MRcc generation here and the asm_cmp() call // below. See asm_cmp() for more details. diff --git a/js/src/nanojit/Nativei386.cpp b/js/src/nanojit/Nativei386.cpp index 3691ff388278..32e353c3048e 100644 --- a/js/src/nanojit/Nativei386.cpp +++ b/js/src/nanojit/Nativei386.cpp @@ -2059,13 +2059,14 @@ namespace nanojit Register rf = findRegFor(iffalse, allow & ~rmask(rr)); - // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. - Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; - if (ins->isop(LIR_cmovd)) { NIns* target = _nIns; asm_nongp_copy(rr, rf); asm_branch(false, condval, target); + + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + if (rr != rt) asm_nongp_copy(rr, rt); freeResourcesOf(ins); @@ -2076,6 +2077,9 @@ namespace nanojit return; } + // If 'iftrue' isn't in a register, it can be clobbered by 'ins'. + Register rt = iftrue->isInReg() ? iftrue->getReg() : rr; + NanoAssert(ins->isop(LIR_cmovi)); // WARNING: We cannot generate any code that affects the condition From 0fff021bbd1139c58ec69fb14ef011c4c37bd514 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Sat, 14 Aug 2010 10:52:16 -0700 Subject: [PATCH 023/109] b=586043; GL layer manager should use GetClientBounds, not GetBounds; r=bas --- gfx/layers/opengl/LayerManagerOGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp index f4a6f90eab25..5dabcf31d222 100644 --- a/gfx/layers/opengl/LayerManagerOGL.cpp +++ b/gfx/layers/opengl/LayerManagerOGL.cpp @@ -501,7 +501,7 @@ LayerManagerOGL::Render() } nsIntRect rect; - mWidget->GetBounds(rect); + mWidget->GetClientBounds(rect); GLint width = rect.width; GLint height = rect.height; From 145fdbfa9c2fd5bd4518b9d7f34d47a501f28ef5 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Sat, 14 Aug 2010 10:52:19 -0700 Subject: [PATCH 024/109] b=572522; add experimental mozArrayBuffer to XHR; r=jst, a=bsmedberg --- content/base/public/nsIXMLHttpRequest.idl | 11 +++++++ content/base/src/nsXMLHttpRequest.cpp | 30 +++++++++++++++++ content/base/test/Makefile.in | 2 ++ content/base/test/file_XHR_binary1.bin | Bin 0 -> 12 bytes .../base/test/file_XHR_binary1.bin^headers^ | 1 + content/base/test/test_XHR.html | 31 ++++++++++++++++++ dom/src/threads/nsDOMWorkerXHR.cpp | 7 ++++ 7 files changed, 82 insertions(+) create mode 100644 content/base/test/file_XHR_binary1.bin create mode 100644 content/base/test/file_XHR_binary1.bin^headers^ diff --git a/content/base/public/nsIXMLHttpRequest.idl b/content/base/public/nsIXMLHttpRequest.idl index 4bf89697e177..4250e6415775 100644 --- a/content/base/public/nsIXMLHttpRequest.idl +++ b/content/base/public/nsIXMLHttpRequest.idl @@ -47,6 +47,11 @@ interface nsIVariant; interface nsPIDOMWindow; interface nsIInputStream; +%{C++ +// for jsval +#include "jsapi.h" +%} + [scriptable, uuid(6ce0a193-b033-4c3d-b748-f851b09261f5)] interface nsIXMLHttpRequestEventTarget : nsIDOMEventTarget { // event handler attributes @@ -134,6 +139,12 @@ interface nsIXMLHttpRequest : nsISupports */ readonly attribute AString responseText; + /** + * The response to the request as a typed array ArrayBuffer. + * NULL if the request is unsuccessful or + * has not yet been sent. + */ + readonly attribute jsval /*ArrayBuffer*/ mozResponseArrayBuffer; /** * The status of the response to the request for HTTP requests. diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 8b7a3dfb2316..674bc72bf780 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -100,6 +100,7 @@ #include "nsChannelPolicy.h" #include "nsIContentSecurityPolicy.h" #include "nsAsyncRedirectVerifyHelper.h" +#include "jstypedarray.h" #define LOAD_STR "load" #define ERROR_STR "error" @@ -1234,6 +1235,35 @@ NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText) return rv; } +/* readonly attribute jsval (ArrayBuffer) mozResponseArrayBuffer; */ +NS_IMETHODIMP nsXMLHttpRequest::GetMozResponseArrayBuffer(jsval *aResult) +{ + JSContext *cx = nsContentUtils::GetCurrentJSContext(); + if (!cx) + return NS_ERROR_FAILURE; + + if (!(mState & (XML_HTTP_REQUEST_COMPLETED | + XML_HTTP_REQUEST_INTERACTIVE))) { + *aResult = JSVAL_NULL; + return NS_OK; + } + + PRInt32 dataLen = mResponseBody.Length(); + JSObject *obj = js_CreateArrayBuffer(cx, dataLen); + if (!obj) + return NS_ERROR_FAILURE; + + *aResult = OBJECT_TO_JSVAL(obj); + + if (dataLen > 0) { + js::ArrayBuffer *abuf = js::ArrayBuffer::fromJSObject(obj); + NS_ASSERTION(abuf, "What happened?"); + memcpy(abuf->data, mResponseBody.BeginReading(), dataLen); + } + + return NS_OK; +} + /* readonly attribute unsigned long status; */ NS_IMETHODIMP nsXMLHttpRequest::GetStatus(PRUint32 *aStatus) diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index 707adf6ac7aa..8b19f0979cfb 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -210,6 +210,8 @@ _TEST_FILES1 = test_bug5141.html \ file_XHR_pass3.txt^headers^ \ file_XHR_fail1.txt \ file_XHR_fail1.txt^headers^ \ + file_XHR_binary1.bin \ + file_XHR_binary1.bin^headers^ \ test_bug428847.html \ file_bug428847-1.xhtml \ file_bug428847-2.xhtml \ diff --git a/content/base/test/file_XHR_binary1.bin b/content/base/test/file_XHR_binary1.bin new file mode 100644 index 0000000000000000000000000000000000000000..39e527bfc33b57fd176d1f4b75829d44462de848 GIT binary patch literal 12 QcmZ4Wj)D0<5bOp505gpUga7~l literal 0 HcmV?d00001 diff --git a/content/base/test/file_XHR_binary1.bin^headers^ b/content/base/test/file_XHR_binary1.bin^headers^ new file mode 100644 index 000000000000..8e8c8d859e67 --- /dev/null +++ b/content/base/test/file_XHR_binary1.bin^headers^ @@ -0,0 +1 @@ +Content-Type: application/binary diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html index b136ca3dacd1..e727372957f6 100644 --- a/content/base/test/test_XHR.html +++ b/content/base/test/test_XHR.html @@ -59,6 +59,37 @@ for (i = 0; i < failFiles.length; ++i) { ok(1, "should have thrown or given incorrect result"); } } + +// test mozResponseArrayBuffer + +// with a simple text file +xhr = new XMLHttpRequest(); +xhr.open("GET", 'file_XHR_pass2.txt', false); +xhr.send(null); +is(xhr.status, 200, "wrong status"); +ab = xhr.mozResponseArrayBuffer; +ok(ab != null, "should have a non-null arraybuffer"); +is(ab.byteLength, "hello pass\n".length, "wrong arraybuffer byteLength"); + +u8v = new Uint8Array(ab); +ok(String.fromCharCode([u8v[0], u8v[1], u8v[2], u8v[3], u8v[4]]), "hello", "wrong values"); + +// with a binary file +xhr = new XMLHttpRequest(); +xhr.open("GET", 'file_XHR_binary1.bin', false); +xhr.send(null) +is(xhr.status, 200, "wrong status"); +ab = xhr.mozResponseArrayBuffer; +ok(ab != null, "should have a non-null arraybuffer"); +is(ab.byteLength, 12, "wrong arraybuffer byteLength"); + +u8v = new Uint8Array(ab); +i32v = new Int32Array(ab); +u32v = new Uint32Array(ab, 8); +ok(u8v[0] == 0xaa && u8v[1] == 0xee && u8v[2] == 0x00 && u8v[3] == 0x03, "wrong initial 4 bytes"); +is(i32v[1], -1, "wrong value, expected -1 (0xffffffff)"); +is(u32v[0], 0xbbbbbbbb, "wrong value, expected 0xbbbbbbbb"); + diff --git a/dom/src/threads/nsDOMWorkerXHR.cpp b/dom/src/threads/nsDOMWorkerXHR.cpp index 8f80a8b8b336..47ce41aa9d19 100644 --- a/dom/src/threads/nsDOMWorkerXHR.cpp +++ b/dom/src/threads/nsDOMWorkerXHR.cpp @@ -889,3 +889,10 @@ nsDOMWorkerXHR::SetWithCredentials(PRBool aWithCredentials) return NS_OK; } + +/* readonly attribute jsval (ArrayBuffer) mozResponseArrayBuffer; */ +NS_IMETHODIMP +nsDOMWorkerXHR::GetMozResponseArrayBuffer(jsval *aResult) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} From f6b87f6c8f0d71c82bbe2e4ca88b7c7f8cd45341 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Sat, 14 Aug 2010 10:52:51 -0700 Subject: [PATCH 025/109] b=576716; crash with ArrayBuffer test case; r=waldo --- content/base/src/nsContentUtils.cpp | 4 ++++ js/src/jstypedarray.cpp | 9 ++++++++- js/src/tests/js1_8_5/extensions/typedarray.js | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index bd8f7f915103..ec122fe49444 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -5789,6 +5789,10 @@ CloneSimpleValues(JSContext* cx, // ArrayBuffer objects. if (js_IsArrayBuffer(obj)) { js::ArrayBuffer* src = js::ArrayBuffer::fromJSObject(obj); + if (!src) { + return NS_ERROR_FAILURE; + } + JSObject* newBuffer = js_CreateArrayBuffer(cx, src->byteLength); if (!newBuffer) { return NS_ERROR_FAILURE; diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index aa58d7ff38b4..2bba1b31d335 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -946,6 +946,7 @@ class TypedArrayTemplate return false; } else if (js_IsTypedArray(other)) { TypedArray *tarray = TypedArray::fromJSObject(other); + JS_ASSERT(tarray); //printf ("SizeAndCount: %d %d\n", sizeof(NativeType), tarray->length); @@ -956,7 +957,13 @@ class TypedArrayTemplate } else if (other->getClass() == &ArrayBuffer::jsclass) { ArrayBuffer *abuf = ArrayBuffer::fromJSObject(other); - //printf ("buffer: %d %d %d\n", abuf->byteLength, abuf->byteLength / sizeof(NativeType), len * sizeof(NativeType) == abuf->byteLength); + if (!abuf) { + // the arg isn't a real arraybuffer + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, + JSMSG_TYPED_ARRAY_BAD_ARGS); + return false; + } + uint32 boffset = (byteOffsetInt < 0) ? 0 : uint32(byteOffsetInt); if (boffset > abuf->byteLength || boffset % sizeof(NativeType) != 0) { diff --git a/js/src/tests/js1_8_5/extensions/typedarray.js b/js/src/tests/js1_8_5/extensions/typedarray.js index 062d40096b5d..9ac4773499c9 100644 --- a/js/src/tests/js1_8_5/extensions/typedarray.js +++ b/js/src/tests/js1_8_5/extensions/typedarray.js @@ -223,6 +223,13 @@ function test() a = new Uint8Array(0x100); checkThrows(function() Uint32Array.prototype.slice.apply(a, [0, 0x100])); + checkThrows(function() new Int32Array(ArrayBuffer.prototype)); + checkThrows(function() new Int32Array(Int32Array.prototype)); + checkThrows(function() new Int32Array(Float64Array.prototype)); + checkThrows(function() new Int32Array(ArrayBuffer)); + checkThrows(function() new Int32Array(Int32Array)); + checkThrows(function() new Int32Array(Float64Array)); + print ("done"); reportCompare(0, TestFailCount, "typed array tests"); From d746975e962331477595b1f26894ff58d16fa188 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Sat, 14 Aug 2010 12:59:29 -0700 Subject: [PATCH 026/109] b=587304; fix some string usage in WebGL shader validation; r=jeff --- content/canvas/src/WebGLContextGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index b84fdc7f3528..59cfcc5b7901 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -2860,7 +2860,7 @@ WebGLContext::CompileShader(nsIWebGLShader *sobj) compiler = ShConstructCompiler(lang, EShSpecWebGL, &resources); - nsDependentCString src(shader->Source()); + nsPromiseFlatCString src(shader->Source()); const char *s = src.get(); if (!ShCompile(compiler, &s, 1, EShOptSimple, debugFlags)) { From 0e3219416ea327ba72c412766cda6d3be84945a5 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Sat, 14 Aug 2010 12:59:52 -0700 Subject: [PATCH 027/109] b=587304; fix no-op optimization back to what it really says; r=jrmuizel --- content/canvas/src/WebGLContextGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index 59cfcc5b7901..ef9b42ba4072 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -2863,7 +2863,7 @@ WebGLContext::CompileShader(nsIWebGLShader *sobj) nsPromiseFlatCString src(shader->Source()); const char *s = src.get(); - if (!ShCompile(compiler, &s, 1, EShOptSimple, debugFlags)) { + if (!ShCompile(compiler, &s, 1, EShOptNone, debugFlags)) { const char* info = ShGetInfoLog(compiler); if (info) { shader->SetTranslationFailure(nsDependentCString(info)); From 9a3a20add3591052f6e229b9e90a60e8fb3ed049 Mon Sep 17 00:00:00 2001 From: Chris Leary Date: Sat, 14 Aug 2010 16:46:37 -0700 Subject: [PATCH 028/109] [Bug 587183] TM merge broke android in Nitro. r=sayrer. --- js/src/Makefile.in | 12 +++++++++--- js/src/assembler/wtf/Platform.h | 6 +++--- js/src/yarr/yarr/RegexJIT.cpp | 4 ++-- js/src/yarr/yarr/RegexJIT.h | 4 ++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index c72097dd5b21..1daf59e71f56 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -831,12 +831,18 @@ endif # BEGIN kludges for the Nitro assembler # -INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr -# # Needed to "configure" it correctly. Unfortunately these # flags wind up being applied to all code in js/src, not just # the code in js/src/assembler. -CXXFLAGS += -DENABLE_ASSEMBLER=1 -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1 +CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 + +ifeq (android,$(TARGET_VENDOR)) +CXXFLAGS += -DWTF_PLATFORM_ANDROID=1 +else +CXXFLAGS += -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 +endif + +INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr # # END kludges for the Nitro assembler diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h index e19ccc4d4ae6..fedb84154943 100644 --- a/js/src/assembler/wtf/Platform.h +++ b/js/src/assembler/wtf/Platform.h @@ -874,10 +874,10 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #if !defined(ENABLE_YARR_JIT) /* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */ -#if WTF_CPU_X86 \ +#if (WTF_CPU_X86 \ || WTF_CPU_X86_64 \ || WTF_CPU_ARM_THUMB2 \ - || WTF_CPU_X86 + || WTF_CPU_X86) && !WTF_PLATFORM_ANDROID #define ENABLE_YARR_JIT 1 #else #define ENABLE_YARR_JIT 0 @@ -885,7 +885,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #endif /* !defined(ENABLE_YARR_JIT) */ -#if ENABLE_JIT || ENABLE_YARR_JIT +#if (ENABLE_JIT || ENABLE_YARR_JIT) && !WTF_PLATFORM_ANDROID #define ENABLE_ASSEMBLER 1 #endif /* Setting this flag prevents the assembler from using RWX memory; this may improve diff --git a/js/src/yarr/yarr/RegexJIT.cpp b/js/src/yarr/yarr/RegexJIT.cpp index 7160991e8285..c7e36f16071c 100644 --- a/js/src/yarr/yarr/RegexJIT.cpp +++ b/js/src/yarr/yarr/RegexJIT.cpp @@ -25,14 +25,14 @@ #include "RegexJIT.h" +#if ENABLE_ASSEMBLER + #include "assembler/assembler/LinkBuffer.h" #include "assembler/assembler/MacroAssembler.h" #include "RegexCompiler.h" #include "yarr/pcre/pcre.h" // temporary, remove when fallback is removed. -#if ENABLE_YARR_JIT - using namespace WTF; namespace JSC { namespace Yarr { diff --git a/js/src/yarr/yarr/RegexJIT.h b/js/src/yarr/yarr/RegexJIT.h index 775d92d1d7da..be8aa571ad32 100644 --- a/js/src/yarr/yarr/RegexJIT.h +++ b/js/src/yarr/yarr/RegexJIT.h @@ -26,6 +26,8 @@ #ifndef RegexJIT_h #define RegexJIT_h +#if ENABLE_ASSEMBLER + #include "assembler/assembler/MacroAssembler.h" #include "assembler/assembler/MacroAssemblerCodeRef.h" #include "assembler/jit/ExecutableAllocator.h" @@ -92,4 +94,6 @@ inline int executeRegex(JSContext *cx, RegexCodeBlock& jitObject, const UChar* i } } // namespace JSC::Yarr +#endif /* ENABLE_ASSEMBLER */ + #endif // RegexJIT_h From ce3734116be63fe6c7687f9f626ad2fe63fdc222 Mon Sep 17 00:00:00 2001 From: Robert Longson Date: Sat, 14 Aug 2010 20:42:18 -0400 Subject: [PATCH 029/109] Bug 584322 - feDisplacementMap seems to be adding an offset. r=roc, a=dbaron --- content/svg/content/src/nsSVGFilters.cpp | 17 ++++++++++------- content/svg/content/src/nsSVGFilters.h | 16 ++++++++-------- layout/reftests/svg/filters/reftest.list | 2 ++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index 4ace69078da2..075dae66354f 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -1068,7 +1068,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } virtual EnumAttributesInfo GetEnumInfo(); virtual StringAttributesInfo GetStringInfo(); @@ -1695,7 +1695,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } virtual StringAttributesInfo GetStringInfo(); @@ -2715,7 +2715,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRUint32, Image*) { return PR_TRUE; } + PRInt32, Image*) { return PR_TRUE; } virtual StringAttributesInfo GetStringInfo(); @@ -3898,7 +3898,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return !mBooleanAttributes[PRESERVEALPHA].GetAnimValue(); } @@ -5354,7 +5354,7 @@ private: protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRUint32, Image*) { return PR_TRUE; } + PRInt32, Image*) { return PR_TRUE; } virtual nsSVGPreserveAspectRatio *GetPreserveAspectRatio(); virtual StringAttributesInfo GetStringInfo(); @@ -5689,13 +5689,16 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRUint32 aInput, Image* aImage) { - if (aInput == 0 && aImage) + PRInt32 aInput, Image* aImage) { + if (aInput == 0) return aImage->mColorModel.mColorSpace == ColorModel::SRGB; return nsSVGFEDisplacementMapElementBase::OperatesOnSRGB(aInstance, aInput, aImage); } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32 aInput) { + return !(aInput == 1); + } virtual NumberAttributesInfo GetNumberInfo(); virtual EnumAttributesInfo GetEnumInfo(); diff --git a/content/svg/content/src/nsSVGFilters.h b/content/svg/content/src/nsSVGFilters.h index 01460fa82a89..0697d5a2c719 100644 --- a/content/svg/content/src/nsSVGFilters.h +++ b/content/svg/content/src/nsSVGFilters.h @@ -119,21 +119,21 @@ protected: public: ColorModel - GetInputColorModel(nsSVGFilterInstance* aInstance, PRUint32 aInputIndex, + GetInputColorModel(nsSVGFilterInstance* aInstance, PRInt32 aInputIndex, Image* aImage) { return ColorModel( (OperatesOnSRGB(aInstance, aInputIndex, aImage) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha() ? + (OperatesOnPremultipledAlpha(aInputIndex) ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } ColorModel GetOutputColorModel(nsSVGFilterInstance* aInstance) { return ColorModel( - (OperatesOnSRGB(aInstance, 0, nsnull) ? + (OperatesOnSRGB(aInstance, -1, nsnull) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha() ? + (OperatesOnPremultipledAlpha(-1) ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } @@ -199,13 +199,13 @@ public: operator nsISupports*() { return static_cast(this); } protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_TRUE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_TRUE; } - // Called either with aImage non-null, in which case this is + // Called either with aInputIndex >=0 in which case this is // testing whether the input 'aInputIndex' should be SRGB, or - // if aImage is null returns true if the output will be SRGB + // if aInputIndex is -1 returns true if the output will be SRGB virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRUint32 aInputIndex, Image* aImage) { + PRInt32 aInputIndex, Image* aImage) { nsIFrame* frame = GetPrimaryFrame(); if (!frame) return PR_FALSE; diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list index d20cc5345308..369628b465fe 100644 --- a/layout/reftests/svg/filters/reftest.list +++ b/layout/reftests/svg/filters/reftest.list @@ -72,6 +72,8 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704 == feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01-ref.svg == feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg +== feDisplacementMap-alpha-01.svg pass.svg + == feMorphology-radius-negative-01.svg pass.svg == feMorphology-radius-negative-02.svg pass.svg == feMorphology-radius-zero-01.svg pass.svg From beb120b6129858cc44737bd5acc6c9c21f77a274 Mon Sep 17 00:00:00 2001 From: Robert Sayre Date: Sat, 14 Aug 2010 21:27:43 -0400 Subject: [PATCH 030/109] Backed out changeset 7b475a00cd7c. Reftest bustage. --- content/svg/content/src/nsSVGFilters.cpp | 17 +++++++---------- content/svg/content/src/nsSVGFilters.h | 16 ++++++++-------- layout/reftests/svg/filters/reftest.list | 2 -- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index 075dae66354f..4ace69078da2 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -1068,7 +1068,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } virtual EnumAttributesInfo GetEnumInfo(); virtual StringAttributesInfo GetStringInfo(); @@ -1695,7 +1695,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } virtual StringAttributesInfo GetStringInfo(); @@ -2715,7 +2715,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRInt32, Image*) { return PR_TRUE; } + PRUint32, Image*) { return PR_TRUE; } virtual StringAttributesInfo GetStringInfo(); @@ -3898,7 +3898,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { + virtual PRBool OperatesOnPremultipledAlpha() { return !mBooleanAttributes[PRESERVEALPHA].GetAnimValue(); } @@ -5354,7 +5354,7 @@ private: protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRInt32, Image*) { return PR_TRUE; } + PRUint32, Image*) { return PR_TRUE; } virtual nsSVGPreserveAspectRatio *GetPreserveAspectRatio(); virtual StringAttributesInfo GetStringInfo(); @@ -5689,16 +5689,13 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRInt32 aInput, Image* aImage) { - if (aInput == 0) + PRUint32 aInput, Image* aImage) { + if (aInput == 0 && aImage) return aImage->mColorModel.mColorSpace == ColorModel::SRGB; return nsSVGFEDisplacementMapElementBase::OperatesOnSRGB(aInstance, aInput, aImage); } - virtual PRBool OperatesOnPremultipledAlpha(PRInt32 aInput) { - return !(aInput == 1); - } virtual NumberAttributesInfo GetNumberInfo(); virtual EnumAttributesInfo GetEnumInfo(); diff --git a/content/svg/content/src/nsSVGFilters.h b/content/svg/content/src/nsSVGFilters.h index 0697d5a2c719..01460fa82a89 100644 --- a/content/svg/content/src/nsSVGFilters.h +++ b/content/svg/content/src/nsSVGFilters.h @@ -119,21 +119,21 @@ protected: public: ColorModel - GetInputColorModel(nsSVGFilterInstance* aInstance, PRInt32 aInputIndex, + GetInputColorModel(nsSVGFilterInstance* aInstance, PRUint32 aInputIndex, Image* aImage) { return ColorModel( (OperatesOnSRGB(aInstance, aInputIndex, aImage) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha(aInputIndex) ? + (OperatesOnPremultipledAlpha() ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } ColorModel GetOutputColorModel(nsSVGFilterInstance* aInstance) { return ColorModel( - (OperatesOnSRGB(aInstance, -1, nsnull) ? + (OperatesOnSRGB(aInstance, 0, nsnull) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha(-1) ? + (OperatesOnPremultipledAlpha() ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } @@ -199,13 +199,13 @@ public: operator nsISupports*() { return static_cast(this); } protected: - virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_TRUE; } + virtual PRBool OperatesOnPremultipledAlpha() { return PR_TRUE; } - // Called either with aInputIndex >=0 in which case this is + // Called either with aImage non-null, in which case this is // testing whether the input 'aInputIndex' should be SRGB, or - // if aInputIndex is -1 returns true if the output will be SRGB + // if aImage is null returns true if the output will be SRGB virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRInt32 aInputIndex, Image* aImage) { + PRUint32 aInputIndex, Image* aImage) { nsIFrame* frame = GetPrimaryFrame(); if (!frame) return PR_FALSE; diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list index 369628b465fe..d20cc5345308 100644 --- a/layout/reftests/svg/filters/reftest.list +++ b/layout/reftests/svg/filters/reftest.list @@ -72,8 +72,6 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704 == feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01-ref.svg == feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg -== feDisplacementMap-alpha-01.svg pass.svg - == feMorphology-radius-negative-01.svg pass.svg == feMorphology-radius-negative-02.svg pass.svg == feMorphology-radius-zero-01.svg pass.svg From 1a778be8658221660807df078074d85c81e250f3 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Sat, 14 Aug 2010 19:51:15 -0700 Subject: [PATCH 031/109] Bug 587350 - Crash on startup from bug 580407 on Android, r=dougt --- embedding/android/GeckoAppShell.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java index b84322401b87..cf5e523b1bb1 100644 --- a/embedding/android/GeckoAppShell.java +++ b/embedding/android/GeckoAppShell.java @@ -132,9 +132,6 @@ class GeckoAppShell System.loadLibrary("ssl3"); System.loadLibrary("smime3"); - // JS - System.loadLibrary("mozjs"); - // XUL System.loadLibrary("xul"); From c71a1f8f2f676632e3c0334c70d8d0a1e303874e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 6 Aug 2010 21:20:53 -0400 Subject: [PATCH 032/109] Bug 575348 - e10s: Fennectrolysis crashes in cycle collection after geolocation test. r=dougt --HG-- extra : rebase_source : eb456a0f15ee2ac98d8b10d8cdd5a3af8ad6790c --- dom/src/geolocation/nsGeolocation.cpp | 4 ++-- dom/src/geolocation/nsGeolocationOOP.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index cde662ae2787..a4c9350e2565 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -1098,6 +1098,7 @@ nsGeolocationRequestProxy::Cancel() { NS_ASSERTION(mParent, "No parent for request"); unused << mozilla::dom::GeolocationRequestParent::Send__delete__(mParent, false); + mParent = nsnull; return NS_OK; } @@ -1106,6 +1107,7 @@ nsGeolocationRequestProxy::Allow() { NS_ASSERTION(mParent, "No parent for request"); unused << mozilla::dom::GeolocationRequestParent::Send__delete__(mParent, true); + mParent = nsnull; return NS_OK; } @@ -1118,13 +1120,11 @@ GeolocationRequestParent::GeolocationRequestParent(nsIDOMElement *element, const mURI = uri; mElement = element; - mProxy = nsnull; } GeolocationRequestParent::~GeolocationRequestParent() { MOZ_COUNT_DTOR(GeolocationRequestParent); - delete mProxy; } bool diff --git a/dom/src/geolocation/nsGeolocationOOP.h b/dom/src/geolocation/nsGeolocationOOP.h index 87205e34d16e..62d5e4974e39 100644 --- a/dom/src/geolocation/nsGeolocationOOP.h +++ b/dom/src/geolocation/nsGeolocationOOP.h @@ -60,13 +60,13 @@ class GeolocationRequestParent : public PGeolocationRequestParent nsCOMPtr mURI; nsCOMPtr mElement; - nsGeolocationRequestProxy *mProxy; + nsCOMPtr mProxy; private: virtual bool Recvprompt(); }; -} // namespace dom +} // namespace dom } // namespace mozilla class nsGeolocationRequestProxy : public nsIGeolocationRequest From df580caa2496dbc5fc8ebc729ca4ddbb55949b16 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Sat, 14 Aug 2010 21:58:07 -0700 Subject: [PATCH 033/109] Bug 587389 - dependentlibs.list not updated properly after bug 580407, r=khuey a=android build bustage --- xpcom/stub/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in index 06a9c1a60455..b248f903cdb3 100644 --- a/xpcom/stub/Makefile.in +++ b/xpcom/stub/Makefile.in @@ -89,9 +89,12 @@ DEPENDENT_LIBS_LIST += \ $(LIB_PREFIX)nss3$(DLL_SUFFIX) \ $(LIB_PREFIX)ssl3$(DLL_SUFFIX) \ $(LIB_PREFIX)smime3$(DLL_SUFFIX) \ - $(LIB_PREFIX)mozjs$(DLL_SUFFIX) \ $(NULL) +ifdef JS_SHARED_LIBRARY +DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX) +endif + ifndef MOZ_NATIVE_SQLITE ifeq ($(OS_TARGET),OS2) DEPENDENT_LIBS_LIST += mozsqlt3.dll From a7718f525406bf04c040a8bf7d9b8c3d7837a6d7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 6 Aug 2010 22:18:51 -0400 Subject: [PATCH 034/109] Bug 575346 - e10s: Geolocation access token isn't remembered. r=dougt --HG-- extra : rebase_source : a0f9cd69c4709fdac82b9f5fe3b9d956848b9dde --- dom/system/NetworkGeolocationProvider.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dom/system/NetworkGeolocationProvider.js b/dom/system/NetworkGeolocationProvider.js index 0e30996218a2..673d6b4afaac 100755 --- a/dom/system/NetworkGeolocationProvider.js +++ b/dom/system/NetworkGeolocationProvider.js @@ -369,8 +369,12 @@ WifiGeoPositionProvider.prototype = { // no match, lets cache LOG("New Access Token: " + newAccessToken + "\n" + accessTokenPrefName); - prefService.setIntPref(accessTokenPrefName + ".time", nowInSeconds()); - prefService.setCharPref(accessTokenPrefName, newAccessToken); + try { + prefService.setIntPref(accessTokenPrefName + ".time", nowInSeconds()); + prefService.setCharPref(accessTokenPrefName, newAccessToken); + } catch (x) { + // XXX temporary hack for bug 575346 to allow geolocation to function + } } } From a875ff3d6fe042dce95fe522360da9d29748e7cf Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 15 Aug 2010 11:01:49 +0200 Subject: [PATCH 035/109] Bug 582668 - gfxAlphaBoxBlur::Paint appears to pass garbage down through Cairo. r=roc --- gfx/thebes/gfxBlur.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gfx/thebes/gfxBlur.cpp b/gfx/thebes/gfxBlur.cpp index 7bc55605691f..5e5c5763d943 100644 --- a/gfx/thebes/gfxBlur.cpp +++ b/gfx/thebes/gfxBlur.cpp @@ -315,10 +315,17 @@ gfxAlphaBoxBlur::Paint(gfxContext* aDestinationCtx, const gfxPoint& offset) // no need to do all this if not blurring if (mBlurRadius.width != 0 || mBlurRadius.height != 0) { nsTArray tempAlphaDataBuf; - if (!tempAlphaDataBuf.SetLength(mImageSurface->GetDataSize())) - return; // OOM + PRSize szB = mImageSurface->GetDataSize(); + if (!tempAlphaDataBuf.SetLength(szB)) + return; // OOM unsigned char* tmpData = tempAlphaDataBuf.Elements(); + // .SetLength above doesn't initialise the new elements since + // they are unsigned chars and so have no default constructor. + // So we have to initialise them by hand. + // https://bugzilla.mozilla.org/show_bug.cgi?id=582668#c10 + memset(tmpData, 0, szB); + PRInt32 stride = mImageSurface->Stride(); PRInt32 rows = mImageSurface->Height(); From 8b767d39050bf242b6ddd9ed8326eca62ea84a5a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 15 Aug 2010 11:02:20 +0200 Subject: [PATCH 036/109] Bug 585877 - remove document.height / document.width. r=sicking, sr=jst --- content/html/document/src/nsHTMLDocument.cpp | 46 -------------------- dom/interfaces/html/nsIDOMNSHTMLDocument.idl | 4 +- js/src/xpconnect/src/dom_quickstubs.qsconf | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 7e4df2aa16f2..abb9c40e7025 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -2324,52 +2324,6 @@ nsHTMLDocument::GetNumFormsSynchronous() return mNumForms; } -nsresult -nsHTMLDocument::GetBodySize(PRInt32* aWidth, - PRInt32* aHeight) -{ - *aWidth = *aHeight = 0; - - FlushPendingNotifications(Flush_Layout); - - // Find the element: this is what we'll want to use for the - // document's width and height values. - Element* body = GetBodyElement(); - if (!body) { - return NS_OK; - } - - // Now grab its frame - nsIFrame* frame = body->GetPrimaryFrame(); - if (!frame) - return NS_OK; - - nsSize size = frame->GetSize(); - - *aWidth = nsPresContext::AppUnitsToIntCSSPixels(size.width); - *aHeight = nsPresContext::AppUnitsToIntCSSPixels(size.height); - - return NS_OK; -} - -NS_IMETHODIMP -nsHTMLDocument::GetWidth(PRInt32* aWidth) -{ - NS_ENSURE_ARG_POINTER(aWidth); - - PRInt32 height; - return GetBodySize(aWidth, &height); -} - -NS_IMETHODIMP -nsHTMLDocument::GetHeight(PRInt32* aHeight) -{ - NS_ENSURE_ARG_POINTER(aHeight); - - PRInt32 width; - return GetBodySize(&width, aHeight); -} - NS_IMETHODIMP nsHTMLDocument::GetAlinkColor(nsAString& aAlinkColor) { diff --git a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl index 845a45af75ad..24ca60fd88b1 100644 --- a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl +++ b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl @@ -39,11 +39,9 @@ #include "domstubs.idl" -[scriptable, uuid(95cd5ad4-ae8a-4f0e-b168-35e03d5e0b9a)] +[scriptable, uuid(386e9eee-1f06-40a6-a1a7-ed986646b793)] interface nsIDOMNSHTMLDocument : nsISupports { - readonly attribute long width; - readonly attribute long height; attribute DOMString alinkColor; attribute DOMString linkColor; attribute DOMString vlinkColor; diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf index d398f2b8028d..0b6cc3c7b6e8 100644 --- a/js/src/xpconnect/src/dom_quickstubs.qsconf +++ b/js/src/xpconnect/src/dom_quickstubs.qsconf @@ -330,8 +330,6 @@ members = [ 'nsIDOMHTMLCanvasElement.height', 'nsIDOMHTMLCanvasElement.getContext', 'nsIDOMHTMLCanvasElement.toDataURL', - 'nsIDOMNSHTMLDocument.width', - 'nsIDOMNSHTMLDocument.height', 'nsIDOMNSHTMLDocument.domain', 'nsIDOMNSHTMLDocument.getSelection', 'nsIDOMNSHTMLDocument.designMode', From 4e31f66933ffa690f57a4b8f1170877aa5eb340e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Str=C3=A1nsk=C3=BD?= Date: Sun, 15 Aug 2010 11:10:15 +0200 Subject: [PATCH 037/109] Bug 574354 - Disable OOP for plugins wrapped by nspluginwrapper. r=josh --- modules/plugin/base/src/nsNPAPIPlugin.cpp | 57 +++++++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp index d0e448f21a6c..b80d4e9997f0 100644 --- a/modules/plugin/base/src/nsNPAPIPlugin.cpp +++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp @@ -76,6 +76,7 @@ #include "nsIScriptContext.h" #include "nsDOMJSUtils.h" #include "nsIPrincipal.h" +#include "nsWildCard.h" #include "nsIXPConnect.h" @@ -365,22 +366,58 @@ RunPluginOOP(const char* aFilePath, const nsPluginTag *aPluginTag) // Get per-library whitelist/blacklist pref string // "dom.ipc.plugins.enabled.filename.dll" and fall back to the default value // of "dom.ipc.plugins.enabled" + // The "filename.dll" part can contain shell wildcard pattern - nsCAutoString pluginLibPref(aFilePath); - PRInt32 slashPos = pluginLibPref.RFindCharInSet("/\\"); + nsCAutoString prefFile(aFilePath); + PRInt32 slashPos = prefFile.RFindCharInSet("/\\"); if (kNotFound == slashPos) return PR_FALSE; - pluginLibPref.Cut(0, slashPos + 1); - ToLowerCase(pluginLibPref); - pluginLibPref.Insert("dom.ipc.plugins.enabled.", 0); + prefFile.Cut(0, slashPos + 1); + ToLowerCase(prefFile); + + nsCAutoString prefGroupKey("dom.ipc.plugins.enabled."); + + PRUint32 prefCount; + char** prefNames; + nsresult rv = prefs->GetChildList(prefGroupKey.get(), + &prefCount, &prefNames); PRBool oopPluginsEnabled = PR_FALSE; - if (NS_SUCCEEDED(prefs->GetBoolPref(pluginLibPref.get(), - &oopPluginsEnabled))) - return oopPluginsEnabled; + PRBool prefSet = PR_FALSE; + + if (NS_SUCCEEDED(rv) && prefCount > 0) { + PRUint32 prefixLength = prefGroupKey.Length(); + for (PRUint32 currentPref = 0; currentPref < prefCount; currentPref++) { + // Get the mask + const char* maskStart = prefNames[currentPref] + prefixLength; + PRBool match = PR_FALSE; + + int valid = NS_WildCardValid(maskStart); + if (valid == INVALID_SXP) { + continue; + } + else if(valid == NON_SXP) { + // mask is not a shell pattern, compare it as normal string + match = (strcmp(prefFile.get(), maskStart) == 0); + } + else { + match = (NS_WildCardMatch(prefFile.get(), maskStart, 0) == MATCH); + } + + if (match && NS_SUCCEEDED(prefs->GetBoolPref(prefNames[currentPref], + &oopPluginsEnabled))) { + prefSet = PR_TRUE; + break; + } + } + NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(prefCount, prefNames); + } + + if (!prefSet) { + oopPluginsEnabled = PR_FALSE; + prefs->GetBoolPref("dom.ipc.plugins.enabled", &oopPluginsEnabled); + } - oopPluginsEnabled = PR_FALSE; - prefs->GetBoolPref("dom.ipc.plugins.enabled", &oopPluginsEnabled); return oopPluginsEnabled; } From 72ea9444fc629c9afba9f2efb5d75382a2789a74 Mon Sep 17 00:00:00 2001 From: Alexander Surkov Date: Sun, 15 Aug 2010 20:28:49 +0900 Subject: [PATCH 038/109] Bug 576777 - provide quick access to link index, r=marcoz, davidb, sr=neil --- accessible/src/base/AccCollector.cpp | 33 ++++- accessible/src/base/AccCollector.h | 29 +++- accessible/src/base/nsAccessible.cpp | 75 +++++++++- accessible/src/base/nsAccessible.h | 30 +++- accessible/src/base/nsOuterDocAccessible.cpp | 2 +- accessible/src/html/nsHyperTextAccessible.cpp | 129 ++++++++---------- accessible/src/html/nsHyperTextAccessible.h | 65 +++++---- accessible/src/msaa/CAccessibleHypertext.cpp | 9 +- .../tests/mochitest/attributes/test_text.html | 8 +- 9 files changed, 262 insertions(+), 118 deletions(-) diff --git a/accessible/src/base/AccCollector.cpp b/accessible/src/base/AccCollector.cpp index 9220e806a3e2..88362f567c63 100644 --- a/accessible/src/base/AccCollector.cpp +++ b/accessible/src/base/AccCollector.cpp @@ -92,7 +92,7 @@ AccCollector::EnsureNGetObject(PRUint32 aIndex) if (!mFilterFunc(child)) continue; - mObjects.AppendElement(child); + AppendObject(child); if (mObjects.Length() - 1 == aIndex) return mObjects[aIndex]; } @@ -109,10 +109,39 @@ AccCollector::EnsureNGetIndex(nsAccessible* aAccessible) if (!mFilterFunc(child)) continue; - mObjects.AppendElement(child); + AppendObject(child); if (child == aAccessible) return mObjects.Length() - 1; } return -1; } + +void +AccCollector::AppendObject(nsAccessible* aAccessible) +{ + mObjects.AppendElement(aAccessible); +} + +//////////////////////////////////////////////////////////////////////////////// +// EmbeddedObjCollector +//////////////////////////////////////////////////////////////////////////////// + +PRInt32 +EmbeddedObjCollector::GetIndexAt(nsAccessible *aAccessible) +{ + if (aAccessible->mParent != mRoot) + return -1; + + if (aAccessible->mIndexOfEmbeddedChild != -1) + return aAccessible->mIndexOfEmbeddedChild; + + return mFilterFunc(aAccessible) ? EnsureNGetIndex(aAccessible) : -1; +} + +void +EmbeddedObjCollector::AppendObject(nsAccessible* aAccessible) +{ + aAccessible->mIndexOfEmbeddedChild = mObjects.Length(); + mObjects.AppendElement(aAccessible); +} diff --git a/accessible/src/base/AccCollector.h b/accessible/src/base/AccCollector.h index 88aefd8f4822..85beeb193e95 100644 --- a/accessible/src/base/AccCollector.h +++ b/accessible/src/base/AccCollector.h @@ -66,7 +66,7 @@ public: /** * Return index of the given accessible within the collection. */ - PRInt32 GetIndexAt(nsAccessible* aAccessible); + virtual PRInt32 GetIndexAt(nsAccessible* aAccessible); protected: /** @@ -79,6 +79,11 @@ protected: */ PRInt32 EnsureNGetIndex(nsAccessible* aAccessible); + /** + * Append the object to collection. + */ + virtual void AppendObject(nsAccessible* aAccessible); + filters::FilterFuncPtr mFilterFunc; nsAccessible* mRoot; PRInt32 mRootChildIdx; @@ -91,4 +96,26 @@ private: AccCollector& operator =(const AccCollector&); }; +/** + * Collect embedded objects. Provide quick access to accessible by index and + * vice versa. + */ +class EmbeddedObjCollector : public AccCollector +{ +public: + virtual ~EmbeddedObjCollector() { }; + +public: + virtual PRInt32 GetIndexAt(nsAccessible* aAccessible); + +protected: + // Make sure it's used by nsAccessible class only. + EmbeddedObjCollector(nsAccessible* aRoot) : + AccCollector(aRoot, filters::GetEmbeddedObject) { } + + virtual void AppendObject(nsAccessible* aAccessible); + + friend class nsAccessible; +}; + #endif diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 83f4ca44485d..a1bf9f6a17ec 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -193,8 +193,8 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsAccessible::nsAccessible(nsIContent *aContent, nsIWeakReference *aShell) : nsAccessNodeWrap(aContent, aShell), - mParent(nsnull), mAreChildrenInitialized(PR_FALSE), mIndexInParent(-1), - mRoleMapEntry(nsnull) + mParent(nsnull), mIndexInParent(-1), mChildrenFlags(eChildrenUninitialized), + mIndexOfEmbeddedChild(-1), mRoleMapEntry(nsnull) { #ifdef NS_DEBUG_X { @@ -2751,6 +2751,7 @@ nsAccessible::UnbindFromParent() { mParent = nsnull; mIndexInParent = -1; + mIndexOfEmbeddedChild = -1; mGroupInfo = nsnull; } @@ -2763,8 +2764,9 @@ nsAccessible::InvalidateChildren() child->UnbindFromParent(); } + mEmbeddedObjCollector = nsnull; mChildren.Clear(); - mAreChildrenInitialized = PR_FALSE; + mChildrenFlags = eChildrenUninitialized; } PRBool @@ -2773,6 +2775,9 @@ nsAccessible::AppendChild(nsAccessible* aChild) if (!mChildren.AppendElement(aChild)) return PR_FALSE; + if (nsAccUtils::IsText(aChild)) + mChildrenFlags = eMixedChildren; + aChild->BindToParent(this, mChildren.Length() - 1); return PR_TRUE; } @@ -2786,6 +2791,11 @@ nsAccessible::InsertChildAt(PRUint32 aIndex, nsAccessible* aChild) for (PRUint32 idx = aIndex + 1; idx < mChildren.Length(); idx++) mChildren[idx]->mIndexInParent++; + if (nsAccUtils::IsText(aChild)) + mChildrenFlags = eMixedChildren; + + mEmbeddedObjCollector = nsnull; + aChild->BindToParent(this, aIndex); return PR_TRUE; } @@ -2800,6 +2810,8 @@ nsAccessible::RemoveChild(nsAccessible* aChild) mChildren[idx]->mIndexInParent--; mChildren.RemoveElementAt(aChild->mIndexInParent); + mEmbeddedObjCollector = nsnull; + aChild->UnbindFromParent(); return PR_TRUE; } @@ -2877,6 +2889,53 @@ nsAccessible::GetIndexInParent() return mIndexInParent; } +PRInt32 +nsAccessible::GetEmbeddedChildCount() +{ + if (EnsureChildren()) + return -1; + + if (mChildrenFlags == eMixedChildren) { + if (!mEmbeddedObjCollector) + mEmbeddedObjCollector = new EmbeddedObjCollector(this); + return mEmbeddedObjCollector ? mEmbeddedObjCollector->Count() : -1; + } + + return GetChildCount(); +} + +nsAccessible* +nsAccessible::GetEmbeddedChildAt(PRUint32 aIndex) +{ + if (EnsureChildren()) + return nsnull; + + if (mChildrenFlags == eMixedChildren) { + if (!mEmbeddedObjCollector) + mEmbeddedObjCollector = new EmbeddedObjCollector(this); + return mEmbeddedObjCollector ? + mEmbeddedObjCollector->GetAccessibleAt(aIndex) : nsnull; + } + + return GetChildAt(aIndex); +} + +PRInt32 +nsAccessible::GetIndexOfEmbeddedChild(nsAccessible* aChild) +{ + if (EnsureChildren()) + return -1; + + if (mChildrenFlags == eMixedChildren) { + if (!mEmbeddedObjCollector) + mEmbeddedObjCollector = new EmbeddedObjCollector(this); + return mEmbeddedObjCollector ? + mEmbeddedObjCollector->GetIndexAt(aChild) : -1; + } + + return GetIndexOf(aChild); +} + #ifdef DEBUG PRBool nsAccessible::IsInCache() @@ -2912,7 +2971,8 @@ nsAccessible::TestChildCache(nsAccessible *aCachedChild) #ifdef DEBUG PRInt32 childCount = mChildren.Length(); if (childCount == 0) { - NS_ASSERTION(!mAreChildrenInitialized, "No children but initialized!"); + NS_ASSERTION(mChildrenFlags == eChildrenUninitialized, + "No children but initialized!"); return; } @@ -2933,14 +2993,15 @@ PRBool nsAccessible::EnsureChildren() { if (IsDefunct()) { - mAreChildrenInitialized = PR_FALSE; + mChildrenFlags = eChildrenUninitialized; return PR_TRUE; } - if (mAreChildrenInitialized) + if (mChildrenFlags != eChildrenUninitialized) return PR_FALSE; - mAreChildrenInitialized = PR_TRUE; // Prevent reentry + // State is embedded children until text leaf accessible is appended. + mChildrenFlags = eEmbeddedChildren; // Prevent reentry CacheChildren(); return PR_FALSE; diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h index 701c3f7b96d4..aae4a8aa05df 100644 --- a/accessible/src/base/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -53,6 +53,7 @@ #include "nsRefPtrHashtable.h" class AccGroupInfo; +class EmbeddedObjCollector; class nsAccessible; class nsAccEvent; struct nsRoleMapEntry; @@ -256,6 +257,21 @@ public: */ PRBool HasChildren() { return !!GetChildAt(0); } + /** + * Return embedded accessible children count. + */ + PRInt32 GetEmbeddedChildCount(); + + /** + * Return embedded accessible child at the given index. + */ + nsAccessible* GetEmbeddedChildAt(PRUint32 aIndex); + + /** + * Return index of the given embedded accessible child. + */ + PRInt32 GetIndexOfEmbeddedChild(nsAccessible* aChild); + /** * Return cached accessible of parent-child relatives. */ @@ -271,7 +287,7 @@ public: mParent->mChildren.SafeElementAt(mIndexInParent - 1, nsnull).get() : nsnull; } PRUint32 GetCachedChildCount() const { return mChildren.Length(); } - PRBool AreChildrenCached() const { return mAreChildrenInitialized; } + PRBool AreChildrenCached() const { return mChildrenFlags != eChildrenUninitialized; } #ifdef DEBUG /** @@ -443,9 +459,19 @@ protected: // Data Members nsRefPtr mParent; nsTArray > mChildren; - PRBool mAreChildrenInitialized; PRInt32 mIndexInParent; + enum ChildrenFlags { + eChildrenUninitialized = 0x00, + eMixedChildren = 0x01, + eEmbeddedChildren = 0x02 + }; + ChildrenFlags mChildrenFlags; + + nsAutoPtr mEmbeddedObjCollector; + PRInt32 mIndexOfEmbeddedChild; + friend class EmbeddedObjCollector; + nsAutoPtr mGroupInfo; friend class AccGroupInfo; diff --git a/accessible/src/base/nsOuterDocAccessible.cpp b/accessible/src/base/nsOuterDocAccessible.cpp index ec932886ad33..0e4c240f3be1 100644 --- a/accessible/src/base/nsOuterDocAccessible.cpp +++ b/accessible/src/base/nsOuterDocAccessible.cpp @@ -191,7 +191,7 @@ nsOuterDocAccessible::InvalidateChildren() // then allow nsAccDocManager to handle this case since the document // accessible is created and appended as a child when it's requested. - mAreChildrenInitialized = PR_FALSE; + mChildrenFlags = eChildrenUninitialized; } PRBool diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp index 25b2dae6c244..6ba2feb8a26e 100644 --- a/accessible/src/html/nsHyperTextAccessible.cpp +++ b/accessible/src/html/nsHyperTextAccessible.cpp @@ -1091,11 +1091,8 @@ nsHyperTextAccessible::GetTextAttributes(PRBool aIncludeDefAttrs, NS_ADDREF(*aAttributes = attributes); } - PRInt32 offsetAccIdx = -1; - PRInt32 startOffset = 0, endOffset = 0; - nsAccessible *offsetAcc = GetAccessibleAtOffset(aOffset, &offsetAccIdx, - &startOffset, &endOffset); - if (!offsetAcc) { + nsAccessible* accAtOffset = GetChildAtOffset(aOffset); + if (!accAtOffset) { // Offset 0 is correct offset when accessible has empty text. Include // default attributes if they were requested, otherwise return empty set. if (aOffset == 0) { @@ -1108,17 +1105,21 @@ nsHyperTextAccessible::GetTextAttributes(PRBool aIncludeDefAttrs, return NS_ERROR_INVALID_ARG; } + PRInt32 accAtOffsetIdx = accAtOffset->GetIndexInParent(); + PRInt32 startOffset = GetChildOffset(accAtOffsetIdx); + PRInt32 endOffset = GetChildOffset(accAtOffsetIdx + 1); PRInt32 offsetInAcc = aOffset - startOffset; - nsTextAttrsMgr textAttrsMgr(this, aIncludeDefAttrs, offsetAcc, offsetAccIdx); + nsTextAttrsMgr textAttrsMgr(this, aIncludeDefAttrs, accAtOffset, + accAtOffsetIdx); nsresult rv = textAttrsMgr.GetAttributes(*aAttributes, &startOffset, &endOffset); NS_ENSURE_SUCCESS(rv, rv); // Compute spelling attributes on text accessible only. - nsIFrame *offsetFrame = offsetAcc->GetFrame(); + nsIFrame *offsetFrame = accAtOffset->GetFrame(); if (offsetFrame && offsetFrame->GetType() == nsAccessibilityAtoms::textFrame) { - nsCOMPtr node = offsetAcc->GetDOMNode(); + nsCOMPtr node = accAtOffset->GetDOMNode(); PRInt32 nodeOffset = 0; nsresult rv = RenderedToContentOffset(offsetFrame, offsetInAcc, @@ -1369,7 +1370,7 @@ nsHyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink, } NS_IMETHODIMP -nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aCharIndex, +nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset, PRInt32* aLinkIndex) { NS_ENSURE_ARG_POINTER(aLinkIndex); @@ -1378,29 +1379,7 @@ nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aCharIndex, if (IsDefunct()) return NS_ERROR_FAILURE; - PRInt32 characterCount = 0; - PRInt32 linkIndex = 0; - - PRInt32 childCount = GetChildCount(); - for (PRInt32 childIdx = 0; - childIdx < childCount && characterCount <= aCharIndex; childIdx++) { - nsAccessible *childAcc = mChildren[childIdx]; - - PRUint32 role = nsAccUtils::Role(childAcc); - if (role == nsIAccessibleRole::ROLE_TEXT_LEAF || - role == nsIAccessibleRole::ROLE_STATICTEXT) { - characterCount += nsAccUtils::TextLength(childAcc); - } - else { - if (characterCount ++ == aCharIndex) { - *aLinkIndex = linkIndex; - break; - } - if (role != nsIAccessibleRole::ROLE_WHITESPACE) { - ++ linkIndex; - } - } - } + *aLinkIndex = GetLinkIndexAtOffset(aOffset); return NS_OK; } @@ -2043,7 +2022,6 @@ nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex, void nsHyperTextAccessible::InvalidateChildren() { - mLinks = nsnull; mOffsets.Clear(); nsAccessibleWrap::InvalidateChildren(); @@ -2110,70 +2088,77 @@ nsresult nsHyperTextAccessible::RenderedToContentOffset(nsIFrame *aFrame, PRUint // nsHyperTextAccessible public PRInt32 -nsHyperTextAccessible::GetChildOffset(nsAccessible* aChild, +nsHyperTextAccessible::GetChildOffset(PRUint32 aChildIndex, PRBool aInvalidateAfter) { - PRInt32 index = GetIndexOf(aChild); - if (index == -1 || index == 0) - return index; + if (aChildIndex == 0) + return aChildIndex; - PRInt32 count = mOffsets.Length() - index; + PRInt32 count = mOffsets.Length() - aChildIndex; if (count > 0) { if (aInvalidateAfter) - mOffsets.RemoveElementsAt(index, count); + mOffsets.RemoveElementsAt(aChildIndex, count); - return mOffsets[index - 1]; + return mOffsets[aChildIndex - 1]; } PRUint32 lastOffset = mOffsets.IsEmpty() ? 0 : mOffsets[mOffsets.Length() - 1]; EnsureChildren(); - while (mOffsets.Length() < index) { + while (mOffsets.Length() < aChildIndex) { nsAccessible* child = mChildren[mOffsets.Length()]; lastOffset += nsAccUtils::TextLength(child); mOffsets.AppendElement(lastOffset); } - return mOffsets[index - 1]; -} -//////////////////////////////////////////////////////////////////////////////// -// nsHyperTextAccessible protected - -AccCollector* -nsHyperTextAccessible::GetLinkCollector() -{ - if (IsDefunct()) - return nsnull; - - if (!mLinks) - mLinks = new AccCollector(this, filters::GetEmbeddedObject); - return mLinks; + return mOffsets[aChildIndex - 1]; } -nsAccessible * -nsHyperTextAccessible::GetAccessibleAtOffset(PRInt32 aOffset, PRInt32 *aAccIdx, - PRInt32 *aStartOffset, - PRInt32 *aEndOffset) +PRInt32 +nsHyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset) { - PRInt32 startOffset = 0, endOffset = 0; - PRInt32 childCount = GetChildCount(); - for (PRInt32 childIdx = 0; childIdx < childCount; childIdx++) { - nsAccessible *child = mChildren[childIdx]; - endOffset += nsAccUtils::TextLength(child); - if (endOffset > aOffset) { - *aStartOffset = startOffset; - *aEndOffset = endOffset; - *aAccIdx = childIdx; - return child; + PRUint32 lastOffset = 0; + PRUint32 offsetCount = mOffsets.Length(); + if (offsetCount > 0) { + lastOffset = mOffsets[offsetCount - 1]; + if (aOffset < lastOffset) { + PRUint32 low = 0, high = offsetCount; + while (high > low) { + PRUint32 mid = (high + low) >> 1; + if (mOffsets[mid] == aOffset) + return mid < offsetCount - 1 ? mid + 1 : mid; + + if (mOffsets[mid] < aOffset) + low = mid + 1; + else + high = mid; + } + if (high == offsetCount) + return -1; + + return low < offsetCount - 1 ? low + 1 : low; } - - startOffset = endOffset; } - return nsnull; + PRUint32 childCount = GetChildCount(); + while (mOffsets.Length() < childCount) { + nsAccessible* child = GetChildAt(mOffsets.Length()); + lastOffset += nsAccUtils::TextLength(child); + mOffsets.AppendElement(lastOffset); + if (aOffset < lastOffset) + return mOffsets.Length() - 1; + } + + if (aOffset == lastOffset) + return mOffsets.Length() - 1; + + return -1; } +//////////////////////////////////////////////////////////////////////////////// +// nsHyperTextAccessible protected + nsresult nsHyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame *aFrame, PRInt32 aOffset, diff --git a/accessible/src/html/nsHyperTextAccessible.h b/accessible/src/html/nsHyperTextAccessible.h index a072ac57dafc..2445cc863810 100644 --- a/accessible/src/html/nsHyperTextAccessible.h +++ b/accessible/src/html/nsHyperTextAccessible.h @@ -106,8 +106,7 @@ public: */ inline PRUint32 GetLinkCount() { - AccCollector* links = GetLinkCollector(); - return links ? links->Count() : 0; + return GetEmbeddedChildCount(); } /** @@ -115,8 +114,7 @@ public: */ inline nsAccessible* GetLinkAt(PRUint32 aIndex) { - AccCollector* links = GetLinkCollector(); - return links ? links->GetAccessibleAt(aIndex) : nsnull; + return GetEmbeddedChildAt(aIndex); } /** @@ -124,8 +122,16 @@ public: */ inline PRInt32 GetLinkIndex(nsAccessible* aLink) { - AccCollector* links = GetLinkCollector(); - return links ? links->GetIndexAt(aLink) : -1; + return GetIndexOfEmbeddedChild(aLink); + } + + /** + * Return link accessible at the given text offset. + */ + inline PRInt32 GetLinkIndexAtOffset(PRUint32 aOffset) + { + nsAccessible* child = GetChildAtOffset(aOffset); + return GetLinkIndex(child); } /** @@ -187,23 +193,46 @@ public: PRInt32 *aEndOffset); /** - * Return text offset the given child accessible of hypertext accessible. + * Return text offset of the given child accessible within hypertext + * accessible. * * @param aChild [in] accessible child to get text offset for * @param aInvalidateAfter [in, optional] indicates whether invalidate * cached offsets for next siblings of the child */ PRInt32 GetChildOffset(nsAccessible* aChild, + PRBool aInvalidateAfter = PR_FALSE) + { + PRInt32 index = GetIndexOf(aChild); + return index == -1 ? -1 : GetChildOffset(index, aInvalidateAfter); + } + + /** + * Return text offset for the child accessible index. + */ + PRInt32 GetChildOffset(PRUint32 aChildIndex, PRBool aInvalidateAfter = PR_FALSE); + /** + * Return child accessible at the given text offset. + * + * @param aOffset [in] the given text offset + */ + PRInt32 GetChildIndexAtOffset(PRUint32 aOffset); + + /** + * Return child accessible at the given text offset. + * + * @param aOffset [in] the given text offset + */ + nsAccessible* GetChildAtOffset(PRUint32 aOffset) + { + return GetChildAt(GetChildIndexAtOffset(aOffset)); + } + protected: // nsHyperTextAccessible - /** - * Return link collection, create it if necessary. - */ - AccCollector* GetLinkCollector(); - /* * This does the work for nsIAccessibleText::GetText[At|Before|After]Offset * @param aType, eGetBefore, eGetAt, eGetAfter @@ -299,18 +328,6 @@ protected: */ PRInt32 GetCaretLineNumber(); - /** - * Return an accessible at the given hypertext offset. - * - * @param aOffset [out] the given hypertext offset - * @param aAccIdx [out] child index of returned accessible - * @param aStartOffset [out] start hypertext offset of returned accessible - * @param aEndOffset [out] end hypertext offset of returned accessible - */ - nsAccessible *GetAccessibleAtOffset(PRInt32 aOffset, PRInt32 *aAccIdx, - PRInt32 *aStartOffset, - PRInt32 *aEndOffset); - // Helpers nsresult GetDOMPointByFrameOffset(nsIFrame *aFrame, PRInt32 aOffset, nsIAccessible *aAccessible, diff --git a/accessible/src/msaa/CAccessibleHypertext.cpp b/accessible/src/msaa/CAccessibleHypertext.cpp index 55fced183495..d96b605f203d 100644 --- a/accessible/src/msaa/CAccessibleHypertext.cpp +++ b/accessible/src/msaa/CAccessibleHypertext.cpp @@ -117,16 +117,11 @@ CAccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long *aHyperlinkIndex) __try { *aHyperlinkIndex = 0; - nsCOMPtr hyperAcc(do_QueryObject(this)); + nsRefPtr hyperAcc(do_QueryObject(this)); if (!hyperAcc) return E_FAIL; - PRInt32 index = 0; - nsresult rv = hyperAcc->GetLinkIndexAtOffset(aCharIndex, &index); - if (NS_FAILED(rv)) - return GetHRESULT(rv); - - *aHyperlinkIndex = index; + *aHyperlinkIndex = hyperAcc->GetLinkIndexAtOffset(aCharIndex); return S_OK; } __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { } diff --git a/accessible/tests/mochitest/attributes/test_text.html b/accessible/tests/mochitest/attributes/test_text.html index ec39e8211569..34865978e0bd 100644 --- a/accessible/tests/mochitest/attributes/test_text.html +++ b/accessible/tests/mochitest/attributes/test_text.html @@ -428,8 +428,12 @@ ID = "area14"; defAttrs = buildDefaultTextAttrs(ID, kInputFontSize); - attrs = { }; - testTextAttrs(ID, 0, attrs, defAttrs, 0, 0); + + // XXX: While we expose text leaf accessibles for placeholder we grab its + // style, bug 545817. + // attrs = { color: "rgb(109, 109, 109)" }; + //testTextAttrs(ID, 0, attrs, defAttrs, 0, 0); + todo(false, "enable commented tests when bug 545817 is fixed"); ////////////////////////////////////////////////////////////////////////// // area15, embed char tests, "*plain*plain**bold*bold*" From 696aab436799381358a82ad5ab87074dbf0acf76 Mon Sep 17 00:00:00 2001 From: Alexander Surkov Date: Sun, 15 Aug 2010 20:29:02 +0900 Subject: [PATCH 039/109] Bug 420993 - dead accessible objects should not be present in the hierarchy, r=davidb --- accessible/src/atk/nsAccessibleWrap.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp index 1c1ad02dcc17..e6bda767f6a4 100644 --- a/accessible/src/atk/nsAccessibleWrap.cpp +++ b/accessible/src/atk/nsAccessibleWrap.cpp @@ -848,9 +848,8 @@ getParentCB(AtkObject *aAtkObj) return nsnull; } - nsCOMPtr accParent; - nsresult rv = accWrap->GetParent(getter_AddRefs(accParent)); - if (NS_FAILED(rv) || !accParent) + nsAccessible* accParent = accWrap->GetParent(); + if (!accParent) return nsnull; AtkObject *parent = nsAccessibleWrap::GetAtkObject(accParent); @@ -868,11 +867,7 @@ getChildCountCB(AtkObject *aAtkObj) return 0; } - // Links within hypertext accessible play role of accessible children in - // ATK since every embedded object is a link and text accessibles are - // ignored. - nsRefPtr hyperText = do_QueryObject(accWrap); - return hyperText ? hyperText->GetLinkCount() : accWrap->GetChildCount(); + return accWrap->GetEmbeddedChildCount(); } AtkObject * @@ -888,12 +883,7 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex) return nsnull; } - // Links within hypertext accessible play role of accessible children in - // ATK since every embedded object is a link and text accessibles are - // ignored. - nsRefPtr hyperText = do_QueryObject(accWrap); - nsAccessible* accChild = hyperText ? hyperText->GetLinkAt(aChildIndex) : - accWrap->GetChildAt(aChildIndex); + nsAccessible* accChild = accWrap->GetEmbeddedChildAt(aChildIndex); if (!accChild) return nsnull; @@ -924,12 +914,7 @@ getIndexInParentCB(AtkObject *aAtkObj) return -1; // No parent } - // Links within hypertext accessible play role of accessible children in - // ATK since every embedded object is a link and text accessibles are - // ignored. - nsRefPtr hyperTextParent(do_QueryObject(parent)); - return hyperTextParent ? - hyperTextParent->GetLinkIndex(accWrap) : accWrap->GetIndexInParent(); + return parent->GetIndexOfEmbeddedChild(accWrap); } static void TranslateStates(PRUint32 aState, const AtkStateMap *aStateMap, From f37452cd9f788b55bb93f4def3dc0b699a9d2c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Sun, 15 Aug 2010 14:29:11 +0200 Subject: [PATCH 040/109] Backed out changeset 05dde680ade2 as per bug 575870 comment 71 --- widget/src/windows/nsWindow.cpp | 13 +++++++++++-- widget/src/windows/nsWindow.h | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index f231867a1e2f..3a557ea99c21 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -378,6 +378,7 @@ nsWindow::nsWindow() : nsBaseWidget() mDisplayPanFeedback = PR_FALSE; mTouchWindow = PR_FALSE; mCustomNonClient = PR_FALSE; + mCompositorFlag = PR_FALSE; mHideChrome = PR_FALSE; mWindowType = eWindowType_child; mBorderStyle = eBorderStyle_default; @@ -1988,6 +1989,13 @@ nsWindow::UpdateNonClientMargins(PRInt32 aSizeMode, PRBool aReflowWindow) if (!mCustomNonClient) return PR_FALSE; + // XXX Temp disable margins until frame rendering is supported + mCompositorFlag = PR_TRUE; + if(!nsUXThemeData::CheckForCompositor()) { + mCompositorFlag = PR_FALSE; + return PR_FALSE; + } + mNonClientOffset.top = mNonClientOffset.bottom = mNonClientOffset.left = mNonClientOffset.right = 0; @@ -4564,6 +4572,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam, // Glass hit testing w/custom transparent margins LRESULT dwmHitResult; if (mCustomNonClient && + mCompositorFlag && nsUXThemeData::CheckForCompositor() && nsUXThemeData::dwmDwmDefWindowProcPtr(mWnd, msg, wParam, lParam, &dwmHitResult)) { *aRetValue = dwmHitResult; @@ -4704,7 +4713,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam, // copies the valid information to the specified area within the new // client area. If the wParam parameter is FALSE, the application should // return zero. - if (mCustomNonClient) { + if (mCustomNonClient && mCompositorFlag) { if (!wParam) { result = PR_TRUE; *aRetValue = 0; @@ -4744,7 +4753,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam, * composited desktop. */ - if (!mCustomNonClient) + if (!mCustomNonClient || !mCompositorFlag) break; *aRetValue = diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index e360cf50abc8..0599b52d9f20 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -501,6 +501,8 @@ protected: nsIntMargin mNonClientMargins; // Indicates custom frames are enabled PRPackedBool mCustomNonClient; + // Disable non client margins on non-comsitor desktops + PRPackedBool mCompositorFlag; // Cached copy of L&F's resize border PRInt32 mHorResizeMargin; PRInt32 mVertResizeMargin; From 3474b5de6daf458f32e146da13895764e5f7fffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Sun, 15 Aug 2010 14:31:14 +0200 Subject: [PATCH 041/109] Bug 587299 - Tighten scope when collecting data for pinned tabs only. r=dietrich --- .../sessionstore/src/nsSessionStore.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js index 4c4d48578e29..af58c941f6f0 100644 --- a/browser/components/sessionstore/src/nsSessionStore.js +++ b/browser/components/sessionstore/src/nsSessionStore.js @@ -1140,14 +1140,19 @@ SessionStoreService.prototype = { * Store all session data for a window * @param aWindow * Window reference + * @param aPinnedOnly + * Bool collect pinned tabs only */ - _saveWindowHistory: function sss_saveWindowHistory(aWindow) { + _saveWindowHistory: function sss_saveWindowHistory(aWindow, aPinnedOnly) { var tabbrowser = aWindow.gBrowser; var tabs = tabbrowser.tabs; var tabsData = this._windows[aWindow.__SSi].tabs = []; - for (var i = 0; i < tabs.length; i++) + for (var i = 0; i < tabs.length; i++) { + if (aPinnedOnly && !tabs[i].pinned) + break; tabsData.push(this._collectTabData(tabs[i])); + } this._windows[aWindow.__SSi].selected = tabbrowser.mTabBox.selectedIndex + 1; }, @@ -1435,16 +1440,15 @@ SessionStoreService.prototype = { */ _updateTextAndScrollData: function sss_updateTextAndScrollData(aWindow) { var browsers = aWindow.gBrowser.browsers; - for (var i = 0; i < browsers.length; i++) { + this._windows[aWindow.__SSi].tabs.forEach(function (tabData, i) { + if (browsers[i].__SS_data && + browsers[i].__SS_data._tabStillLoading) + return; // ignore incompletely initialized tabs try { - var tabData = this._windows[aWindow.__SSi].tabs[i]; - if (browsers[i].__SS_data && - browsers[i].__SS_data._tabStillLoading) - continue; // ignore incompletely initialized tabs this._updateTextAndScrollDataForTab(aWindow, browsers[i], tabData); } catch (ex) { debug(ex); } // get as much data as possible, ignore failures (might succeed the next time) - } + }, this); }, /** @@ -1769,7 +1773,7 @@ SessionStoreService.prototype = { if (!this._isWindowLoaded(aWindow)) // window data is still in _statesToRestore return; if (aUpdateAll || this._dirtyWindows[aWindow.__SSi] || aWindow == activeWindow) { - this._collectWindowData(aWindow); + this._collectWindowData(aWindow, aPinnedOnly); } else { // always update the window features (whose change alone never triggers a save operation) this._updateWindowFeatures(aWindow); @@ -1857,12 +1861,12 @@ SessionStoreService.prototype = { return { windows: total }; }, - _collectWindowData: function sss_collectWindowData(aWindow) { + _collectWindowData: function sss_collectWindowData(aWindow, aPinnedOnly) { if (!this._isWindowLoaded(aWindow)) return; // update the internal state data for this window - this._saveWindowHistory(aWindow); + this._saveWindowHistory(aWindow, aPinnedOnly); this._updateTextAndScrollData(aWindow); this._updateCookieHosts(aWindow); this._updateWindowFeatures(aWindow); From dbc20051fec51ea677d4ad29c5e7aa7f23dda402 Mon Sep 17 00:00:00 2001 From: Ginn Chen Date: Sun, 15 Aug 2010 20:33:18 +0800 Subject: [PATCH 042/109] Bug 586186 Implement RealBreak for Solaris r=doug.turner a=bsmedberg --- xpcom/base/nsDebugImpl.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp index 82ffce7e6da1..97c3cd262e5a 100644 --- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -395,6 +395,12 @@ RealBreak() asm("int $3"); #elif defined(__arm__) asm("BKPT #0"); +#elif defined(SOLARIS) +#if defined(__i386__) || defined(__i386) || defined(__x86_64__) + asm("int $3"); +#else + raise(SIGTRAP); +#endif #else #warning don't know how to break on this platform #endif @@ -497,6 +503,8 @@ Break(const char *aMsg) RealBreak(); #elif defined(__arm__) RealBreak(); +#elif defined(SOLARIS) + RealBreak(); #else #warning don't know how to break on this platform #endif From ae4f371e8ee7c1218215b1d0f465b680a804add6 Mon Sep 17 00:00:00 2001 From: Ginn Chen Date: Sun, 15 Aug 2010 20:33:39 +0800 Subject: [PATCH 043/109] Bug 586229 Update sydney_audio_sunaudio.c to fix a/v choppy issue r=kinetik a=NPOTB --- .../libsydneyaudio/src/sydney_audio_sunaudio.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/media/libsydneyaudio/src/sydney_audio_sunaudio.c b/media/libsydneyaudio/src/sydney_audio_sunaudio.c index 77b85778eebc..4964260b99a7 100644 --- a/media/libsydneyaudio/src/sydney_audio_sunaudio.c +++ b/media/libsydneyaudio/src/sydney_audio_sunaudio.c @@ -235,7 +235,7 @@ sa_stream_open(sa_stream_t *s) { s->using_oss = false; /* Try to use OSS if available */ if (dsp_device_name) { - fd = open(dsp_device_name, O_WRONLY, 0); + fd = open(dsp_device_name, O_WRONLY | O_NONBLOCK); if (fd >= 0) { s->using_oss = true; } @@ -560,14 +560,8 @@ sa_stream_pause(sa_stream_t *s) { return SA_ERROR_NO_INIT; } - if (s->using_oss) { - return SA_ERROR_NOT_SUPPORTED; - } - - int result = SA_SUCCESS; - pthread_mutex_lock(&s->mutex); - result = shutdown_device(s); + int result = shutdown_device(s); if (result == SA_SUCCESS) { s->output_fd = -1; } @@ -583,10 +577,6 @@ sa_stream_resume(sa_stream_t *s) { return SA_ERROR_NO_INIT; } - if (s->using_oss) { - return SA_ERROR_NOT_SUPPORTED; - } - pthread_mutex_lock(&s->mutex); int result = sa_stream_open(s); pthread_mutex_unlock(&s->mutex); @@ -625,10 +615,6 @@ shutdown_device(sa_stream_t *s) { return SA_SUCCESS; } -/* - * ----------------------------------------------------------------------------- - * Startup and shutdown functions - * ----------------------------------------------------------------------------- /* * ----------------------------------------------------------------------------- * Extension functions From 6e2c8bd88eedc56a6eb6466181f6cee1eea0138e Mon Sep 17 00:00:00 2001 From: Ginn Chen Date: Sun, 15 Aug 2010 20:33:58 +0800 Subject: [PATCH 044/109] Bug 586225 Make test_htmleditor_keyevent_handling.html recognize Solaris r=masayuki a=testing files only --- .../libeditor/html/tests/test_htmleditor_keyevent_handling.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html b/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html index 02dd1b2a9365..3ea2010ca448 100644 --- a/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html +++ b/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html @@ -29,7 +29,7 @@ var htmlEditor = document.getElementById("htmlEditor"); const kIsMac = navigator.platform.indexOf("Mac") == 0; const kIsWin = navigator.platform.indexOf("Win") == 0; -const kIsLinux = navigator.platform.indexOf("Linux") == 0; +const kIsLinux = navigator.platform.indexOf("Linux") == 0 || navigator.platform.indexOf("SunOS") == 0 ; function runTests() { From bdab2e093415d195d338301eb3ccf2763e8a52bd Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Sun, 15 Aug 2010 08:42:29 -0400 Subject: [PATCH 045/109] Correct parenthesis-matching inside of :not(). (Bug 586070) r=bzbarsky a2.0=bsmedberg --- layout/style/nsCSSParser.cpp | 2 ++ .../style/test/test_unclosed_parentheses.html | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index f4ff53af795d..612219caccf5 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -3223,11 +3223,13 @@ CSSParserImpl::ParseNegatedSimpleSelector(PRInt32& aDataMask, } if (eSelectorParsingStatus_Error == parsingStatus) { REPORT_UNEXPECTED_TOKEN(PENegationBadInner); + SkipUntil(')'); return parsingStatus; } // close the parenthesis if (!ExpectSymbol(')', PR_TRUE)) { REPORT_UNEXPECTED_TOKEN(PENegationNoClose); + SkipUntil(')'); return eSelectorParsingStatus_Error; } diff --git a/layout/style/test/test_unclosed_parentheses.html b/layout/style/test/test_unclosed_parentheses.html index 891d99f23ad5..034a8c156d5b 100644 --- a/layout/style/test/test_unclosed_parentheses.html +++ b/layout/style/test/test_unclosed_parentheses.html @@ -137,6 +137,19 @@ var declarations = [ "border-top-width: -moz-calc((2em) ", ]; +var selectors = [ + ":not(", + ":not( ", + ":not(-", + ":not(- ", + ":not(>", + ":not(> ", + ":not(div p", + ":not(div p ", + ":not(div >", + ":not(div > ", +]; + var textNode = document.createTextNode(""); document.getElementById("style").appendChild(textNode); var cs = getComputedStyle(document.getElementById("display"), ""); @@ -152,6 +165,18 @@ for (var i = 0; i < declarations.length; ++i) { "z-index for declaration '" + declarations[i] + "'"); } +for (var i = 0; i < selectors.length; ++i) { + var sheet = "@namespace html url(http://www.w3.org/1999/xhtml);\n" + + "#display { color: green } " + + selectors[i] + " x x x x x x x , #display { color: red } #display { color: red } ) , #display { color: red } " + + "#display { z-index: " + (i + 1) + " }"; + textNode.data = sheet; + is(cs.color, "rgb(0, 128, 0)", + "color for selector '" + selectors[i] + "'"); + is(cs.zIndex, i+1, + "z-index for selector '" + selectors[i] + "'"); +} + From beb10ce6a3f1c970e8b3b53b0298ef5ca0d6d65f Mon Sep 17 00:00:00 2001 From: Robert Longson Date: Sun, 15 Aug 2010 08:42:29 -0400 Subject: [PATCH 046/109] Bug 584322: Fix confusion between premultiplied and non-premultiplied colors that was causing feDisplacementMap to offset the result incorrectly. r=roc a2.0=dbaron --- content/svg/content/src/nsSVGFilters.cpp | 17 ++++++++------ content/svg/content/src/nsSVGFilters.h | 16 +++++++------- .../filters/feDisplacementMap-alpha-01.svg | 22 +++++++++++++++++++ layout/reftests/svg/filters/reftest.list | 2 ++ 4 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 layout/reftests/svg/filters/feDisplacementMap-alpha-01.svg diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index 4ace69078da2..075dae66354f 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -1068,7 +1068,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } virtual EnumAttributesInfo GetEnumInfo(); virtual StringAttributesInfo GetStringInfo(); @@ -1695,7 +1695,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; } virtual StringAttributesInfo GetStringInfo(); @@ -2715,7 +2715,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRUint32, Image*) { return PR_TRUE; } + PRInt32, Image*) { return PR_TRUE; } virtual StringAttributesInfo GetStringInfo(); @@ -3898,7 +3898,7 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: - virtual PRBool OperatesOnPremultipledAlpha() { + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return !mBooleanAttributes[PRESERVEALPHA].GetAnimValue(); } @@ -5354,7 +5354,7 @@ private: protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*, - PRUint32, Image*) { return PR_TRUE; } + PRInt32, Image*) { return PR_TRUE; } virtual nsSVGPreserveAspectRatio *GetPreserveAspectRatio(); virtual StringAttributesInfo GetStringInfo(); @@ -5689,13 +5689,16 @@ public: virtual nsXPCClassInfo* GetClassInfo(); protected: virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRUint32 aInput, Image* aImage) { - if (aInput == 0 && aImage) + PRInt32 aInput, Image* aImage) { + if (aInput == 0) return aImage->mColorModel.mColorSpace == ColorModel::SRGB; return nsSVGFEDisplacementMapElementBase::OperatesOnSRGB(aInstance, aInput, aImage); } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32 aInput) { + return !(aInput == 1); + } virtual NumberAttributesInfo GetNumberInfo(); virtual EnumAttributesInfo GetEnumInfo(); diff --git a/content/svg/content/src/nsSVGFilters.h b/content/svg/content/src/nsSVGFilters.h index 01460fa82a89..0697d5a2c719 100644 --- a/content/svg/content/src/nsSVGFilters.h +++ b/content/svg/content/src/nsSVGFilters.h @@ -119,21 +119,21 @@ protected: public: ColorModel - GetInputColorModel(nsSVGFilterInstance* aInstance, PRUint32 aInputIndex, + GetInputColorModel(nsSVGFilterInstance* aInstance, PRInt32 aInputIndex, Image* aImage) { return ColorModel( (OperatesOnSRGB(aInstance, aInputIndex, aImage) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha() ? + (OperatesOnPremultipledAlpha(aInputIndex) ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } ColorModel GetOutputColorModel(nsSVGFilterInstance* aInstance) { return ColorModel( - (OperatesOnSRGB(aInstance, 0, nsnull) ? + (OperatesOnSRGB(aInstance, -1, nsnull) ? ColorModel::SRGB : ColorModel::LINEAR_RGB), - (OperatesOnPremultipledAlpha() ? + (OperatesOnPremultipledAlpha(-1) ? ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED)); } @@ -199,13 +199,13 @@ public: operator nsISupports*() { return static_cast(this); } protected: - virtual PRBool OperatesOnPremultipledAlpha() { return PR_TRUE; } + virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_TRUE; } - // Called either with aImage non-null, in which case this is + // Called either with aInputIndex >=0 in which case this is // testing whether the input 'aInputIndex' should be SRGB, or - // if aImage is null returns true if the output will be SRGB + // if aInputIndex is -1 returns true if the output will be SRGB virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance, - PRUint32 aInputIndex, Image* aImage) { + PRInt32 aInputIndex, Image* aImage) { nsIFrame* frame = GetPrimaryFrame(); if (!frame) return PR_FALSE; diff --git a/layout/reftests/svg/filters/feDisplacementMap-alpha-01.svg b/layout/reftests/svg/filters/feDisplacementMap-alpha-01.svg new file mode 100644 index 000000000000..9d52f8cb0135 --- /dev/null +++ b/layout/reftests/svg/filters/feDisplacementMap-alpha-01.svg @@ -0,0 +1,22 @@ + + + Testcase for feDisplacementMap processing in2 with premultiplied colour values + + + + + + + + + + + + + + diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list index d20cc5345308..369628b465fe 100644 --- a/layout/reftests/svg/filters/reftest.list +++ b/layout/reftests/svg/filters/reftest.list @@ -72,6 +72,8 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704 == feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01-ref.svg == feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg +== feDisplacementMap-alpha-01.svg pass.svg + == feMorphology-radius-negative-01.svg pass.svg == feMorphology-radius-negative-02.svg pass.svg == feMorphology-radius-zero-01.svg pass.svg From a9187b72ab51d6d1483cbd5dd8f1b84bf64f35dc Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Sun, 15 Aug 2010 15:54:02 +0200 Subject: [PATCH 047/109] Get the parent pres shell from the docshell instead of the document. b=587064 r=roc a=blocking2.0 --- layout/base/nsPresContext.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 23bad086acc4..6889751695d6 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -898,20 +898,18 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext) mRefreshDriver = mDocument->GetDisplayDocument()->GetShell()-> GetPresContext()->RefreshDriver(); } else { - nsIDocument* parent = mDocument->GetParentDocument(); - if (parent) { - NS_ASSERTION(parent->GetShell() && parent->GetShell()->GetPresContext(), - "How did we get a presshell?"); - - // We don't have our container set yet at this point - nsCOMPtr ourContainer = mDocument->GetContainer(); - - nsCOMPtr ourItem = do_QueryInterface(ourContainer); - if (ourItem) { - nsCOMPtr parentItem; - ourItem->GetSameTypeParent(getter_AddRefs(parentItem)); - if (parentItem) { - mRefreshDriver = parent->GetShell()->GetPresContext()->RefreshDriver(); + // We don't have our container set yet at this point + nsCOMPtr ourContainer = mDocument->GetContainer(); + nsCOMPtr ourItem = do_QueryInterface(ourContainer); + if (ourItem) { + nsCOMPtr parentItem; + ourItem->GetSameTypeParent(getter_AddRefs(parentItem)); + nsCOMPtr parentDocShell = do_QueryInterface(parentItem); + if (parentDocShell) { + nsCOMPtr parentPresShell; + parentDocShell->GetPresShell(getter_AddRefs(parentPresShell)); + if (parentPresShell) { + mRefreshDriver = parentPresShell->GetPresContext()->RefreshDriver(); } } } From 8473f691f38c0db32d151a4c761991d57102a65f Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Sun, 15 Aug 2010 11:19:34 -0400 Subject: [PATCH 048/109] Bug 568441 - Explicitely show the caret in nsTextControlFrame when the content is no longer disabled and focused. r=roc a2.0=blocking+ --- layout/forms/nsTextControlFrame.cpp | 3 +++ layout/reftests/bugs/568441-ref.html | 6 ++++++ layout/reftests/bugs/568441.html | 14 ++++++++++++++ layout/reftests/bugs/reftest.list | 1 + 4 files changed, 24 insertions(+) create mode 100644 layout/reftests/bugs/568441-ref.html create mode 100644 layout/reftests/bugs/568441.html diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index f18c11c93e1f..5bde0b98a9ab 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -1289,6 +1289,9 @@ nsTextControlFrame::AttributeChanged(PRInt32 aNameSpaceID, { // unset disabled flags &= ~(nsIPlaintextEditor::eEditorDisabledMask); selCon->SetDisplaySelection(nsISelectionController::SELECTION_HIDDEN); + if (nsContentUtils::IsFocusedContent(mContent)) { + selCon->SetCaretEnabled(PR_TRUE); + } } editor->SetFlags(flags); } diff --git a/layout/reftests/bugs/568441-ref.html b/layout/reftests/bugs/568441-ref.html new file mode 100644 index 000000000000..0e039f72c158 --- /dev/null +++ b/layout/reftests/bugs/568441-ref.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/layout/reftests/bugs/568441.html b/layout/reftests/bugs/568441.html new file mode 100644 index 000000000000..ae7ad552203a --- /dev/null +++ b/layout/reftests/bugs/568441.html @@ -0,0 +1,14 @@ + + + + + + + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 564618d66155..ce704430934d 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1492,3 +1492,4 @@ random-if(d2d) == 555388-1.html 555388-1-ref.html == 580160-1.html 580160-1-ref.html == 579349-1.html 579349-1-ref.html == 581317-1.html 581317-1-ref.html +== 568441.html 568441-ref.html From 89e9fd902fa58c01d64220adf3a4d6b37550b744 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Sun, 15 Aug 2010 11:19:34 -0400 Subject: [PATCH 049/109] Bug 585507 - Fix compilation issue when SMIL is disabled. r=dholbert a2.0=dbaron --- content/svg/content/src/nsSVGSVGElement.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp index 4d420a578456..50d8ac4cd53a 100644 --- a/content/svg/content/src/nsSVGSVGElement.cpp +++ b/content/svg/content/src/nsSVGSVGElement.cpp @@ -68,11 +68,11 @@ #include "nsSMILTypes.h" #include "nsIContentIterator.h" -using namespace mozilla; - nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult); #endif // MOZ_SMIL +using namespace mozilla; + NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGTranslatePoint::DOMVal, mElement) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsSVGTranslatePoint::DOMVal) From ddf28f360f9ca6dbb2dbdd925daaf227b86e4728 Mon Sep 17 00:00:00 2001 From: Simon Montagu Date: Sun, 15 Aug 2010 11:19:34 -0400 Subject: [PATCH 050/109] Remove test for bug 558403. (Bug 581734) r=sayrer a2.0=tests --- toolkit/content/tests/chrome/Makefile.in | 3 - .../tests/chrome/bug558403.logical.html | 22 -- .../tests/chrome/bug558403.visual.html | 22 -- .../content/tests/chrome/test_bug558403.xul | 202 ------------------ 4 files changed, 249 deletions(-) delete mode 100644 toolkit/content/tests/chrome/bug558403.logical.html delete mode 100644 toolkit/content/tests/chrome/bug558403.visual.html delete mode 100644 toolkit/content/tests/chrome/test_bug558403.xul diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in index 8685448d1409..6383205403b1 100644 --- a/toolkit/content/tests/chrome/Makefile.in +++ b/toolkit/content/tests/chrome/Makefile.in @@ -69,9 +69,6 @@ _TEST_FILES = findbar_window.xul \ bug451540_window.xul \ test_bug451540.xul \ test_bug471776.xul \ - bug558403.logical.html \ - bug558403.visual.html \ - test_bug558403.xul \ test_popup_preventdefault_chrome.xul \ window_popup_preventdefault_chrome.xul \ test_largemenu.xul \ diff --git a/toolkit/content/tests/chrome/bug558403.logical.html b/toolkit/content/tests/chrome/bug558403.logical.html deleted file mode 100644 index c2f8f2dd49ff..000000000000 --- a/toolkit/content/tests/chrome/bug558403.logical.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Plugin with Logical Hebrew - - - - - - diff --git a/toolkit/content/tests/chrome/bug558403.visual.html b/toolkit/content/tests/chrome/bug558403.visual.html deleted file mode 100644 index 80b226a6e949..000000000000 --- a/toolkit/content/tests/chrome/bug558403.visual.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Plugin with Visual Hebrew - - - - - - diff --git a/toolkit/content/tests/chrome/test_bug558403.xul b/toolkit/content/tests/chrome/test_bug558403.xul deleted file mode 100644 index 6d68a18b67b4..000000000000 --- a/toolkit/content/tests/chrome/test_bug558403.xul +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - Test for Bug 558403 - - - - - - - - Mozilla Bug 558403 - - -

-

- - 
-
- - - - - - From e48ff4757806819fe6bc3f50d2ffd62105907b21 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 15 Aug 2010 11:19:34 -0400 Subject: [PATCH 051/109] Make nsICSSRule::Clone return the cloned value directly. (Bug 585137) r=bzbarsky a2.0=dbaron --- .../html/content/src/nsGenericHTMLElement.cpp | 7 +- content/xul/content/src/nsXULElement.cpp | 14 ++- layout/style/nsCSSRules.cpp | 92 ++++++------------- layout/style/nsCSSRules.h | 6 +- layout/style/nsCSSStyleRule.cpp | 16 +--- layout/style/nsCSSStyleSheet.cpp | 8 +- layout/style/nsICSSGroupRule.h | 12 +-- layout/style/nsICSSImportRule.h | 12 +-- layout/style/nsICSSNameSpaceRule.h | 12 +-- layout/style/nsICSSRule.h | 19 ++-- layout/style/nsICSSStyleRule.h | 6 +- 11 files changed, 79 insertions(+), 125 deletions(-) diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 0aba5cba5563..af564642b089 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -301,11 +301,8 @@ nsGenericHTMLElement::CopyInnerTo(nsGenericElement* aDst) const value->Type() == nsAttrValue::eCSSStyleRule) { // We can't just set this as a string, because that will fail // to reparse the string into style data until the node is - // inserted into the document. Clone the HTMLValue instead. - nsCOMPtr ruleClone; - rv = value->GetCSSStyleRuleValue()->Clone(*getter_AddRefs(ruleClone)); - NS_ENSURE_SUCCESS(rv, rv); - + // inserted into the document. Clone the nsICSSRule instead. + nsCOMPtr ruleClone = value->GetCSSStyleRuleValue()->Clone(); nsCOMPtr styleRule = do_QueryInterface(ruleClone); NS_ENSURE_TRUE(styleRule, NS_ERROR_UNEXPECTED); diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index f88fb182e7a0..f95008ff739c 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -1939,10 +1939,8 @@ nsXULElement::EnsureLocalStyle() nsXULPrototypeAttribute *protoattr = FindPrototypeAttribute(kNameSpaceID_None, nsGkAtoms::style); if (protoattr && protoattr->mValue.Type() == nsAttrValue::eCSSStyleRule) { - nsCOMPtr ruleClone; - nsresult rv = protoattr->mValue.GetCSSStyleRuleValue()-> - Clone(*getter_AddRefs(ruleClone)); - NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr ruleClone = + protoattr->mValue.GetCSSStyleRuleValue()->Clone(); nsString stringValue; protoattr->mValue.ToString(stringValue); @@ -1951,7 +1949,8 @@ nsXULElement::EnsureLocalStyle() nsCOMPtr styleRule = do_QueryInterface(ruleClone); value.SetTo(styleRule, &stringValue); - rv = mAttrsAndChildren.SetAndTakeAttr(nsGkAtoms::style, value); + nsresult rv = + mAttrsAndChildren.SetAndTakeAttr(nsGkAtoms::style, value); NS_ENSURE_SUCCESS(rv, rv); } } @@ -2315,9 +2314,8 @@ nsresult nsXULElement::MakeHeavyweight() // Style rules need to be cloned. if (protoattr->mValue.Type() == nsAttrValue::eCSSStyleRule) { - nsCOMPtr ruleClone; - rv = protoattr->mValue.GetCSSStyleRuleValue()->Clone(*getter_AddRefs(ruleClone)); - NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr ruleClone = + protoattr->mValue.GetCSSStyleRuleValue()->Clone(); nsString stringValue; protoattr->mValue.ToString(stringValue); diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp index 849be83e95fe..8fa3c70ff06b 100644 --- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -206,7 +206,7 @@ public: // nsICSSRule methods virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; // nsIDOMCSSRule interface NS_DECL_NSIDOMCSSRULE @@ -271,16 +271,11 @@ CSSCharsetRuleImpl::GetType() const return nsICSSRule::CHARSET_RULE; } -/* virtual */ nsresult -CSSCharsetRuleImpl::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +CSSCharsetRuleImpl::Clone() const { - CSSCharsetRuleImpl* clone = new CSSCharsetRuleImpl(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new CSSCharsetRuleImpl(*this); + return clone.forget(); } NS_IMETHODIMP @@ -381,7 +376,7 @@ public: // nsICSSRule methods virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; // nsICSSImportRule methods NS_IMETHOD SetURLSpec(const nsString& aURLSpec); @@ -475,16 +470,11 @@ CSSImportRuleImpl::GetType() const return nsICSSRule::IMPORT_RULE; } -/* virtual */ nsresult -CSSImportRuleImpl::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +CSSImportRuleImpl::Clone() const { - CSSImportRuleImpl* clone = new CSSImportRuleImpl(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new CSSImportRuleImpl(*this); + return clone.forget(); } NS_IMETHODIMP @@ -644,12 +634,8 @@ nsCSSGroupRule::nsCSSGroupRule() static PRBool CloneRuleInto(nsICSSRule* aRule, void* aArray) { - nsICSSRule* clone = nsnull; - aRule->Clone(clone); - if (clone) { - static_cast*>(aArray)->AppendObject(clone); - NS_RELEASE(clone); - } + nsCOMPtr clone = aRule->Clone(); + static_cast*>(aArray)->AppendObject(clone); return PR_TRUE; } @@ -955,16 +941,11 @@ nsCSSMediaRule::GetType() const return nsICSSRule::MEDIA_RULE; } -/* virtual */ nsresult -nsCSSMediaRule::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +nsCSSMediaRule::Clone() const { - nsCSSMediaRule* clone = new nsCSSMediaRule(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new nsCSSMediaRule(*this); + return clone.forget(); } nsresult @@ -1123,16 +1104,11 @@ nsCSSDocumentRule::GetType() const return nsICSSRule::DOCUMENT_RULE; } -/* virtual */ nsresult -nsCSSDocumentRule::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +nsCSSDocumentRule::Clone() const { - nsCSSDocumentRule* clone = new nsCSSDocumentRule(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new nsCSSDocumentRule(*this); + return clone.forget(); } // nsIDOMCSSRule methods @@ -1273,7 +1249,7 @@ public: // nsICSSRule methods virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; // nsICSSNameSpaceRule methods NS_IMETHOD GetPrefix(nsIAtom*& aPrefix) const; @@ -1355,16 +1331,11 @@ CSSNameSpaceRuleImpl::GetType() const return nsICSSRule::NAMESPACE_RULE; } -/* virtual */ nsresult -CSSNameSpaceRuleImpl::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +CSSNameSpaceRuleImpl::Clone() const { - CSSNameSpaceRuleImpl* clone = new CSSNameSpaceRuleImpl(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new CSSNameSpaceRuleImpl(*this); + return clone.forget(); } NS_IMETHODIMP @@ -1787,16 +1758,11 @@ nsCSSFontFaceStyleDecl::GetParentRule(nsIDOMCSSRule** aParentRule) // nsCSSFontFaceRule // -/* virtual */ nsresult -nsCSSFontFaceRule::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +nsCSSFontFaceRule::Clone() const { - nsCSSFontFaceRule* clone = new nsCSSFontFaceRule(*this); - if (clone) { - NS_ADDREF(aClone = clone); - return NS_OK; - } - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; + nsCOMPtr clone = new nsCSSFontFaceRule(*this); + return clone.forget(); } NS_IMPL_ADDREF_INHERITED(nsCSSFontFaceRule, nsCSSRule) diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h index 5c2bc3de08da..4bbba855100d 100644 --- a/layout/style/nsCSSRules.h +++ b/layout/style/nsCSSRules.h @@ -131,7 +131,7 @@ public: // nsICSSRule methods virtual void SetStyleSheet(nsCSSStyleSheet* aSheet); //override nsCSSGroupRule virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult) { *aResult = NS_OK; @@ -172,7 +172,7 @@ public: // nsICSSRule methods virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult) { *aResult = NS_OK; @@ -265,7 +265,7 @@ public: DECL_STYLE_RULE_INHERIT virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; // nsIDOMCSSRule interface NS_DECL_NSIDOMCSSRULE diff --git a/layout/style/nsCSSStyleRule.cpp b/layout/style/nsCSSStyleRule.cpp index c881102f141c..e134cd87d6e3 100644 --- a/layout/style/nsCSSStyleRule.cpp +++ b/layout/style/nsCSSStyleRule.cpp @@ -1309,7 +1309,7 @@ public: virtual nsresult SetSelectorText(const nsAString& aSelectorText); virtual PRInt32 GetType() const; - virtual nsresult Clone(nsICSSRule*& aClone) const; + virtual already_AddRefed Clone() const; nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult); @@ -1478,17 +1478,11 @@ CSSStyleRuleImpl::GetType() const return nsICSSRule::STYLE_RULE; } -/* virtual */ nsresult -CSSStyleRuleImpl::Clone(nsICSSRule*& aClone) const +/* virtual */ already_AddRefed +CSSStyleRuleImpl::Clone() const { - CSSStyleRuleImpl* clone = new CSSStyleRuleImpl(*this); - if (!clone || !clone->mDeclaration || (!clone->mSelector != !mSelector)) { - delete clone; - aClone = nsnull; - return NS_ERROR_OUT_OF_MEMORY; - } - NS_ADDREF(aClone = clone); - return NS_OK; + nsCOMPtr clone = new CSSStyleRuleImpl(*this); + return clone.forget(); } nsIDOMCSSRule* diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp index 9599f9eebf10..c1f2489b4b68 100644 --- a/layout/style/nsCSSStyleSheet.cpp +++ b/layout/style/nsCSSStyleSheet.cpp @@ -789,12 +789,8 @@ static PRBool SetStyleSheetReference(nsICSSRule* aRule, void* aSheet) static PRBool CloneRuleInto(nsICSSRule* aRule, void* aArray) { - nsICSSRule* clone = nsnull; - aRule->Clone(clone); - if (clone) { - static_cast*>(aArray)->AppendObject(clone); - NS_RELEASE(clone); - } + nsCOMPtr clone = aRule->Clone(); + static_cast*>(aArray)->AppendObject(clone); return PR_TRUE; } diff --git a/layout/style/nsICSSGroupRule.h b/layout/style/nsICSSGroupRule.h index 0a1c8f75b2a2..ad1af2018514 100644 --- a/layout/style/nsICSSGroupRule.h +++ b/layout/style/nsICSSGroupRule.h @@ -40,8 +40,8 @@ * rules, such as @media rules */ -#ifndef nsICSSGroupRule_h___ -#define nsICSSGroupRule_h___ +#ifndef nsICSSGroupRule_h +#define nsICSSGroupRule_h #include "nsICSSRule.h" #include "nsCOMArray.h" @@ -49,9 +49,9 @@ class nsPresContext; class nsMediaQueryResultCacheKey; -// IID for the nsICSSGroupRule interface {388222c0-cb76-4a01-9988-8cd28e66690e} -#define NS_ICSS_GROUP_RULE_IID \ -{0x388222c0, 0xcb76, 0x4a01, {0x99, 0x88, 0x8c, 0xd2, 0x8e, 0x66, 0x69, 0x0e}} +#define NS_ICSS_GROUP_RULE_IID \ +{ 0xf1e3d96b, 0xe381, 0x4533, \ + { 0xa6, 0x5e, 0xa5, 0x31, 0xba, 0xca, 0x93, 0x62 } } class nsICSSGroupRule : public nsICSSRule { @@ -83,4 +83,4 @@ public: NS_DEFINE_STATIC_IID_ACCESSOR(nsICSSGroupRule, NS_ICSS_GROUP_RULE_IID) -#endif /* nsICSSGroupRule_h___ */ +#endif /* nsICSSGroupRule_h */ diff --git a/layout/style/nsICSSImportRule.h b/layout/style/nsICSSImportRule.h index 89b7cd707d97..8c61da75a43a 100644 --- a/layout/style/nsICSSImportRule.h +++ b/layout/style/nsICSSImportRule.h @@ -37,17 +37,17 @@ /* internal interface for CSS @import rules */ -#ifndef nsICSSImportRule_h___ -#define nsICSSImportRule_h___ +#ifndef nsICSSImportRule_h +#define nsICSSImportRule_h #include "nsICSSRule.h" class nsMediaList; class nsString; -// IID for the nsICSSImportRule interface {99118ef3-927d-43f0-a210-27482d75de2e} -#define NS_ICSS_IMPORT_RULE_IID \ -{0x99118ef3, 0x927d, 0x43f0, {0xa2, 0x10, 0x27, 0x48, 0x2d, 0x75, 0xde, 0x2e}} +#define NS_ICSS_IMPORT_RULE_IID \ +{ 0x07bd9b80, 0x721e, 0x4566, \ + { 0xb7, 0x90, 0xed, 0x25, 0x10, 0xed, 0x99, 0xde } } class nsICSSImportRule : public nsICSSRule { @@ -69,4 +69,4 @@ nsresult NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, const nsString& aURLSpec, nsMediaList* aMedia); -#endif /* nsICSSImportRule_h___ */ +#endif /* nsICSSImportRule_h */ diff --git a/layout/style/nsICSSNameSpaceRule.h b/layout/style/nsICSSNameSpaceRule.h index ef01baf68d63..de9734e967f9 100644 --- a/layout/style/nsICSSNameSpaceRule.h +++ b/layout/style/nsICSSNameSpaceRule.h @@ -37,16 +37,16 @@ /* internal interface for CSS @namespace rules */ -#ifndef nsICSSNameSpaceRule_h___ -#define nsICSSNameSpaceRule_h___ +#ifndef nsICSSNameSpaceRule_h +#define nsICSSNameSpaceRule_h #include "nsICSSRule.h" class nsIAtom; -// IID for the nsICSSNameSpaceRule interface {ec064d33-a6f1-459c-8f31-8289eed877de} -#define NS_ICSS_NAMESPACE_RULE_IID \ -{0xec064d33, 0xa6f1, 0x459c, {0x8f, 0x31, 0x82, 0x89, 0xee, 0xd8, 0x77, 0xde}} +#define NS_ICSS_NAMESPACE_RULE_IID \ +{ 0x9be32bb3, 0x5729, 0x4853, \ + { 0x87, 0x29, 0x9b, 0x46, 0x69, 0xad, 0x82, 0x1b } } class nsICSSNameSpaceRule : public nsICSSRule { @@ -66,4 +66,4 @@ nsresult NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, nsIAtom* aPrefix, const nsString& aURLSpec); -#endif /* nsICSSNameSpaceRule_h___ */ +#endif /* nsICSSNameSpaceRule_h */ diff --git a/layout/style/nsICSSRule.h b/layout/style/nsICSSRule.h index 3d1262d6f41c..5bf95a207474 100644 --- a/layout/style/nsICSSRule.h +++ b/layout/style/nsICSSRule.h @@ -37,8 +37,8 @@ /* internal interface for all rule types in a CSS style sheet */ -#ifndef nsICSSRule_h___ -#define nsICSSRule_h___ +#ifndef nsICSSRule_h +#define nsICSSRule_h #include "nsIStyleRule.h" #include "nsIDOMCSSRule.h" @@ -48,10 +48,10 @@ class nsICSSGroupRule; class nsAString; template struct already_AddRefed; -// IID for the nsICSSRule interface {471d733e-c138-4a50-9e1a-d13cbb65b526} -#define NS_ICSS_RULE_IID \ -{ 0x471d733e, 0xc138, 0x4a50, \ - { 0x9e, 0x1a, 0xd1, 0x3c, 0xbb, 0x65, 0xb5, 0x26 } } +// IID for the nsICSSRule interface +#define NS_ICSS_RULE_IID \ +{ 0x1f560b20, 0xa829, 0x4b99, \ + { 0x87, 0xbd, 0x8c, 0x87, 0x95, 0x2b, 0x3b, 0xb6 } } // inheriting from nsIStyleRule is only for style rules, not other rule types @@ -81,7 +81,10 @@ public: virtual void SetStyleSheet(nsCSSStyleSheet* aSheet) = 0; virtual void SetParentRule(nsICSSGroupRule* aRule) = 0; - virtual nsresult Clone(nsICSSRule*& aClone) const = 0; + /** + * Clones |this|. Never returns NULL. + */ + virtual already_AddRefed Clone() const = 0; // Note that this returns null for inline style rules since they aren't // supposed to have a DOM rule representation (and our code wouldn't work). @@ -102,4 +105,4 @@ nsresult NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult, const nsAString& aEncoding); -#endif /* nsICSSRule_h___ */ +#endif /* nsICSSRule_h */ diff --git a/layout/style/nsICSSStyleRule.h b/layout/style/nsICSSStyleRule.h index afda4f04c9f4..e1bda47497cc 100644 --- a/layout/style/nsICSSStyleRule.h +++ b/layout/style/nsICSSStyleRule.h @@ -292,10 +292,10 @@ private: nsCSSSelectorList& operator=(const nsCSSSelectorList& aCopy); }; -// 0512253d-ff15-45e7-abe8-f086ddb56762 +// 97eb9881-55fb-462c-be1a-b6309d42f8d0 #define NS_ICSS_STYLE_RULE_IID \ -{ 0x0512253d, 0xff15, 0x45e7, \ - { 0xab, 0xe8, 0xf0, 0x86, 0xdd, 0xb5, 0x67, 0x62 } } +{ 0x97eb9881, 0x55fb, 0x462c, \ + { 0xbe, 0x1a, 0xb6, 0x30, 0x9d, 0x42, 0xf8, 0xd0 } } class nsICSSStyleRule : public nsICSSRule { public: From d1e7808a060cdf1cab7d2d1153a3996cbbc663d9 Mon Sep 17 00:00:00 2001 From: Jono S Xia Date: Sun, 15 Aug 2010 09:13:43 -0700 Subject: [PATCH 052/109] Bug 567308: Test Pilot needs to clean up after itself; delete old prefs and data. r+a=dtownsend --- .../modules/tasks.js | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js index 9e551fc7b00f..a9d9364a3006 100644 --- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js +++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js @@ -169,18 +169,26 @@ var TestPilotTask = { // event handlers: onExperimentStartup: function TestPilotTask_onExperimentStartup() { + // Called when experiment is to start running (either on Firefox + // startup, or when study first becomes IN_PROGRESS) }, onExperimentShutdown: function TestPilotTask_onExperimentShutdown() { + // Called when experiment needs to stop running (either on Firefox + // shutdown, or on experiment reload, or on finishing or being canceled.) + }, + + doExperimentCleanup: function TestPilotTask_onExperimentCleanup() { + // Called when experiment has finished or been canceled; do any cleanup + // of user's profile. }, onAppStartup: function TestPilotTask_onAppStartup() { - // Called by extension core when startup is complete. + // Called by extension core when Firefox startup is complete. }, onAppShutdown: function TestPilotTask_onAppShutdown() { - // TODO: not implemented - should be called when firefox is ready to - // shut down. + // Called by extension core when Firefox is shutting down. }, onEnterPrivateBrowsing: function TestPilotTask_onEnterPrivate() { @@ -494,6 +502,13 @@ TestPilotExperiment.prototype = { } }, + doExperimentCleanup: function TestPilotExperiment_doExperimentCleanup() { + if (this._handlers.doExperimentCleanup) { + this._logger.trace("Doing experiment cleanup."); + this._handlers.doExperimentCleanup(); + } + }, + onEnterPrivateBrowsing: function TestPilotExperiment_onEnterPrivate() { this._logger.trace("Task is entering private browsing."); if (this.experimentIsRunning()) { @@ -633,6 +648,7 @@ TestPilotExperiment.prototype = { this._logger.info("Passed End Date - Switched Task Status to Finished"); this.changeStatus(TaskConstants.STATUS_FINISHED); this.onExperimentShutdown(); + this.doExperimentCleanup(); if (this._recursAutomatically) { this._reschedule(); @@ -800,8 +816,11 @@ TestPilotExperiment.prototype = { // database table of just opt-out messages; include study ID in metadata. let url = Application.prefs.getValue(DATA_UPLOAD_PREF, "") + "opt-out"; let logger = this._logger; + + this.onExperimentShutdown(); this.changeStatus(TaskConstants.STATUS_CANCELLED); this._dataStore.wipeAllData(); + this.doExperimentCleanup(); this._dateForDataDeletion = null; this._expirationDateForDataSubmission = null; logger.info("Opting out of test with reason " + reason); From 77af6a588ca895496c135aa96f32e602d18f4bd2 Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Fri, 13 Aug 2010 10:47:17 -0700 Subject: [PATCH 053/109] Bug 579779: Installing a new theme should mark it to be enabled. r=robstrong --- browser/base/content/browser.js | 2 +- .../base/content/test/browser_bug553455.js | 30 ++++++++++++++++++ .../extensions/amWebInstallListener.js | 8 +++++ .../extensions/test/xpinstall/Makefile.in | 1 + .../extensions/test/xpinstall/theme.xpi | Bin 0 -> 491 bytes 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 toolkit/mozapps/extensions/test/xpinstall/theme.xpi diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 359723fddc20..254ab69ecd0e 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -750,7 +750,7 @@ const gXPInstallObserver = { PopupNotifications.remove(notification); var needsRestart = installInfo.installs.some(function(i) { - return (i.addon.pendingOperations & AddonManager.PENDING_INSTALL) != 0; + return i.addon.pendingOperations != AddonManager.PENDING_NONE; }); if (needsRestart) { diff --git a/browser/base/content/test/browser_bug553455.js b/browser/base/content/test/browser_bug553455.js index 9aca0a433c44..a057c8578bf8 100644 --- a/browser/base/content/test/browser_bug553455.js +++ b/browser/base/content/test/browser_bug553455.js @@ -406,6 +406,36 @@ function test_reload() { gBrowser.loadURI(TESTROOT2 + "enabled.html"); }); }); +}, + +function test_theme() { + var pm = Services.perms; + pm.add(makeURI("http://example.com/"), "install", pm.ALLOW_ACTION); + + var triggers = encodeURIComponent(JSON.stringify({ + "Theme XPI": "theme.xpi" + })); + gBrowser.selectedTab = gBrowser.addTab(); + gBrowser.loadURI(TESTROOT + "installtrigger.html?" + triggers); + + // Wait for the install confirmation dialog + wait_for_install_dialog(function(aWindow) { + aWindow.document.documentElement.acceptDialog(); + + // Wait for the complete notification + wait_for_notification(function(aPanel) { + let notification = aPanel.childNodes[0]; + is(notification.id, "addon-install-complete", "Should have seen the install complete"); + is(notification.button.label, "Restart Now", "Should have seen the right button"); + is(notification.getAttribute("label"), + "Theme Test will be installed after you restart " + gApp + ".", + "Should have seen the right message"); + + gBrowser.removeTab(gBrowser.selectedTab); + Services.perms.remove("example.com", "install"); + runNextTest(); + }); + }); } ]; diff --git a/toolkit/mozapps/extensions/amWebInstallListener.js b/toolkit/mozapps/extensions/amWebInstallListener.js index 1023fee03d5d..3319e3ea2f6d 100644 --- a/toolkit/mozapps/extensions/amWebInstallListener.js +++ b/toolkit/mozapps/extensions/amWebInstallListener.js @@ -253,6 +253,14 @@ Installer.prototype = { onInstallEnded: function(aInstall) { aInstall.removeListener(this); this.installed.push(aInstall); + + // If installing a theme that is disabled and can be enabled then enable it + if (aInstall.addon.type == "theme" && + aInstall.addon.userDisabled == true && + aInstall.addon.appDisabled == false) { + aInstall.addon.userDisabled = false; + } + this.checkAllInstalled(); } }; diff --git a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in index d198459fddd6..00ff892e0eb4 100644 --- a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in +++ b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in @@ -91,6 +91,7 @@ _BROWSER_FILES = head.js \ signed-no-cn.xpi \ signed-untrusted.xpi \ signed-tampered.xpi \ + theme.xpi \ restartless.xpi \ incompatible.xpi \ empty.xpi \ diff --git a/toolkit/mozapps/extensions/test/xpinstall/theme.xpi b/toolkit/mozapps/extensions/test/xpinstall/theme.xpi new file mode 100644 index 0000000000000000000000000000000000000000..0c94a280b127f5ae985d02171bf03c58bdb7da37 GIT binary patch literal 491 zcmWIWW@Zs#U}E54a0~on(|Y>+4|_%ihB-_O4BQMd44HYwC5bsXdPON|p&^_M%q1xS zJ|J9L!Og(P@)f8OsF{JGH0X5RAp?Ou&$aIqtbSs#B&Ne@LC~qSwjnFZnc3F-61?dx z{OjvhS*H%IqN22P+s&KxrmYou(JpyuP$$k@Ur%vcu0!Wz}Mt7V?pK^MhS`f)1vf`>r}?M#_%0Ke=Mg-pdwU zviQ!6>yh5(Su4K&Z!Ab=G<9cNU#k0~@6cL1vs=l{{A-Vzw_jEMJ5OupuU)6g)ZR51 zPTXeu?~Wk*0&|ytmRx7pg-cr0doJF}V142H_M$a&RNw-R$BOE%s@mpu5nBouwplZq zrIf6Uw0wQ!PvMOYrZf>z`FZcmoqla_pSt1u#NT;~Rw%stIrXA^fHxzP95b$1kN^fS l0|PLq8J0AHSSWGA3W*c6_z3W3WdkW?1j0Zd-2&3h004!azY72W literal 0 HcmV?d00001 From 32e369134b57f839b282c3e3357a5b6b8107e678 Mon Sep 17 00:00:00 2001 From: Benoit Girard Date: Sun, 15 Aug 2010 13:42:09 -0400 Subject: [PATCH 054/109] Bug 583296 - Fix StartDrawingPlugin to correctly detect nested OS X OOPP paint events. r=josh --- dom/plugins/PluginUtilsOSX.mm | 3 --- widget/src/cocoa/nsChildView.h | 1 + widget/src/cocoa/nsChildView.mm | 8 +++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dom/plugins/PluginUtilsOSX.mm b/dom/plugins/PluginUtilsOSX.mm index 1f580d297b1d..a47d53e13e75 100644 --- a/dom/plugins/PluginUtilsOSX.mm +++ b/dom/plugins/PluginUtilsOSX.mm @@ -72,8 +72,6 @@ NPError mozilla::plugins::PluginUtilsOSX::ShowCocoaContextMenu(void* aMenu, int { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - // Leave out this code until we can fix painting. See bug 568513. - /* // Create a timer to process browser events while waiting // on the menu. This prevents the browser from hanging // during the lifetime of the menu. @@ -86,7 +84,6 @@ NPError mozilla::plugins::PluginUtilsOSX::ShowCocoaContextMenu(void* aMenu, int // not fire during the right click menu. [[NSRunLoop currentRunLoop] addTimer:eventTimer forMode:NSEventTrackingRunLoopMode]; - */ NSMenu* nsmenu = reinterpret_cast(aMenu); NSPoint screen_point = ::NSMakePoint(aX, aY); diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h index 2f030b412a96..334af1371c16 100644 --- a/widget/src/cocoa/nsChildView.h +++ b/widget/src/cocoa/nsChildView.h @@ -431,6 +431,7 @@ protected: PRPackedBool mDrawing; PRPackedBool mPluginDrawing; PRPackedBool mPluginIsCG; // true if this is a CoreGraphics plugin + PRPackedBool mIsDispatchPaint; // Is a paint event being dispatched NP_CGContext mPluginCGContext; #ifndef NP_NO_QUICKDRAW diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index 7b98f9bef246..e9747a6559df 100644 --- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -470,6 +470,7 @@ nsChildView::nsChildView() : nsBaseWidget() , mDrawing(PR_FALSE) , mPluginDrawing(PR_FALSE) , mPluginIsCG(PR_FALSE) +, mIsDispatchPaint(PR_FALSE) , mPluginInstanceOwner(nsnull) { #ifdef PR_LOGGING @@ -1250,7 +1251,7 @@ NS_IMETHODIMP nsChildView::StartDrawPlugin() // without regressing bug 409615. See bug 435041. (StartDrawPlugin() and // EndDrawPlugin() wrap every call to nsIPluginInstance::HandleEvent() -- // not just calls that "draw" or paint.) - if (!mPluginIsCG || (mView != [NSView focusView])) { + if (!mPluginIsCG || mIsDispatchPaint) { if (mPluginDrawing) return NS_ERROR_FAILURE; } @@ -1695,9 +1696,14 @@ NS_IMETHODIMP nsChildView::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStat } } + PRBool restoreIsDispatchPaint = mIsDispatchPaint; + mIsDispatchPaint = mIsDispatchPaint || event->eventStructType == NS_PAINT_EVENT; + if (mEventCallback) aStatus = (*mEventCallback)(event); + mIsDispatchPaint = restoreIsDispatchPaint; + return NS_OK; } From 284e94e2be8158d809e0adad3c5c7c3b39937366 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Sun, 15 Aug 2010 15:49:21 -0700 Subject: [PATCH 055/109] Bug 587494: Check whether our ExternalResource has a viewer before calling Hide() on it, to fix null-crash. r=roc a=blocking --- content/base/src/nsDocument.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index ecb51758b05d..4a77adfbf42f 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -826,7 +826,9 @@ ExternalResourceHider(nsIURI* aKey, nsExternalResourceMap::ExternalResource* aData, void* aClosure) { - aData->mViewer->Hide(); + if (aData->mViewer) { + aData->mViewer->Hide(); + } return PL_DHASH_NEXT; } From c31f35763952fe16cc4ea22ea8bdb4709dc6c410 Mon Sep 17 00:00:00 2001 From: Edmund Wong Date: Sun, 15 Aug 2010 15:50:02 -0700 Subject: [PATCH 056/109] Bug 585336: Fix "a the" in comments (for General core code). r=timeless a=NPOTB (comment-only) --- accessible/src/base/nsAccessible.cpp | 2 +- extensions/spellcheck/src/mozInlineSpellChecker.h | 2 +- ipc/chromium/src/base/path_service.h | 2 +- ipc/chromium/src/chrome/common/win_util.cc | 2 +- js/src/ctypes/libffi/src/powerpc/asm.h | 2 +- js/src/tests/bisect.sh | 2 +- layout/tables/nsCellMap.cpp | 2 +- widget/src/windows/nsDataObj.cpp | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index a1bf9f6a17ec..3eeda84e2f47 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -1100,7 +1100,7 @@ nsAccessible::TakeFocus() nsIContent* focusContent = mContent; // If the current element can't take real DOM focus and if it has an ID and - // ancestor with a the aria-activedescendant attribute present, then set DOM + // an ancestor with an aria-activedescendant attribute present, then set DOM // focus to that ancestor and set aria-activedescendant on the ancestor to // the ID of the desired element. if (!frame->IsFocusable()) { diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.h b/extensions/spellcheck/src/mozInlineSpellChecker.h index b18214ce2375..06e5f4203405 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.h +++ b/extensions/spellcheck/src/mozInlineSpellChecker.h @@ -279,7 +279,7 @@ public: mozInlineSpellStatus* aStatus, PRBool* aDoneChecking); - // helper routine to determine if a point is inside of a the passed in selection. + // helper routine to determine if a point is inside of the passed in selection. nsresult IsPointInSelection(nsISelection *aSelection, nsIDOMNode *aNode, PRInt32 aOffset, diff --git a/ipc/chromium/src/base/path_service.h b/ipc/chromium/src/base/path_service.h index 54d7ade6e8bb..86d6a4ae3086 100644 --- a/ipc/chromium/src/base/path_service.h +++ b/ipc/chromium/src/base/path_service.h @@ -62,7 +62,7 @@ class PathService { // Otherwise, true is returned. // // WARNING: This function could be called on any thread from which the - // PathService is used, so a the ProviderFunc MUST BE THREADSAFE. + // PathService is used, so the ProviderFunc MUST BE THREADSAFE. // typedef bool (*ProviderFunc)(int, FilePath*); diff --git a/ipc/chromium/src/chrome/common/win_util.cc b/ipc/chromium/src/chrome/common/win_util.cc index 95fc1323d032..095438ced440 100644 --- a/ipc/chromium/src/chrome/common/win_util.cc +++ b/ipc/chromium/src/chrome/common/win_util.cc @@ -658,7 +658,7 @@ bool IsNumPadDigit(int key_code, bool extended_key) { return true; // Check for num pad keys without NumLock. - // Note: there is no easy way to know if a the key that was pressed comes from + // Note: there is no easy way to know if a key that was pressed comes from // the num pad or the rest of the keyboard. Investigating how // TranslateMessage() generates the WM_KEYCHAR from an // ALT + it appears it looks at the extended key flag diff --git a/js/src/ctypes/libffi/src/powerpc/asm.h b/js/src/ctypes/libffi/src/powerpc/asm.h index e86e6b091476..994f62d079d4 100644 --- a/js/src/ctypes/libffi/src/powerpc/asm.h +++ b/js/src/ctypes/libffi/src/powerpc/asm.h @@ -42,7 +42,7 @@ /* If compiled for profiling, call `_mcount' at the start of each function. */ #ifdef PROF -/* The mcount code relies on a the return address being on the stack +/* The mcount code relies on the return address being on the stack to locate our caller and so it can restore it; so store one just for its benefit. */ #ifdef PIC diff --git a/js/src/tests/bisect.sh b/js/src/tests/bisect.sh index d923f1f7ea42..3f51044f3c0e 100755 --- a/js/src/tests/bisect.sh +++ b/js/src/tests/bisect.sh @@ -155,7 +155,7 @@ PYTHON=$savepython # TEST_JSDIR must be set after set-build-env.sh is called # on Windows since TEST_DIR can be modified in set-build-env.sh -# from the pure cygwin path /work/... to a the cygwin windows path +# from the pure cygwin path /work/... to the cygwin windows path # /c/work/... TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js} diff --git a/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp index eaca2f9e9aeb..32405a114869 100644 --- a/layout/tables/nsCellMap.cpp +++ b/layout/tables/nsCellMap.cpp @@ -1136,7 +1136,7 @@ nsTableCellMap::SetBCBorderCorner(Corner aCorner, cellData = (BCCellData*)cellMap->AppendCell(*this, nsnull, 0, PR_FALSE, damageArea); } } - else { // must be a the bottom of the table + else { // must be at the bottom of the table bcData = GetBottomMostBorder(xPos); } } diff --git a/widget/src/windows/nsDataObj.cpp b/widget/src/windows/nsDataObj.cpp index fb2365135290..3e65c53866f7 100644 --- a/widget/src/windows/nsDataObj.cpp +++ b/widget/src/windows/nsDataObj.cpp @@ -830,8 +830,8 @@ nsDataObj :: GetDib ( const nsACString& inFlavor, FORMATETC &, STGMEDIUM & aSTG } if ( image ) { - // use a the helper class to build up a bitmap. We now own the bits, - // and pass them back to the OS in |aSTG|. + // use the |nsImageToClipboard| helper class to build up a bitmap. We now own + // the bits, and pass them back to the OS in |aSTG|. nsImageToClipboard converter ( image ); HANDLE bits = nsnull; nsresult rv = converter.GetPicture ( &bits ); From 79cfd128da843a79e58cb0743be0744ed87ba725 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 15 Aug 2010 18:37:53 -0700 Subject: [PATCH 057/109] Bug 587530 - Put nsICapturePicker in the properly named xpt, and package it for Firefox, r=roc, a=gavin --- browser/installer/package-manifest.in | 1 + layout/forms/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 91d3332108c0..1d95a5957032 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -187,6 +187,7 @@ @BINPATH@/components/jetpack.xpt @BINPATH@/components/jsdservice.xpt @BINPATH@/components/layout_base.xpt +@BINPATH@/components/layout_forms.xpt #ifdef NS_PRINTING @BINPATH@/components/layout_printing.xpt #endif diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 3bcc495d7d6e..78a28ef46f98 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -49,6 +49,7 @@ DIRS += test endif MODULE = layout +XPIDL_MODULE = layout_forms LIBRARY_NAME = gkforms_s LIBXUL_LIBRARY = 1 From bdf117ec924cfa7b12173e0966b1b2ea1594ad7e Mon Sep 17 00:00:00 2001 From: Benoit Girard Date: Sun, 15 Aug 2010 23:48:51 -0400 Subject: [PATCH 058/109] Bug 583296 - Release timer resources after context menu. r=josh a=josh --HG-- extra : rebase_source : 70de646d179dbfcd939e3558a15e6e23dacfcc30 --- dom/plugins/PluginUtilsOSX.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/plugins/PluginUtilsOSX.mm b/dom/plugins/PluginUtilsOSX.mm index a47d53e13e75..0208acd185d5 100644 --- a/dom/plugins/PluginUtilsOSX.mm +++ b/dom/plugins/PluginUtilsOSX.mm @@ -90,12 +90,12 @@ NPError mozilla::plugins::PluginUtilsOSX::ShowCocoaContextMenu(void* aMenu, int [nsmenu popUpMenuPositioningItem:nil atLocation:screen_point inView:nil]; - //[eventTimer invalidate]; - //[eventProcessor release]; + [eventTimer invalidate]; + [eventProcessor release]; return NPERR_NO_ERROR; - NS_OBJC_END_TRY_ABORT_BLOCK; + NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NPERR_GENERIC_ERROR); } void mozilla::plugins::PluginUtilsOSX::InvokeNativeEventLoop() From 88dab5584f4231897decd9b5fbb49d27b5de88b2 Mon Sep 17 00:00:00 2001 From: Chris Leary Date: Sat, 14 Aug 2010 00:34:14 -0700 Subject: [PATCH 059/109] Try to fix intermittent refcount assertions in the presence of more than one thread. Bug 587277 - TM: ExecutablePool release race. r=sayrer --- js/src/assembler/jit/ExecutableAllocator.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h index 48ca97da5422..0f4033af1fd6 100644 --- a/js/src/assembler/jit/ExecutableAllocator.h +++ b/js/src/assembler/jit/ExecutableAllocator.h @@ -28,11 +28,12 @@ #include // for ptrdiff_t #include -#include +#include "assembler/wtf/Assertions.h" #include "jsapi.h" #include "jsprvtd.h" #include "jsvector.h" +#include "jslock.h" #if WTF_PLATFORM_IPHONE #include @@ -80,7 +81,7 @@ inline size_t roundUpAllocationSize(size_t request, size_t granularity) // Round up to next page boundary size_t size = request + (granularity - 1); size = size & ~(granularity - 1); - ASSERT(size >= request); + JS_ASSERT(size >= request); return size; } @@ -104,16 +105,16 @@ private: typedef js::Vector AllocationList; // Reference count for automatic reclamation. - unsigned m_refCount; + jsrefcount m_refCount; public: // It should be impossible for us to roll over, because only small // pools have multiple holders, and they have one holder per chunk // of generated code, and they only hold 16KB or so of code. - void addRef() { ++m_refCount; } + void addRef() { JS_ATOMIC_INCREMENT(&m_refCount); } void release() { - ASSERT(m_refCount != 0); - if (--m_refCount == 0) + JS_ASSERT(m_refCount != 0); + if (JS_ATOMIC_DECREMENT(&m_refCount) == 0) delete this; } @@ -125,7 +126,7 @@ public: void* alloc(size_t n) { - ASSERT(m_freePtr <= m_end); + JS_ASSERT(m_freePtr <= m_end); // Round 'n' up to a multiple of word size; if all allocations are of // word sized quantities, then all subsequent allocations will be aligned. @@ -339,7 +340,7 @@ inline void* ExecutablePool::poolAllocate(size_t n) if (!result.pages) CRASH(); // Failed to allocate - ASSERT(m_end >= m_freePtr); + JS_ASSERT(m_end >= m_freePtr); if ((allocSize - n) > static_cast(m_end - m_freePtr)) { // Replace allocation pool m_freePtr = result.pages + n; From 8b47cecc9e08c66ddd2b97f9e15c72ae16f12285 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Sun, 15 Aug 2010 23:32:10 -0700 Subject: [PATCH 060/109] Bug 587363: Don't error when YASM is missing in a --disable-compile-environment build. r=Callek a=Mossop --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index cc3aae510d4c..5805aa3cd82f 100644 --- a/configure.in +++ b/configure.in @@ -5977,7 +5977,7 @@ if test -n "$MOZ_WEBM"; then fi ;; esac - if test -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then + if test "$COMPILE_ENVIROMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.]) fi fi # end !WINNT_x86_MSVC From a0f71a230a7bb863a315a05afaede8968903d438 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:01 +0200 Subject: [PATCH 061/109] Bug 586316 - Part 1: Use MITER_OR_BEVEL to adhere to cairo expected behavior. r=jrmuizel --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index a51252df304a..2387fe848fe5 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -1064,7 +1064,7 @@ _cairo_d2d_create_strokestyle_for_stroke_style(const cairo_stroke_style_t *style D2D1_LINE_JOIN line_join = D2D1_LINE_JOIN_MITER; switch (style->line_join) { case CAIRO_LINE_JOIN_MITER: - line_join = D2D1_LINE_JOIN_MITER; + line_join = D2D1_LINE_JOIN_MITER_OR_BEVEL; break; case CAIRO_LINE_JOIN_ROUND: line_join = D2D1_LINE_JOIN_ROUND; From ed98dd5dc0e5867db18feb3922621ffd3ec2f095 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:02 +0200 Subject: [PATCH 062/109] Bug 587316 - Part 2: Disable degenerate rect stroking test. r=jrmuizel --- content/canvas/test/test_canvas.html | 39 +++++++++++++++++++--------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html index f1b9233ffd84..e500a8f00138 100644 --- a/content/canvas/test/test_canvas.html +++ b/content/canvas/test/test_canvas.html @@ -8,6 +8,17 @@ SimpleTest.waitForExplicitFinish(); +function IsD2DEnabled() { + var enabled = false; + + try { + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + enabled = Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled; + } catch(e) {} + + return enabled; +} + @@ -13807,13 +13818,15 @@ function test_2d_path_rect_zero_3() { var canvas = document.getElementById('c438'); var ctx = canvas.getContext('2d'); -ctx.strokeStyle = '#f00'; -ctx.lineWidth = 100; -ctx.beginPath(); -ctx.rect(50, 25, 0, 0); -ctx.stroke(); -isPixel(ctx, 50,25, 0,0,0,0, 0); - +if (!IsD2DEnabled()) { + // Disabled for D2D until we can figure out Bug 587554. + ctx.strokeStyle = '#f00'; + ctx.lineWidth = 100; + ctx.beginPath(); + ctx.rect(50, 25, 0, 0); + ctx.stroke(); + isPixel(ctx, 50,25, 0,0,0,0, 0); +} } @@ -18054,11 +18067,13 @@ function test_2d_strokeRect_zero_1() { var canvas = document.getElementById('c580'); var ctx = canvas.getContext('2d'); -ctx.strokeStyle = '#f00'; -ctx.lineWidth = 250; -ctx.strokeRect(50, 25, 0, 0); -isPixel(ctx, 50,25, 0,0,0,0, 0); - +if (!IsD2DEnabled()) { + // Disabled for D2D until we can figure out Bug 587554. + ctx.strokeStyle = '#f00'; + ctx.lineWidth = 250; + ctx.strokeRect(50, 25, 0, 0); + isPixel(ctx, 50,25, 0,0,0,0, 0); +} } From c1a47676c39b51ce5b82e15be89e75c66b7c7150 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:02 +0200 Subject: [PATCH 063/109] Bug 587316 - Part 3: Allow custom operators when doing masking. r=jrmuizel --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 53 +++++++++++++++-------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index 2387fe848fe5..13bc2f3f1402 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -2953,12 +2953,23 @@ _cairo_d2d_mask(void *surface, cairo_int_status_t status; - _begin_draw_state(d2dsurf); - status = (cairo_int_status_t)_cairo_d2d_set_clip (d2dsurf, clip); - - if (unlikely (status)) - return status; + RefPtr target_rt = d2dsurf->rt; +#ifndef ALWAYS_MANUAL_COMPOSITE + if (op != CAIRO_OPERATOR_OVER) { +#endif + target_rt = _cairo_d2d_get_temp_rt(d2dsurf, clip); + if (!target_rt) { + return CAIRO_INT_STATUS_UNSUPPORTED; + } +#ifndef ALWAYS_MANUAL_COMPOSITE + } else { + _begin_draw_state(d2dsurf); + status = (cairo_int_status_t)_cairo_d2d_set_clip (d2dsurf, clip); + if (unlikely(status)) + return status; + } +#endif status = (cairo_int_status_t)_cairo_surface_mask_extents (&d2dsurf->base, op, source, @@ -2989,9 +3000,13 @@ _cairo_d2d_mask(void *surface, (cairo_solid_pattern_t*)mask; if (solidPattern->content = CAIRO_CONTENT_ALPHA) { brush->SetOpacity((FLOAT)solidPattern->color.alpha); - d2dsurf->rt->FillRectangle(rect, - brush); + target_rt->FillRectangle(rect, + brush); brush->SetOpacity(1.0); + + if (target_rt.get() != d2dsurf->rt.get()) { + return _cairo_d2d_blend_temp_surface(d2dsurf, op, target_rt, clip); + } return CAIRO_INT_STATUS_SUCCESS; } } @@ -3004,17 +3019,21 @@ _cairo_d2d_mask(void *surface, if (!d2dsurf->maskLayer) { d2dsurf->rt->CreateLayer(&d2dsurf->maskLayer); } - d2dsurf->rt->PushLayer(D2D1::LayerParameters(D2D1::InfiniteRect(), - 0, - D2D1_ANTIALIAS_MODE_ALIASED, - D2D1::IdentityMatrix(), - 1.0, - opacityBrush), - d2dsurf->maskLayer); + target_rt->PushLayer(D2D1::LayerParameters(D2D1::InfiniteRect(), + 0, + D2D1_ANTIALIAS_MODE_ALIASED, + D2D1::IdentityMatrix(), + 1.0, + opacityBrush), + d2dsurf->maskLayer); - d2dsurf->rt->FillRectangle(rect, - brush); - d2dsurf->rt->PopLayer(); + target_rt->FillRectangle(rect, + brush); + target_rt->PopLayer(); + + if (target_rt.get() != d2dsurf->rt.get()) { + return _cairo_d2d_blend_temp_surface(d2dsurf, op, target_rt, clip); + } return CAIRO_INT_STATUS_SUCCESS; } From 0e90af301efc6b6059fedce022855126a2cd49ed Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:02 +0200 Subject: [PATCH 064/109] Bug 587316 - Part 4: Support CAIRO_EXTEND_NONE for D2D source surfaces. r=jrmuizel --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index 13bc2f3f1402..bde2e5fa01fe 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -1660,13 +1660,10 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf, extendMode = D2D1_EXTEND_MODE_CLAMP; key = &bitmap_key_nonextend; /** - * For image surfaces we create a slightly larger bitmap with - * a transparent border around it for this case. Need to translate - * for that. + * We create a slightly larger bitmap with a transparent border + * around it for this case. Need to translate for that. */ - if (surfacePattern->surface->type == CAIRO_SURFACE_TYPE_IMAGE) { - cairo_matrix_translate(&mat, -1.0, -1.0); - } + cairo_matrix_translate(&mat, -1.0, -1.0); } else if (pattern->extend == CAIRO_EXTEND_REPEAT) { extendMode = D2D1_EXTEND_MODE_WRAP; } else if (pattern->extend == CAIRO_EXTEND_REFLECT) { @@ -1701,9 +1698,21 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf, } _cairo_d2d_update_surface_bitmap(srcSurf); - sourceBitmap = srcSurf->surfaceBitmap; - _cairo_d2d_flush(srcSurf); + + if (pattern->extend == CAIRO_EXTEND_NONE) { + ID2D1Bitmap *srcSurfBitmap = srcSurf->surfaceBitmap; + d2dsurf->rt->CreateBitmap( + D2D1::SizeU(srcSurfBitmap->GetPixelSize().width + 2, + srcSurfBitmap->GetPixelSize().height + 2), + D2D1::BitmapProperties(srcSurfBitmap->GetPixelFormat()), + &sourceBitmap); + D2D1_POINT_2U point = D2D1::Point2U(1, 1); + sourceBitmap->CopyFromBitmap(&point, srcSurfBitmap, NULL); + } else { + sourceBitmap = srcSurf->surfaceBitmap; + } + } else if (surfacePattern->surface->type == CAIRO_SURFACE_TYPE_IMAGE) { cairo_image_surface_t *srcSurf = reinterpret_cast(surfacePattern->surface); From 47379691ab96954869f79ffe40350097994db220 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:02 +0200 Subject: [PATCH 065/109] Bug 587316 - Part 5: Disable failing rectangle drawing test failing due to D2D inaccuracy. r=jrmuizel --- content/canvas/test/test_canvas.html | 58 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html index e500a8f00138..fb67b22191f3 100644 --- a/content/canvas/test/test_canvas.html +++ b/content/canvas/test/test_canvas.html @@ -14236,37 +14236,39 @@ function test_2d_path_stroke_scale2() { var canvas = document.getElementById('c451'); var ctx = canvas.getContext('2d'); -ctx.fillStyle = '#f00'; -ctx.fillRect(0, 0, 100, 50); +if (!IsD2DEnabled()) { + // On D2D a rasterization bug causes a small discrepancy here. See bug 587316 + ctx.fillStyle = '#f00'; + ctx.fillRect(0, 0, 100, 50); -ctx.beginPath(); -ctx.rect(25, 12.5, 50, 25); -ctx.save(); -ctx.rotate(Math.PI/2); -ctx.scale(25, 50); -ctx.strokeStyle = '#0f0'; -ctx.stroke(); -ctx.restore(); + ctx.beginPath(); + ctx.rect(25, 12.5, 50, 25); + ctx.save(); + ctx.rotate(Math.PI/2); + ctx.scale(25, 50); + ctx.strokeStyle = '#0f0'; + ctx.stroke(); + ctx.restore(); -ctx.beginPath(); -ctx.rect(-25, -12.5, 150, 75); -ctx.save(); -ctx.rotate(Math.PI/2); -ctx.scale(25, 50); -ctx.strokeStyle = '#f00'; -ctx.stroke(); -ctx.restore(); - -isPixel(ctx, 0,0, 0,255,0,255, 0); -isPixel(ctx, 50,0, 0,255,0,255, 0); -isPixel(ctx, 99,0, 0,255,0,255, 0); -isPixel(ctx, 0,25, 0,255,0,255, 0); -isPixel(ctx, 50,25, 0,255,0,255, 0); -isPixel(ctx, 99,25, 0,255,0,255, 0); -isPixel(ctx, 0,49, 0,255,0,255, 0); -isPixel(ctx, 50,49, 0,255,0,255, 0); -isPixel(ctx, 99,49, 0,255,0,255, 0); + ctx.beginPath(); + ctx.rect(-25, -12.5, 150, 75); + ctx.save(); + ctx.rotate(Math.PI/2); + ctx.scale(25, 50); + ctx.strokeStyle = '#f00'; + ctx.stroke(); + ctx.restore(); + isPixel(ctx, 0,0, 0,255,0,255, 0); + isPixel(ctx, 50,0, 0,255,0,255, 0); + isPixel(ctx, 99,0, 0,255,0,255, 0); + isPixel(ctx, 0,25, 0,255,0,255, 0); + isPixel(ctx, 50,25, 0,255,0,255, 0); + isPixel(ctx, 99,25, 0,255,0,255, 0); + isPixel(ctx, 0,49, 0,255,0,255, 0); + isPixel(ctx, 50,49, 0,255,0,255, 0); + isPixel(ctx, 99,49, 0,255,0,255, 0); +} } From 0a1ae5afa754e604c2251e457e4a13b654b46adf Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 066/109] Bug 587316 - Part 6: Disable failing gradient test on D2D. r=jrmuizel --- content/canvas/test/test_canvas.html | 59 +++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html index fb67b22191f3..7ff9eba7e405 100644 --- a/content/canvas/test/test_canvas.html +++ b/content/canvas/test/test_canvas.html @@ -5699,34 +5699,37 @@ function test_2d_gradient_interpolate_overlap() { var canvas = document.getElementById('c215'); var ctx = canvas.getContext('2d'); -canvas.width = 200; -var g = ctx.createLinearGradient(0, 0, 200, 0); -g.addColorStop(0, '#f00'); -g.addColorStop(0, '#ff0'); -g.addColorStop(0.25, '#00f'); -g.addColorStop(0.25, '#0f0'); -g.addColorStop(0.25, '#0f0'); -g.addColorStop(0.25, '#0f0'); -g.addColorStop(0.25, '#ff0'); -g.addColorStop(0.5, '#00f'); -g.addColorStop(0.5, '#0f0'); -g.addColorStop(0.75, '#00f'); -g.addColorStop(0.75, '#f00'); -g.addColorStop(0.75, '#ff0'); -g.addColorStop(0.5, '#0f0'); -g.addColorStop(0.5, '#0f0'); -g.addColorStop(0.5, '#ff0'); -g.addColorStop(1, '#00f'); -ctx.fillStyle = g; -ctx.fillRect(0, 0, 200, 50); -isPixel(ctx, 49,25, 0,0,255,255, 16); -isPixel(ctx, 51,25, 255,255,0,255, 16); -isPixel(ctx, 99,25, 0,0,255,255, 16); -isPixel(ctx, 101,25, 255,255,0,255, 16); -isPixel(ctx, 149,25, 0,0,255,255, 16); -isPixel(ctx, 151,25, 255,255,0,255, 16); - - +if (!IsD2DEnabled()) { + // Only run this on non-D2D. On D2D the different nature of how gradients + // are drawn makes it so we cannot guarantee these stops are completely + // hard. + canvas.width = 200; + var g = ctx.createLinearGradient(0, 0, 200, 0); + g.addColorStop(0, '#f00'); + g.addColorStop(0, '#ff0'); + g.addColorStop(0.25, '#00f'); + g.addColorStop(0.25, '#0f0'); + g.addColorStop(0.25, '#0f0'); + g.addColorStop(0.25, '#0f0'); + g.addColorStop(0.25, '#ff0'); + g.addColorStop(0.5, '#00f'); + g.addColorStop(0.5, '#0f0'); + g.addColorStop(0.75, '#00f'); + g.addColorStop(0.75, '#f00'); + g.addColorStop(0.75, '#ff0'); + g.addColorStop(0.5, '#0f0'); + g.addColorStop(0.5, '#0f0'); + g.addColorStop(0.5, '#ff0'); + g.addColorStop(1, '#00f'); + ctx.fillStyle = g; + ctx.fillRect(0, 0, 200, 50); + isPixel(ctx, 49,25, 0,0,255,255, 16); + isPixel(ctx, 51,25, 255,255,0,255, 16); + isPixel(ctx, 99,25, 0,0,255,255, 16); + isPixel(ctx, 101,25, 255,255,0,255, 16); + isPixel(ctx, 149,25, 0,0,255,255, 16); + isPixel(ctx, 151,25, 255,255,0,255, 16); +} } From 7d7234561ebe60328be4a2c80c7e1fb18989bbc9 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 067/109] Bug 587318: Only pad horizontal glyph metrics. r=jdaggett --- gfx/cairo/cairo/src/cairo-dwrite-font.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp index 238539b1938a..36c3c25a5306 100644 --- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp +++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp @@ -604,8 +604,6 @@ _cairo_dwrite_scaled_font_init_glyph_metrics(cairo_dwrite_scaled_font_t *scaled_ extents.width > 0 && extents.height > 0) { extents.width += scaled_font->mat_inverse.xx * 2; extents.x_bearing -= scaled_font->mat_inverse.xx; - extents.height += scaled_font->mat_inverse.yy * 2; - extents.y_bearing -= scaled_font->mat_inverse.yy; } _cairo_scaled_glyph_set_metrics (scaled_glyph, From 481d148c13353f2abb7938e1903d563e5ab68510 Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 068/109] Bug 587395: Expose whether DWrite is enabled through nsIGfxInfo. r=joedrew --- gfx/thebes/gfxWindowsPlatform.h | 3 +++ widget/public/nsIGfxInfo.idl | 3 +++ widget/src/windows/GfxInfo.cpp | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h index 9b8d6230de39..364c05524a4b 100644 --- a/gfx/thebes/gfxWindowsPlatform.h +++ b/gfx/thebes/gfxWindowsPlatform.h @@ -213,6 +213,9 @@ public: #ifdef CAIRO_HAS_DWRITE_FONT IDWriteFactory *GetDWriteFactory() { return mDWriteFactory; } + inline PRBool DWriteEnabled() { return !!mDWriteFactory; } +#else + inline PRBool DWriteEnabled() { return PR_FALSE; } #endif #ifdef CAIRO_HAS_D2D_SURFACE cairo_device_t *GetD2DDevice() { return mD2DDevice; } diff --git a/widget/public/nsIGfxInfo.idl b/widget/public/nsIGfxInfo.idl index e2dc9b9812e6..74eebf2bda6b 100644 --- a/widget/public/nsIGfxInfo.idl +++ b/widget/public/nsIGfxInfo.idl @@ -38,9 +38,12 @@ #include "nsISupports.idl" +/* NOTE: this interface is completely undesigned, not stable and likely to change */ + [scriptable, uuid(5C05E5B7-0FCC-4070-BF6B-58BC33ECA427)] interface nsIGfxInfo : nsISupports { readonly attribute boolean D2DEnabled; + readonly attribute boolean DWriteEnabled; }; diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp index 2bc2bd064c08..c5aefd8aeca9 100644 --- a/widget/src/windows/GfxInfo.cpp +++ b/widget/src/windows/GfxInfo.cpp @@ -47,3 +47,9 @@ nsresult GfxInfo::GetD2DEnabled(PRBool *aEnabled) *aEnabled = gfxWindowsPlatform::GetPlatform()->GetRenderMode() == gfxWindowsPlatform::RENDER_DIRECT2D; return NS_OK; } + +nsresult GfxInfo::GetDWriteEnabled(PRBool *aEnabled) +{ + *aEnabled = gfxWindowsPlatform::GetPlatform()->DWriteEnabled(); + return NS_OK; +} From 79a67e190d6a67d79c2f3d3a3e0aede11d63da26 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 069/109] Bug 587319: We do not know the metrics yet for DWrite fonts. Disable when using DWrite. r=joedrew --- .../test/test_selection_underline.html | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/layout/generic/test/test_selection_underline.html b/layout/generic/test/test_selection_underline.html index e124219404c0..4d37145d097e 100644 --- a/layout/generic/test/test_selection_underline.html +++ b/layout/generic/test/test_selection_underline.html @@ -63,15 +63,19 @@ const kIsLinux = navigator.platform.indexOf("Linux") == 0; * 5: font-family: mplus-1p-regular.ttf; font-size: 52px; */ var gFontMetrics = []; + if (kIsWin) { - gFontMetrics = [ - { emHeight: 16, ascent: 13, offset: -2, lineHeight: 1, descentLimit: 3 }, - { emHeight: 16, ascent: 17, offset: -2, lineHeight: 1, descentLimit: 5 }, - { emHeight: 32, ascent: 26, offset: -4, lineHeight: 1, descentLimit: 6 }, - { emHeight: 32, ascent: 34, offset: -4, lineHeight: 2, descentLimit: 10 }, - { emHeight: 52, ascent: 42, offset: -7, lineHeight: 1, descentLimit: 10 }, - { emHeight: 52, ascent: 56, offset: -7, lineHeight: 3, descentLimit: 17 } - ]; + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + if (!Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).DWriteEnabled) { + gFontMetrics = [ + { emHeight: 16, ascent: 13, offset: -2, lineHeight: 1, descentLimit: 3 }, + { emHeight: 16, ascent: 17, offset: -2, lineHeight: 1, descentLimit: 5 }, + { emHeight: 32, ascent: 26, offset: -4, lineHeight: 1, descentLimit: 6 }, + { emHeight: 32, ascent: 34, offset: -4, lineHeight: 2, descentLimit: 10 }, + { emHeight: 52, ascent: 42, offset: -7, lineHeight: 1, descentLimit: 10 }, + { emHeight: 52, ascent: 56, offset: -7, lineHeight: 3, descentLimit: 17 } + ]; + } } /* From 7769ad7bd1c57d9bdb166c831db1b1c78a9524e9 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 070/109] Bug 587320: Use proper paint counts on D2D due to dual pass rendering. r=joedrew --- .../plugin/test/mochitest/test_painting.html | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/plugin/test/mochitest/test_painting.html b/modules/plugin/test/mochitest/test_painting.html index 4bf2be476aad..f40d0f9327a6 100644 --- a/modules/plugin/test/mochitest/test_painting.html +++ b/modules/plugin/test/mochitest/test_painting.html @@ -80,15 +80,32 @@ function show() { } function invalidate() { - is(clipped.getPaintCount(), 1, "partially clipped plugin painted once"); - + var paintCount = 1; + try { + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + if (Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled) { + paintCount = 2; + } + } catch(e) {} + + is(clipped.getPaintCount(), paintCount, "partially clipped plugin painted once"); + clipped.setColor("FF00FF00"); // plugin invalidates waitForPaint(done); } function done() { - is(clipped.getPaintCount(), 2, "painted after invalidate"); + var paintCount = 2; + try { + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + if (Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled) { + paintCount = 4; + } + } catch(e) {} + // With D2D we paint windowless plugin with 2 passes, 4 paints are expected. + is(clipped.getPaintCount(), paintCount, "painted after invalidate"); + SimpleTest.finish(); } From 666b9f9b26de7218a8fafc0751abcffbb4f1ca67 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 071/109] Bug 587293: When D2D is preffed off, disable DWrite if it wasn't explicitly preffed on. r=joedrew --- gfx/thebes/gfxWindowsPlatform.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 72b1e7429d7a..ac09343939fa 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -276,6 +276,11 @@ gfxWindowsPlatform::gfxWindowsPlatform() PRInt32 rmode; if (NS_SUCCEEDED(pref->GetIntPref("mozilla.widget.render-mode", &rmode))) { if (rmode >= 0 && rmode < RENDER_MODE_MAX) { +#ifdef CAIRO_HAS_DWRITE_FONT + if (rmode != RENDER_DIRECT2D && !useDirectWrite) { + mDWriteFactory = nsnull; + } +#endif #ifndef CAIRO_HAS_DDRAW_SURFACE if (rmode == RENDER_DDRAW || rmode == RENDER_DDRAW_GL) rmode = RENDER_IMAGE_STRETCH24; From fa4bd9fcf4e34a8578087bcbea1fe26693df192d Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 072/109] Bug 587317: Fix test_offsets to succeed on all platforms including D2D. r=dbaron --- dom/tests/mochitest/general/test_offsets.js | 48 ++++++++++++--------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dom/tests/mochitest/general/test_offsets.js b/dom/tests/mochitest/general/test_offsets.js index e193190e9067..c1884940a9c9 100644 --- a/dom/tests/mochitest/general/test_offsets.js +++ b/dom/tests/mochitest/general/test_offsets.js @@ -26,6 +26,22 @@ function testElements(baseid, callback) callback(); } +function toNearestAppunit(v) +{ + // 60 appunits per CSS pixel; round result to the nearest appunit + return Math.round(v*60)/60; +} + +function floorToNearestAppunit(v) +{ + return Math.floor(toNearestAppunit(v)); +} + +function isEqualAppunits(a, b, msg) +{ + is(toNearestAppunit(a), toNearestAppunit(b), msg); +} + function testElement(element) { var offsetParent = element.getAttribute("_offsetParent"); @@ -51,10 +67,11 @@ function testElement(element) var scrollWidth, scrollHeight, clientWidth, clientHeight; if (element.id == "scrollbox") { var lastchild = $("lastline"); - scrollWidth = Math.floor(lastchild.getBoundingClientRect().width) + paddingLeft + paddingRight; - var contentsHeight = element.lastChild.getBoundingClientRect().bottom - - element.firstChild.getBoundingClientRect().top; - scrollHeight = Math.floor(contentsHeight) + paddingTop + paddingBottom; + scrollWidth = floorToNearestAppunit(lastchild.getBoundingClientRect().width + paddingLeft + paddingRight); + var top = element.firstChild.getBoundingClientRect().top; + var bottom = element.lastChild.getBoundingClientRect().bottom; + var contentsHeight = bottom - top; + scrollHeight = floorToNearestAppunit(contentsHeight + paddingTop + paddingBottom); clientWidth = paddingLeft + width + paddingRight - scrollbarWidth; clientHeight = paddingTop + height + paddingBottom - scrollbarHeight; } @@ -77,15 +94,13 @@ function testElement(element) checkClientState(element, borderLeft, borderTop, clientWidth, clientHeight, element.id); var boundingrect = element.getBoundingClientRect(); - is(Math.round(boundingrect.width), borderLeft + paddingLeft + width + paddingRight + borderRight, + isEqualAppunits(boundingrect.width, borderLeft + paddingLeft + width + paddingRight + borderRight, element.id + " bounding rect width"); - is(Math.round(boundingrect.height), borderTop + paddingTop + height + paddingBottom + borderBottom, + isEqualAppunits(boundingrect.height, borderTop + paddingTop + height + paddingBottom + borderBottom, element.id + " bounding rect height"); - is(Math.round(boundingrect.right - boundingrect.left), - borderLeft + paddingLeft + width + paddingRight + borderRight, + isEqualAppunits(boundingrect.right - boundingrect.left, boundingrect.width, element.id + " bounding rect right"); - is(Math.round(boundingrect.bottom - boundingrect.top), - borderTop + paddingTop + height + paddingBottom + borderBottom, + isEqualAppunits(boundingrect.bottom - boundingrect.top, boundingrect.height, element.id + " bounding rect bottom"); var rects = element.getClientRects(); @@ -98,12 +113,6 @@ function testElement(element) is(rects[0].right, boundingrect.right, element.id + " getClientRects right"); is(rects[0].bottom, boundingrect.bottom, element.id + " getClientRects bottom"); } - - var root = document.documentElement; - gPreviousRight = Math.round(boundingrect.right) - - gcs(root, "paddingLeft") - gcs(root, "borderLeftWidth"); - gPreviousBottom = Math.round(boundingrect.bottom) - - gcs(root, "paddingTop") - gcs(root, "borderTopWidth"); } function checkScrolledElement(element, child) @@ -159,7 +168,7 @@ function checkClientState(element, left, top, width, height, testname) function checkCoord(element, type, val, testname) { if (val != -10000) - is(element[type], val, testname + " " + type); + is(element[type], Math.round(val), testname + " " + type); } function checkCoords(element, type, left, top, width, height, testname) @@ -188,7 +197,6 @@ function gcs(element, prop) var propVal = (element instanceof SVGElement && (prop == "width" || prop == "height")) ? element.getAttribute(prop) : getComputedStyle(element, "")[prop]; if (propVal == "auto") - propVal = 0; - var propValFloat = parseFloat(propVal); - return (isNaN(propValFloat) ? propVal : Math.round(propValFloat)); + return 0; + return parseFloat(propVal); } From bd705c1eb608043b7f70d7d1f5a41d2d391de9ed Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 073/109] Fix line-endings in gfxWindowsPlatform. --- gfx/thebes/gfxWindowsPlatform.cpp | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index ac09343939fa..24fd80aab08f 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -137,16 +137,16 @@ typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)( __out IUnknown **factory ); #endif - -#ifdef CAIRO_HAS_D2D_SURFACE -typedef HRESULT (WINAPI*D3D10CreateDevice1Func)( - IDXGIAdapter *pAdapter, - D3D10_DRIVER_TYPE DriverType, - HMODULE Software, - UINT Flags, - D3D10_FEATURE_LEVEL1 HardwareLevel, - UINT SDKVersion, - ID3D10Device1 **ppDevice + +#ifdef CAIRO_HAS_D2D_SURFACE +typedef HRESULT (WINAPI*D3D10CreateDevice1Func)( + IDXGIAdapter *pAdapter, + D3D10_DRIVER_TYPE DriverType, + HMODULE Software, + UINT Flags, + D3D10_FEATURE_LEVEL1 HardwareLevel, + UINT SDKVersion, + ID3D10Device1 **ppDevice ); #endif @@ -193,22 +193,22 @@ gfxWindowsPlatform::gfxWindowsPlatform() if (isVistaOrHigher && 0) { // We need a DWriteFactory to work. - HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); - D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) + HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); + D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) GetProcAddress(d3d10module, "D3D10CreateDevice1"); nsRefPtr device; if (createD3DDevice) { // We try 10.0 first even though we prefer 10.1, since we want to // fail as fast as possible if 10.x isn't supported. - HRESULT hr = createD3DDevice( - NULL, - D3D10_DRIVER_TYPE_HARDWARE, - NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT | - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, - D3D10_FEATURE_LEVEL_10_0, - D3D10_1_SDK_VERSION, + HRESULT hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_0, + D3D10_1_SDK_VERSION, getter_AddRefs(device)); if (SUCCEEDED(hr)) { @@ -217,14 +217,14 @@ gfxWindowsPlatform::gfxWindowsPlatform() // getting direct2d. We'd really like to do something more // clever. nsRefPtr device1; - hr = createD3DDevice( - NULL, - D3D10_DRIVER_TYPE_HARDWARE, - NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT | - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, - D3D10_FEATURE_LEVEL_10_1, - D3D10_1_SDK_VERSION, + hr = createD3DDevice( + NULL, + D3D10_DRIVER_TYPE_HARDWARE, + NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT | + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS, + D3D10_FEATURE_LEVEL_10_1, + D3D10_1_SDK_VERSION, getter_AddRefs(device1)); if (SUCCEEDED(hr)) { From 5ab5eb739e0caf200467fc0c04dd20a5e4e05faa Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 074/109] Re-enable Direct2D by default. a=joedrew --- gfx/thebes/gfxWindowsPlatform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 24fd80aab08f..74414ea72d7b 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -191,7 +191,7 @@ gfxWindowsPlatform::gfxWindowsPlatform() NS_RegisterMemoryReporter(new D2DCacheReporter()); mD2DDevice = NULL; - if (isVistaOrHigher && 0) { + if (isVistaOrHigher) { // We need a DWriteFactory to work. HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) From be04bb141a33d48ce8dbf54fc7bbf41c2882aeb2 Mon Sep 17 00:00:00 2001 From: Bas Schouten Date: Mon, 16 Aug 2010 09:15:03 +0200 Subject: [PATCH 075/109] Bug 587342: Use the correct content type for fallback surfaces. r=jrmuizel --- gfx/cairo/cairo/src/cairo-d2d-surface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp index bde2e5fa01fe..dc0aa7f52ba8 100644 --- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp @@ -2492,7 +2492,7 @@ _cairo_d2d_acquire_dest_image(void *abstract_surface, } *image_out = (cairo_image_surface_t*)_cairo_image_surface_create_for_data_with_content((unsigned char*)data.pData, - CAIRO_CONTENT_COLOR_ALPHA, + d2dsurf->base.content, size.width, size.height, data.RowPitch); From 30970d30d2775ab9f969fbff825bfe7b68af632f Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Mon, 16 Aug 2010 17:20:27 +0900 Subject: [PATCH 076/109] Bug 582893 IME isn't disabled when password fields on sheet dialog get focus r=smichaud, b2.0=final+ --- widget/src/cocoa/nsCocoaTextInputHandler.h | 4 ++ widget/src/cocoa/nsCocoaTextInputHandler.mm | 46 ++++++++----- widget/tests/test_imestate.html | 76 +++++++++++++++++++++ 3 files changed, 108 insertions(+), 18 deletions(-) diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.h b/widget/src/cocoa/nsCocoaTextInputHandler.h index 98f1e65f3f65..5ffb5be92898 100644 --- a/widget/src/cocoa/nsCocoaTextInputHandler.h +++ b/widget/src/cocoa/nsCocoaTextInputHandler.h @@ -259,6 +259,10 @@ public: static CFArrayRef CreateAllIMEModeList(); static void DebugPrintAllIMEModes(PRLogModuleInfo* aLogModuleInfo); + // Don't use ::TSMGetActiveDocument() API directly, the document may not + // be what you want. + static TSMDocumentID GetCurrentTSMDocumentID(); + protected: // The owner of this instance. The result of mOwnerWidget->TextInputHandler // returns this instance. This must not be null after initialized. diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.mm b/widget/src/cocoa/nsCocoaTextInputHandler.mm index cbb9b3c2af8c..3fa779bd07d2 100644 --- a/widget/src/cocoa/nsCocoaTextInputHandler.mm +++ b/widget/src/cocoa/nsCocoaTextInputHandler.mm @@ -682,6 +682,17 @@ nsCocoaIMEHandler::DebugPrintAllIMEModes(PRLogModuleInfo* aLogModuleInfo) ::CFRelease(list); } +//static +TSMDocumentID +nsCocoaIMEHandler::GetCurrentTSMDocumentID() +{ + // On OS X 10.6.x at least, ::TSMGetActiveDocument() has a bug that prevents + // it from returning accurate results unless + // [NSInputManager currentInputManager] is called first. + // So, we need to call [NSInputManager currentInputManager] first here. + [NSInputManager currentInputManager]; + return ::TSMGetActiveDocument(); +} #pragma mark - @@ -706,8 +717,8 @@ nsCocoaIMEHandler::ResetIMEWindowLevel() #ifdef DEBUG_IME_HANDLER DebugPrintPointer(this); NSLog(@"nsCocoaIMEHandler::ResetIMEWindowLevel"); - NSLog(@" IsFocused:%s ::TSMGetActiveDocument():%p", - TrueOrFalse(IsFocused()), ::TSMGetActiveDocument()); + NSLog(@" IsFocused:%s GetCurrentTSMDocumentID():%p", + TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID()); #endif // DEBUG_IME_HANDLER if (!mView) @@ -719,7 +730,7 @@ nsCocoaIMEHandler::ResetIMEWindowLevel() return; } - TSMDocumentID doc = ::TSMGetActiveDocument(); + TSMDocumentID doc = GetCurrentTSMDocumentID(); if (!doc) { // retry mPendingMethods |= kResetIMEWindowLevel; @@ -752,7 +763,7 @@ nsCocoaIMEHandler::ResetIMEWindowLevel() if (windowLevel == NSNormalWindowLevel) windowLevel++; - ::TSMSetDocumentProperty(::TSMGetActiveDocument(), + ::TSMSetDocumentProperty(GetCurrentTSMDocumentID(), kTSMDocumentWindowLevelPropertyTag, sizeof(windowLevel), &windowLevel); @@ -803,8 +814,8 @@ nsCocoaIMEHandler::SyncASCIICapableOnly() #ifdef DEBUG_IME_HANDLER DebugPrintPointer(this); NSLog(@"nsCocoaIMEHandler::SyncASCIICapableOnly"); - NSLog(@" IsFocused:%s ::TSMGetActiveDocument():%p", - TrueOrFalse(IsFocused()), ::TSMGetActiveDocument()); + NSLog(@" IsFocused:%s GetCurrentTSMDocumentID():%p", + TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID()); #endif if (!mView) @@ -816,7 +827,7 @@ nsCocoaIMEHandler::SyncASCIICapableOnly() return; } - TSMDocumentID doc = ::TSMGetActiveDocument(); + TSMDocumentID doc = GetCurrentTSMDocumentID(); if (!doc) { // retry mPendingMethods |= kSyncASCIICapableOnly; @@ -847,12 +858,9 @@ nsCocoaIMEHandler::ResetTimer() "There are not pending methods, why this is called?"); if (mTimer) { mTimer->Cancel(); - return; - } - mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); - if (!mTimer) { - NS_ERROR("mTimer is null"); - return; + } else { + mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); + NS_ENSURE_TRUE(mTimer, ); } mTimer->InitWithFuncCallback(FlushPendingMethods, this, 0, nsITimer::TYPE_ONE_SHOT); @@ -863,6 +871,11 @@ nsCocoaIMEHandler::ExecutePendingMethods() { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; + if (mTimer) { + mTimer->Cancel(); + mTimer = nsnull; + } + if (![[NSApplication sharedApplication] isActive]) { mIsInFocusProcessing = PR_FALSE; // If we're not active, we should retry at focus event @@ -873,10 +886,6 @@ nsCocoaIMEHandler::ExecutePendingMethods() // First, reset the pending method flags because if each methods cannot // run now, they can reentry to the pending flags by theirselves. mPendingMethods = 0; - if (mTimer) { - mTimer->Cancel(); - mTimer = nsnull; - } if (pendingMethods & kDiscardIMEComposition) DiscardIMEComposition(); @@ -1164,7 +1173,8 @@ nsCocoaIMEHandler::IsFocused() NS_ENSURE_TRUE(mView, PR_FALSE); NSWindow* window = [mView window]; NS_ENSURE_TRUE(window, PR_FALSE); - return [window firstResponder] == mView && [window isMainWindow] && + return [window firstResponder] == mView && + ([window isMainWindow] || [window isSheet]) && [[NSApplication sharedApplication] isActive]; NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(PR_FALSE); diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html index 44a02f3af16d..4a1e212961c2 100644 --- a/widget/tests/test_imestate.html +++ b/widget/tests/test_imestate.html @@ -861,6 +861,79 @@ function runEditableSubframeTests() "width=600,height=600"); } +function runTestPasswordFieldOnDialog() +{ + if (!kIMEEnabledSupported) { + return; + } + + if (document.activeElement) { + document.activeElement.blur(); + } + + var dialog; + + function WindowObserver() + { + Components.classes["@mozilla.org/observer-service;1"]. + getService(Components.interfaces.nsIObserverService). + addObserver(this, "domwindowopened", false); + } + + WindowObserver.prototype = { + QueryInterface: function (iid) + { + if (iid.equals(Components.interfaces.nsIObserver) || + iid.equals(Components.interfaces.nsISupports)) { + return this; + } + }, + + observe: function (subject, topic, data) + { + if (topic === "domwindowopened") { + ok(true, "dialog window is created"); + dialog = subject.QueryInterface(Components.interfaces.nsIDOMWindow); + dialog.addEventListener("load", onPasswordDialogLoad, false); + } + } + }; + + var observer = new WindowObserver(); + var arg1 = new Object(), arg2 = new Object(); + Components.classes["@mozilla.org/embedcomp/prompt-service;1"]. + getService(Components.interfaces.nsIPromptService). + promptPassword(window, "title", "text", arg1, "msg", arg2); + + ok(true, "password dialog was closed"); + + Components.classes["@mozilla.org/observer-service;1"]. + getService(Components.interfaces.nsIObserverService). + removeObserver(observer, "domwindowopened"); + + var passwordField; + + function onPasswordDialogLoad() + { + ok(true, "onPasswordDialogLoad is called"); + dialog.removeEventListener("load", onPasswordDialogLoad, false); + passwordField = dialog.document.getElementById("password1Textbox"); + passwordField.addEventListener("focus", onPasswordFieldFocus, false); + } + + function onPasswordFieldFocus() + { + ok(true, "onPasswordFieldFocus is called"); + passwordField.removeEventListener("focus", onPasswordFieldFocus, false); + var utils = dialog. + QueryInterface(Components.interfaces.nsIInterfaceRequestor). + getInterface(Components.interfaces.nsIDOMWindowUtils); + is(utils.IMEStatus, utils.IME_STATUS_PASSWORD, + "IME isn't disabled on a password field of password dialog"); + synthesizeKey("VK_ESCAPE", { }, dialog); + } +} + function runTests() { if (!kIMEEnabledSupported && !kIMEOpenSupported) @@ -908,6 +981,9 @@ function runTests() // test whether the IME state and composition are not changed unexpectedly runEditorFlagChangeTests(); + // test password field on dialog + runTestPasswordFieldOnDialog(); + runASyncTests(); } From 61b85533fe2c4366b25c96d017c0a105f0bb5f1a Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Mon, 16 Aug 2010 18:01:01 +0900 Subject: [PATCH 077/109] Bug 582893 temprary disables the new tests against a orange --- widget/tests/test_imestate.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widget/tests/test_imestate.html b/widget/tests/test_imestate.html index 4a1e212961c2..7af5842d74a2 100644 --- a/widget/tests/test_imestate.html +++ b/widget/tests/test_imestate.html @@ -982,7 +982,8 @@ function runTests() runEditorFlagChangeTests(); // test password field on dialog - runTestPasswordFieldOnDialog(); + // XXX temporary disable against failure + //runTestPasswordFieldOnDialog(); runASyncTests(); } From 7aa074bc10d77a9a0829916fd1336a38b16e700b Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Mon, 16 Aug 2010 09:35:40 -0400 Subject: [PATCH 078/109] Disable D2D to fix browser_bug577990.js timeout --- gfx/thebes/gfxWindowsPlatform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 74414ea72d7b..24fd80aab08f 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -191,7 +191,7 @@ gfxWindowsPlatform::gfxWindowsPlatform() NS_RegisterMemoryReporter(new D2DCacheReporter()); mD2DDevice = NULL; - if (isVistaOrHigher) { + if (isVistaOrHigher && 0) { // We need a DWriteFactory to work. HMODULE d3d10module = LoadLibraryA("d3d10_1.dll"); D3D10CreateDevice1Func createD3DDevice = (D3D10CreateDevice1Func) From 7deb0abd6191583bff041aaa1877b78c39fbb52b Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Mon, 16 Aug 2010 09:36:02 -0400 Subject: [PATCH 079/109] Disable more intermittent reftests on D2D --- layout/reftests/bugs/reftest.list | 2 +- layout/reftests/native-theme/reftest.list | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index ce704430934d..322440517408 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -276,7 +276,7 @@ asserts(1) == 290129-1.html 290129-1-ref.html # bug 315549/460637 == 299136-1.html 299136-1-ref.html == 299837-1.html 299837-1-ref.html == 299837-2.xul 299837-2-ref.xul -== 299837-3.xul 299837-3-ref.xul +random-if(d2d) == 299837-3.xul 299837-3-ref.xul # bug 587631 == 300691-1a.html 300691-1-ref.html == 300691-1b.html 300691-1-ref.html == 300691-1c.html 300691-1-ref.html diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list index 7ef16db1a2e6..be624f2e5b2d 100644 --- a/layout/reftests/native-theme/reftest.list +++ b/layout/reftests/native-theme/reftest.list @@ -49,10 +49,10 @@ skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-r skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl-ref.xul skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl-ref.html != resizer-bottomend.xul blank-window.xul -random-if(d2d) == resizer-bottomend.xul resizer-bottomright.xul +random-if(d2d) == resizer-bottomend.xul resizer-bottomright.xul # bug 581086 != resizer-bottomend.xul resizer-bottomend-rtl.xul skip-if(gtk2Widget) != resizer-bottomend-rtl.xul blank-window.xul -skip-if(gtk2Widget) == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul +skip-if(gtk2Widget) random-if(d2d) == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul # bug 581086 # Windows-only, depends on native scrollbar metrics skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme-ref.html From 64da8c83e1a3a299c676437bf5a21a6ee270e160 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Mon, 16 Aug 2010 10:04:10 -0400 Subject: [PATCH 080/109] Make --disable-libxul imply --enable-shared-js. (Bug 587375) r=ted a2.0=dbaron --- configure.in | 61 ++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/configure.in b/configure.in index 5805aa3cd82f..9f3330edb029 100644 --- a/configure.in +++ b/configure.in @@ -74,19 +74,6 @@ TARGET_OS="${target_os}" MOZ_DEB_TIMESTAMP=`date +"%a, %d %b %Y %T %z" 2>&1` AC_SUBST(MOZ_DEB_TIMESTAMP) -MOZ_ARG_ENABLE_BOOL(shared-js, -[ --enable-shared-js - Create a shared JavaScript library.], - ENABLE_SHARED_JS=1, - ENABLE_SHARED_JS=0) - -if test "$ENABLE_SHARED_JS" = "1" ; then - JS_SHARED_LIBRARY=1 -else - AC_DEFINE(MOZ_STATIC_JS) -fi -AC_SUBST(JS_SHARED_LIBRARY) - dnl ======================================================== dnl = dnl = Don't change the following two lines. Doing so breaks: @@ -1233,11 +1220,8 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' MOZ_PNG_CFLAGS= MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)' -if test -z "$JS_SHARED_LIBRARY" ; then -MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static' -else -MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs' -fi +MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static' +MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs' DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc' MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc' @@ -2284,11 +2268,8 @@ ia64*-hpux*) MOZ_DEBUG_FLAGS='-Zi' MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' MOZ_FIX_LINK_PATHS= - if test -z "$JS_SHARED_LIBRARY" ; then - MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/js_static.lib' - else - MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib' - fi + MOZ_JS_STATIC_LIBS='$(LIBXUL_DIST)/lib/js_static.lib' + MOZ_JS_SHARED_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib' OBJ_SUFFIX=obj RANLIB='echo not_ranlib' STRIP='echo not_strip' @@ -2348,11 +2329,8 @@ ia64*-hpux*) RCFLAGS='-O coff --use-temp-file' # mingw doesn't require kernel32, user32, and advapi32 explicitly LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32" - if test -z "$JS_SHARED_LIBRARY" ; then - MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static' - else - MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs' - fi + MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static' + MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs' MOZ_FIX_LINK_PATHS= DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc' XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc' @@ -2398,11 +2376,8 @@ ia64*-hpux*) MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV' WARNINGS_AS_ERRORS='-WX' MOZ_OPTIMIZE_FLAGS='-O1' - if test -z "$JS_SHARED_LIBRARY" ; then - MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/js_static.lib' - else - MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib' - fi + MOZ_JS_STATIC_LIBS='$(LIBXUL_DIST)/lib/js_static.lib' + MOZ_JS_SHARED_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib' MOZ_FIX_LINK_PATHS= DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib' XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib' @@ -8058,6 +8033,26 @@ MOZ_ARG_ENABLE_BOOL(libxul, MOZ_ENABLE_LIBXUL=1, MOZ_ENABLE_LIBXUL=) +MOZ_ARG_ENABLE_BOOL(shared-js, +[ --enable-shared-js + Create a shared JavaScript library.], + ENABLE_SHARED_JS=1, + ENABLE_SHARED_JS=) + +if test -z "$MOZ_ENABLE_LIBXUL"; then + dnl --disable-libxul implies shared js + ENABLE_SHARED_JS=1 +fi + +if test -n "$ENABLE_SHARED_JS"; then + JS_SHARED_LIBRARY=1 + MOZ_JS_LIBS=$MOZ_JS_SHARED_LIBS +else + MOZ_JS_LIBS=$MOZ_JS_STATIC_LIBS + AC_DEFINE(MOZ_STATIC_JS) +fi +AC_SUBST(JS_SHARED_LIBRARY) + if test -n "$MOZ_STATIC_BUILD_UNSUPPORTED" -a -n "$BUILD_STATIC_LIBS"; then AC_MSG_ERROR([--enable-static is not supported for building $MOZ_APP_NAME. You probably want --enable-libxul.]) fi From 2afbd46dc160c12fce7b3b700b8106cfd9b9bdbe Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Mon, 16 Aug 2010 10:10:25 -0400 Subject: [PATCH 081/109] Bug 583053 - Corruption issues when running rdio because windows double-pass rendering events don't win the RPC race, r=bent --- dom/plugins/PluginInstanceChild.cpp | 5 +---- dom/plugins/PluginInstanceChild.h | 1 - dom/plugins/PluginInstanceParent.cpp | 7 ++++++- dom/plugins/PluginMessageUtils.cpp | 13 +++++++++++++ dom/plugins/PluginMessageUtils.h | 5 +++++ layout/generic/Makefile.in | 2 ++ layout/generic/nsObjectFrame.cpp | 24 +++++++++--------------- layout/generic/nsObjectFrame.h | 3 --- 8 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dom/plugins/PluginInstanceChild.cpp b/dom/plugins/PluginInstanceChild.cpp index 9e5557c35f3c..bce45d81f0df 100644 --- a/dom/plugins/PluginInstanceChild.cpp +++ b/dom/plugins/PluginInstanceChild.cpp @@ -86,8 +86,6 @@ using mozilla::gfx::SharedDIB; // helpers' section for details. const int kFlashWMUSERMessageThrottleDelayMs = 5; -#define NS_OOPP_DOUBLEPASS_MSGID TEXT("MozDoublePassMsg") - #elif defined(XP_MACOSX) #include #endif // defined(XP_MACOSX) @@ -125,7 +123,6 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface, #endif // MOZ_X11 && XP_UNIX && !XP_MACOSX #if defined(OS_WIN) memset(&mAlphaExtract, 0, sizeof(mAlphaExtract)); - mAlphaExtract.doublePassEvent = ::RegisterWindowMessage(NS_OOPP_DOUBLEPASS_MSGID); #endif // OS_WIN InitQuirksModes(aMimeType); #if defined(OS_WIN) @@ -565,7 +562,7 @@ PluginInstanceChild::AnswerNPP_HandleEvent(const NPRemoteEvent& event, *handled = SharedSurfacePaint(evcopy); return true; } - else if (evcopy.event == mAlphaExtract.doublePassEvent) { + else if (DoublePassRenderingEvent() == evcopy.event) { // We'll render to mSharedSurfaceDib first, then render to a cached bitmap // we store locally. The two passes are for alpha extraction, so the second // pass must be to a flat white surface in order for things to work. diff --git a/dom/plugins/PluginInstanceChild.h b/dom/plugins/PluginInstanceChild.h index aa5dfca7f579..0c6ce400f8dc 100644 --- a/dom/plugins/PluginInstanceChild.h +++ b/dom/plugins/PluginInstanceChild.h @@ -352,7 +352,6 @@ private: }; gfx::SharedDIBWin mSharedSurfaceDib; struct { - PRUint32 doublePassEvent; PRUint16 doublePass; HDC hdc; HBITMAP bmp; diff --git a/dom/plugins/PluginInstanceParent.cpp b/dom/plugins/PluginInstanceParent.cpp index 593f2381c5af..7187d2a700c0 100644 --- a/dom/plugins/PluginInstanceParent.cpp +++ b/dom/plugins/PluginInstanceParent.cpp @@ -638,7 +638,12 @@ PluginInstanceParent::NPP_HandleEvent(void* event) #if defined(OS_WIN) if (mWindowType == NPWindowTypeDrawable) { - switch(npevent->event) { + if (DoublePassRenderingEvent() == npevent->event) { + CallPaint(npremoteevent, &handled); + return handled; + } + + switch (npevent->event) { case WM_PAINT: { RECT rect; diff --git a/dom/plugins/PluginMessageUtils.cpp b/dom/plugins/PluginMessageUtils.cpp index 4dc1da1c0837..bd04aa9d83c8 100644 --- a/dom/plugins/PluginMessageUtils.cpp +++ b/dom/plugins/PluginMessageUtils.cpp @@ -162,5 +162,18 @@ void DeferNPVariantLastRelease(const NPNetscapeFuncs* f, NPVariant* v) VOID_TO_NPVARIANT(*v); } +#ifdef XP_WIN + +// The private event used for double-pass widgetless plugin rendering. +UINT DoublePassRenderingEvent() +{ + static UINT gEventID = 0; + if (!gEventID) + gEventID = ::RegisterWindowMessage(L"MozDoublePassMsg"); + return gEventID; +} + +#endif + } // namespace plugins } // namespace mozilla diff --git a/dom/plugins/PluginMessageUtils.h b/dom/plugins/PluginMessageUtils.h index 81400ca26ee2..f035c38fe322 100644 --- a/dom/plugins/PluginMessageUtils.h +++ b/dom/plugins/PluginMessageUtils.h @@ -271,6 +271,11 @@ struct DeletingObjectEntry : public nsPtrHashKey bool mDeleted; }; +#ifdef XP_WIN +// The private event used for double-pass widgetless plugin rendering. +UINT DoublePassRenderingEvent(); +#endif + } /* namespace plugins */ } /* namespace mozilla */ diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 9c243918895c..2d6d563d33d3 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -144,6 +144,8 @@ RESOURCES_HTML = \ FORCE_STATIC_LIB = 1 +include $(topsrcdir)/config/config.mk +include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 25308c0c992c..a416b908efda 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -46,6 +46,10 @@ /* rendering objects for replaced elements implemented by a plugin */ +#ifdef MOZ_IPC +#include "mozilla/plugins/PluginMessageUtils.h" +#endif + #ifdef MOZ_WIDGET_QT #include #include @@ -207,9 +211,6 @@ using mozilla::DefaultXDisplay; #ifdef XP_WIN #include #include -#ifdef MOZ_IPC -#define NS_OOPP_DOUBLEPASS_MSGID TEXT("MozDoublePassMsg") -#endif #endif #ifdef XP_OS2 @@ -624,10 +625,6 @@ nsObjectFrame::Init(nsIContent* aContent, nsresult rv = nsObjectFrameSuper::Init(aContent, aParent, aPrevInFlow); -#ifdef XP_WIN - mDoublePassEvent = 0; -#endif - return rv; } @@ -1726,15 +1723,12 @@ nsObjectFrame::PaintPlugin(nsIRenderingContext& aRenderingContext, // OOP plugin specific: let the shim know before we paint if we are doing a // double pass render. If this plugin isn't oop, the register window message // will be ignored. - if (!mDoublePassEvent) - mDoublePassEvent = ::RegisterWindowMessage(NS_OOPP_DOUBLEPASS_MSGID); - if (mDoublePassEvent) { - NPEvent pluginEvent; - pluginEvent.event = mDoublePassEvent; - pluginEvent.wParam = 0; - pluginEvent.lParam = 0; + NPEvent pluginEvent; + pluginEvent.event = mozilla::plugins::DoublePassRenderingEvent(); + pluginEvent.wParam = 0; + pluginEvent.lParam = 0; + if (pluginEvent.event) inst->HandleEvent(&pluginEvent, nsnull); - } } #endif do { diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h index 9224dad3e853..a4f829422e83 100644 --- a/layout/generic/nsObjectFrame.h +++ b/layout/generic/nsObjectFrame.h @@ -252,9 +252,6 @@ private: nsIView* mInnerView; nsCOMPtr mWidget; nsIntRect mWindowlessRect; -#ifdef XP_WIN - PRUint32 mDoublePassEvent; -#endif // For assertions that make it easier to determine if a crash is due // to the underlying problem described in bug 136927, and to prevent From 9b333fdb92bfd24213c1187e480d004e851e94f1 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Mon, 16 Aug 2010 11:41:46 -0400 Subject: [PATCH 082/109] Linux followup to bug 583053 - fix the include ordering so that KeyPress is defined at the time we need it. --- layout/generic/nsObjectFrame.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index a416b908efda..122b915b4dfd 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -50,6 +50,15 @@ #include "mozilla/plugins/PluginMessageUtils.h" #endif +#ifdef MOZ_X11 +#include +#include "gfxXlibSurface.h" +/* X headers suck */ +enum { XKeyPress = KeyPress }; +#ifdef KeyPress +#undef KeyPress +#endif + #ifdef MOZ_WIDGET_QT #include #include @@ -172,15 +181,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); #include "nsCoreAnimationSupport.h" #endif -#ifdef MOZ_X11 -#include -#include "gfxXlibSurface.h" -/* X headers suck */ -enum { XKeyPress = KeyPress }; -#ifdef KeyPress -#undef KeyPress -#endif - #if (MOZ_PLATFORM_MAEMO == 5) && defined(MOZ_WIDGET_GTK2) #define MOZ_COMPOSITED_PLUGINS 1 #define MOZ_USE_IMAGE_EXPOSE 1 From 5c6ea8689ebdb0c224ff27fbcb08984234313d39 Mon Sep 17 00:00:00 2001 From: Taras Glek Date: Mon, 16 Aug 2010 11:42:31 -0400 Subject: [PATCH 083/109] Bug 587470 - Add mozjs to removed-files.in, r=khuey --- browser/installer/removed-files.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 665c47249177..efe9c837d20a 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -9,6 +9,9 @@ @DLL_PREFIX@xpcom_compat@DLL_SUFFIX@ @DLL_PREFIX@xpistub@DLL_SUFFIX@ @DLL_PREFIX@zlib@DLL_SUFFIX@ +#ifdef MOZ_STATIC_JS +@DLL_PREFIX@mozjs@DLL_SUFFIX@ +#endif LICENSE browserconfig.properties chrome/US.jar From b05fb2a7e954bffd79b927253f6b9f08540b8b38 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Mon, 16 Aug 2010 12:38:43 -0400 Subject: [PATCH 084/109] Bustage fix of the bustage fix, bug 583053. --- layout/generic/nsObjectFrame.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 122b915b4dfd..414e7fbb2160 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -58,6 +58,7 @@ enum { XKeyPress = KeyPress }; #ifdef KeyPress #undef KeyPress #endif +#endif #ifdef MOZ_WIDGET_QT #include @@ -181,6 +182,7 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); #include "nsCoreAnimationSupport.h" #endif +#ifdef MOZ_X11 #if (MOZ_PLATFORM_MAEMO == 5) && defined(MOZ_WIDGET_GTK2) #define MOZ_COMPOSITED_PLUGINS 1 #define MOZ_USE_IMAGE_EXPOSE 1 From 23e5488b5681b1f6f5a700803387fb9cb8a2e8e2 Mon Sep 17 00:00:00 2001 From: Sid Stamm Date: Mon, 16 Aug 2010 10:12:28 -0700 Subject: [PATCH 085/109] Bug 576200. CSP breaks spec, defaults to allow *. r=bsterne@mozilla.com, dveditz@mozilla.com --- content/base/src/CSPUtils.jsm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/base/src/CSPUtils.jsm b/content/base/src/CSPUtils.jsm index 328f08c6d159..c9db1053f04b 100644 --- a/content/base/src/CSPUtils.jsm +++ b/content/base/src/CSPUtils.jsm @@ -272,8 +272,11 @@ CSPRep.fromString = function(aStr, self) { } // end directive: loop - aCSPR.makeExplicit(); - return aCSPR; + // if makeExplicit fails for any reason, default to allow 'none'. This + // includes the case where "allow" is not present. + if (aCSPR.makeExplicit()) + return aCSPR; + return CSPRep.fromString("allow 'none'", self); }; CSPRep.prototype = { @@ -409,6 +412,7 @@ CSPRep.prototype = { var SD = CSPRep.SRC_DIRECTIVES; var allowDir = this._directives[SD.ALLOW]; if (!allowDir) { + CSPWarning("'allow' directive required but not present. Reverting to \"allow 'none'\""); return false; } From c1d6661d8e8550df018478cecc2c443c62709085 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Tue, 10 Aug 2010 13:52:46 +0200 Subject: [PATCH 086/109] Bug 585508 - HTMLFormElement enctype and method IDL attributes should be limited to only known values. r=jst --- .../html/content/src/nsHTMLFormElement.cpp | 36 ++++---- content/html/content/test/Makefile.in | 1 + content/html/content/test/test_bug585508.html | 84 +++++++++++++++++++ 3 files changed, 106 insertions(+), 15 deletions(-) create mode 100644 content/html/content/test/test_bug585508.html diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index cfe9244ae299..1a3476d284dc 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -80,6 +80,23 @@ static const int NS_FORM_CONTROL_LIST_HASHTABLE_SIZE = 16; +static const nsAttrValue::EnumTable kFormMethodTable[] = { + { "get", NS_FORM_METHOD_GET }, + { "post", NS_FORM_METHOD_POST }, + { 0 } +}; +// Default method is 'get'. +static const nsAttrValue::EnumTable* kFormDefaultMethod = &kFormMethodTable[0]; + +static const nsAttrValue::EnumTable kFormEnctypeTable[] = { + { "multipart/form-data", NS_FORM_ENCTYPE_MULTIPART }, + { "application/x-www-form-urlencoded", NS_FORM_ENCTYPE_URLENCODED }, + { "text/plain", NS_FORM_ENCTYPE_TEXTPLAIN }, + { 0 } +}; +// Default method is 'application/x-www-form-urlencoded'. +static const nsAttrValue::EnumTable* kFormDefaultEnctype = &kFormEnctypeTable[1]; + // nsHTMLFormElement PRBool nsHTMLFormElement::gFirstFormSubmitted = PR_FALSE; @@ -356,8 +373,10 @@ nsHTMLFormElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, } NS_IMPL_STRING_ATTR(nsHTMLFormElement, AcceptCharset, acceptcharset) -NS_IMPL_STRING_ATTR(nsHTMLFormElement, Enctype, enctype) -NS_IMPL_STRING_ATTR(nsHTMLFormElement, Method, method) +NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Enctype, enctype, + kFormDefaultEnctype->tag) +NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Method, method, + kFormDefaultMethod->tag) NS_IMPL_STRING_ATTR(nsHTMLFormElement, Name, name) NS_IMPL_STRING_ATTR(nsHTMLFormElement, Target, target) @@ -405,19 +424,6 @@ nsHTMLFormElement::Reset() return NS_OK; } -static const nsAttrValue::EnumTable kFormMethodTable[] = { - { "get", NS_FORM_METHOD_GET }, - { "post", NS_FORM_METHOD_POST }, - { 0 } -}; - -static const nsAttrValue::EnumTable kFormEnctypeTable[] = { - { "multipart/form-data", NS_FORM_ENCTYPE_MULTIPART }, - { "application/x-www-form-urlencoded", NS_FORM_ENCTYPE_URLENCODED }, - { "text/plain", NS_FORM_ENCTYPE_TEXTPLAIN }, - { 0 } -}; - PRBool nsHTMLFormElement::ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute, diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index 0cd86429a6b5..617f941cd119 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -190,6 +190,7 @@ _TEST_FILES = \ test_bug569955.html \ test_bug573969.html \ test_bug549475.html \ + test_bug585508.html \ $(NULL) libs:: $(_TEST_FILES) diff --git a/content/html/content/test/test_bug585508.html b/content/html/content/test/test_bug585508.html new file mode 100644 index 000000000000..6a84b4c16ccb --- /dev/null +++ b/content/html/content/test/test_bug585508.html @@ -0,0 +1,84 @@ + + + + + Test for Bug 585508 + + + + + +Mozilla Bug 585508 +

+
+
+
+ + From 237c0a23ce89a43c540b430ebbfb2a352942a82f Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Mon, 16 Aug 2010 10:12:28 -0700 Subject: [PATCH 087/109] bug 585648, update shipped-locales for Firefox 4 Beta 4 --- browser/locales/shipped-locales | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/locales/shipped-locales b/browser/locales/shipped-locales index c1fbd95ab221..204123b01af3 100644 --- a/browser/locales/shipped-locales +++ b/browser/locales/shipped-locales @@ -5,15 +5,19 @@ da de el en-US +eo es-AR es-ES et fi fr ga-IE +he hu is it +ja linux win32 +ja-JP-mac osx ko ku lt From d1bdb74d878df9941fb96672d20a0937948e7004 Mon Sep 17 00:00:00 2001 From: Raymond Lee Date: Mon, 16 Aug 2010 12:46:22 +0800 Subject: [PATCH 088/109] Bug 586693 - Do we still need to marshal browser events? [r=dolske a=blocking2.0] * Removed some timeouts and fixed some broken user interactions that fixes various other bugs and test failures. Bug 587029 - Tab Candy : closing last tab of a group leads to an isolated tab Bug 586552 - GroupItem.newTab feedback should be immediate * Init TabItems before handling firstrun tab grouping * Removed _stopZoomPreparation related code since we are not using it anymore. * Fixed the issue related to using move to other group feature. The moved tab is still visible in the tab bar after moving it to other group. --HG-- extra : rebase_source : 9784acd2df5be4be5016cf15d52dabaccd68e2a5 --- browser/base/content/tabview/groupitems.js | 105 +++++++-------------- browser/base/content/tabview/tabitems.js | 12 +-- browser/base/content/tabview/ui.js | 102 ++++++++------------ 3 files changed, 75 insertions(+), 144 deletions(-) diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js index 89fa4b089b9a..da6ee0f25291 100644 --- a/browser/base/content/tabview/groupitems.js +++ b/browser/base/content/tabview/groupitems.js @@ -656,11 +656,6 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), { this.arrange(); } UI.setReorderTabsOnHide(this); - - if (this._nextNewTabCallback) { - this._nextNewTabCallback.apply(this, [item]) - this._nextNewTabCallback = null; - } } catch(e) { Utils.log('GroupItem.add error', e); } @@ -1189,59 +1184,41 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), { GroupItems.setActiveGroupItem(this); let newTab = gBrowser.loadOneTab(url || "about:blank", {inBackground: true}); + // TabItems will have handled the new tab and added the tabItem property + let newItem = newTab.tabItem; + var self = this; - var doNextTab = function(tab) { - var groupItem = GroupItems.getActiveGroupItem(); - - iQ(tab.container).css({opacity: 0}); - var $anim = iQ("
") - .addClass('newTabAnimatee') - .css({ - top: tab.bounds.top+5, - left: tab.bounds.left+5, - width: tab.bounds.width-10, - height: tab.bounds.height-10, - zIndex: 999, - opacity: 0 - }) - .appendTo("body") - .animate({ - opacity: 1.0 - }, { - duration: 500, - complete: function() { - $anim.animate({ - top: 0, - left: 0, - width: window.innerWidth, - height: window.innerHeight - }, { - duration: 270, - complete: function() { - iQ(tab.container).css({opacity: 1}); - newTab.tabItem.zoomIn(!url); - $anim.remove(); - // We need a timeout here so that there is a chance for the - // new tab to get made! Otherwise it won't appear in the list - // of the groupItem's tab. - // TODO: This is probably a terrible hack that sets up a race - // condition. We need a better solution. - // Bug 586551 - setTimeout(function() { - self._sendToSubscribers("tabAdded", { groupItemId: self.id }); - }, 1); - } - }); - } - }); - } - - // TODO: Because this happens as a callback, there is - // sometimes a long delay before the animation occurs. - // We need to fix this--immediate response to a users - // actions is necessary for a good user experience. - // Bug 586552 - self.onNextNewTab(doNextTab); + iQ(newItem.container).css({opacity: 0}); + let $anim = iQ("
") + .addClass("newTabAnimatee") + .css({ + top: newItem.bounds.top + 5, + left: newItem.bounds.left + 5, + width: newItem.bounds.width - 10, + height: newItem.bounds.height - 10, + zIndex: 999, + opacity: 0 + }) + .appendTo("body") + .animate({opacity: 1}, { + duration: 500, + complete: function() { + $anim.animate({ + top: 0, + left: 0, + width: window.innerWidth, + height: window.innerHeight + }, { + duration: 270, + complete: function() { + iQ(newItem.container).css({opacity: 1}); + newItem.zoomIn(!url); + $anim.remove(); + self._sendToSubscribers("tabAdded", {groupItemId: self.id}); + } + }); + } + }); }, // ---------- @@ -1320,19 +1297,6 @@ window.GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), { // Returns all children. getChildren: function() { return this._children; - }, - - // --------- - // Function: onNextNewTab - // Sets up a one-time handler that gets called the next time a - // tab is added to the groupItem. - // - // Parameters: - // callback - the one-time callback that is fired when the next - // time a tab is added to a groupItem; it gets passed the - // new tab - onNextNewTab: function(callback) { - this._nextNewTabCallback = callback; } }); @@ -1757,6 +1721,7 @@ window.GroupItems = { gBrowser.selectTabAtIndex(index + 1); else gBrowser.selectTabAtIndex(index - 1); + shouldUpdateTabBar = true; } else { shouldShowTabView = true; } diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js index d6696a1ffab4..058cec9bf036 100644 --- a/browser/base/content/tabview/tabitems.js +++ b/browser/base/content/tabview/tabitems.js @@ -684,9 +684,7 @@ window.TabItems = { if (tab.ownerDocument.defaultView != gWindow) return; - setTimeout(function() { // Marshal event from chrome thread to DOM thread - self.link(tab); - }, 1); + self.link(tab); } // When a tab's content is loaded, show the canvas and hide the cached data // if necessary. @@ -694,18 +692,14 @@ window.TabItems = { if (tab.ownerDocument.defaultView != gWindow) return; - setTimeout(function() { // Marshal event from chrome thread to DOM thread - self.update(tab); - }, 1); + self.update(tab); } // When a tab is closed, unlink. this._eventListeners["close"] = function(tab) { if (tab.ownerDocument.defaultView != gWindow) return; - setTimeout(function() { // Marshal event from chrome thread to DOM thread - self.unlink(tab); - }, 1); + self.unlink(tab); } for (let name in this._eventListeners) { AllTabs.register(name, this._eventListeners[name]); diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index 50bbe54e0706..54d31db710c1 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -66,10 +66,6 @@ var UIManager = { // If true, a select tab has just been closed in TabView. _closedSelectedTabInTabView : false, - // Variable: _stopZoomPreparation - // If true, prevent the next zoom preparation. - _stopZoomPreparation : false, - // Variable: _reorderTabItemsOnShow // Keeps track of the s which their tab items' tabs have been moved // and re-orders the tab items when switching to TabView. @@ -158,6 +154,10 @@ var UIManager = { GroupItems.reconstitute(groupItemsData, groupItemData); GroupItems.killNewTabGroup(); // temporary? + // ___ tabs + TabItems.init(); + TabItems.pausePainting(); + if (firstTime) { var padding = 10; var infoWidth = 350; @@ -203,10 +203,6 @@ var UIManager = { infoItem.html(html); } - // ___ tabs - TabItems.init(); - TabItems.pausePainting(); - // ___ resizing if (this._pageBounds) this._resize(true); @@ -440,14 +436,6 @@ var UIManager = { tab.tabItem.setZoomPrep(false); self.showTabView(); } - // ToDo: When running unit tests, everything happens so quick so - // new tabs might be added after a tab is closing. Therefore, this - // hack is used. We should look for a better solution. - setTimeout(function() { // Marshal event from chrome thread to DOM thread - if ((groupItem && groupItem._children.length > 0) || - (groupItem == null && gBrowser.visibleTabs.length > 0)) - self.hideTabView(); - }, 1); } } }); @@ -456,11 +444,9 @@ var UIManager = { if (tab.ownerDocument.defaultView != gWindow) return; - setTimeout(function() { // Marshal event from chrome thread to DOM thread - var activeGroupItem = GroupItems.getActiveGroupItem(); - if (activeGroupItem) - self.setReorderTabItemsOnShow(activeGroupItem); - }, 1); + let activeGroupItem = GroupItems.getActiveGroupItem(); + if (activeGroupItem) + self.setReorderTabItemsOnShow(activeGroupItem); }); AllTabs.register("select", function(tab) { @@ -497,54 +483,40 @@ var UIManager = { this._closedLastVisibleTab = false; this._closedSelectedTabInTabView = false; - setTimeout(function() { // Marshal event from chrome thread to DOM thread - // this value is true when TabView is open at browser startup. - if (self._stopZoomPreparation) { - self._stopZoomPreparation = false; - if (focusTab && focusTab.tabItem) - self.setActiveTab(focusTab.tabItem); - return; + // have things have changed while we were in timeout? + if (focusTab != self._currentTab) + return; + + let newItem = null; + if (focusTab && focusTab.tabItem) { + newItem = focusTab.tabItem; + if (newItem.parent) + GroupItems.setActiveGroupItem(newItem.parent); + else { + GroupItems.setActiveGroupItem(null); + GroupItems.setActiveOrphanTab(newItem); } + GroupItems.updateTabBar(); + } - if (focusTab != self._currentTab) { - // things have changed while we were in timeout - return; - } + // ___ prepare for when we return to TabView + let oldItem = null; + if (currentTab && currentTab.tabItem) + oldItem = currentTab.tabItem; - var visibleTabCount = gBrowser.visibleTabs.length; + if (newItem != oldItem) { + if (oldItem) + oldItem.setZoomPrep(false); - var newItem = null; - if (focusTab && focusTab.tabItem) { - newItem = focusTab.tabItem; - if (newItem.parent) - GroupItems.setActiveGroupItem(newItem.parent); - else { - GroupItems.setActiveGroupItem(null); - GroupItems.setActiveOrphanTab(newItem); - } - GroupItems.updateTabBar(); - } - - // ___ prepare for when we return to TabView - var oldItem = null; - if (currentTab && currentTab.tabItem) - oldItem = currentTab.tabItem; - - if (newItem != oldItem) { - if (oldItem) - oldItem.setZoomPrep(false); - - // if the last visible tab is removed, don't set zoom prep because - // we shoud be in the TabView interface. - if (visibleTabCount > 0 && newItem && !self._isTabViewVisible()) - newItem.setZoomPrep(true); - } else { - // the tab is already focused so the new and old items are the - // same. - if (oldItem) - oldItem.setZoomPrep(!self._isTabViewVisible()); - } - }, 1); + // if the last visible tab is removed, don't set zoom prep because + // we should be in the TabView interface. + let visibleTabCount = gBrowser.visibleTabs.length; + if (visibleTabCount > 0 && newItem && !self._isTabViewVisible()) + newItem.setZoomPrep(true); + } + // the tab is already focused so the new and old items are the same. + else if (oldItem) + oldItem.setZoomPrep(!self._isTabViewVisible()); }, // ---------- From b9c15448d02c7bf181b3ab14fe78c87324f5ac8d Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Mon, 16 Aug 2010 14:09:02 -0400 Subject: [PATCH 089/109] Bug 587363: Fix the spelling mistake by committing the fix I meant to commit. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 9f3330edb029..da73e88c85fa 100644 --- a/configure.in +++ b/configure.in @@ -5952,7 +5952,7 @@ if test -n "$MOZ_WEBM"; then fi ;; esac - if test "$COMPILE_ENVIROMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then + if test "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.]) fi fi # end !WINNT_x86_MSVC From cbb1a922fbd5568976e0c5d74d404cb539e3219a Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 16 Aug 2010 15:05:08 -0400 Subject: [PATCH 090/109] bug 559228 - Update Breakpad to r652 --HG-- extra : rebase_source : bec760bf86aa27731fcced3bfea3dcfaf5213293 --- .../google-breakpad/.hg_archival.txt | 5 + .../google-breakpad/.hgsvnexternals | 7 + toolkit/crashreporter/google-breakpad/README | 41 + .../client/linux/handler/exception_handler.cc | 10 +- .../linux/minidump_writer/linux_dumper.cc | 36 +- .../minidump_extension_linux.h | 74 + .../linux/minidump_writer/minidump_writer.cc | 276 +++- .../mac/Breakpad.xcodeproj/project.pbxproj | 1188 +++++++++++------ .../src/client/mac/Framework/Breakpad.h | 9 +- .../src/client/mac/Framework/Breakpad.mm | 119 +- .../client/mac/Framework/OnDemandServer.mm | 2 +- .../client/mac/crash_generation/Inspector.mm | 16 +- .../client/mac/crash_generation/client_info.h | 47 + .../crash_generation_client.cc | 73 + .../crash_generation_client.h | 65 + .../crash_generation_server.cc | 160 +++ .../crash_generation_server.h | 139 ++ .../client/mac/handler/breakpad_nlist_64.cc | 22 +- .../src/client/mac/handler/dynamic_images.cc | 20 +- .../src/client/mac/handler/dynamic_images.h | 24 +- .../client/mac/handler/exception_handler.cc | 59 +- .../client/mac/handler/exception_handler.h | 24 +- .../mac/handler/exception_handler_test.cc | 99 -- .../client/mac/handler/minidump_generator.cc | 53 +- .../minidump_test.xcodeproj/project.pbxproj | 237 +--- .../mac/handler/protected_memory_allocator.cc | 2 +- .../mac/handler/protected_memory_allocator.h | 4 +- .../client/mac/sender/crash_report_sender.h | 5 +- .../client/mac/sender/crash_report_sender.m | 67 +- .../mac/sender/da.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/da.lproj/Localizable.strings | Bin 0 -> 2428 bytes .../mac/sender/de.lproj/InfoPlist.strings | Bin 0 -> 192 bytes .../mac/sender/de.lproj/Localizable.strings | Bin 0 -> 2746 bytes .../mac/sender/es.lproj/InfoPlist.strings | Bin 0 -> 184 bytes .../mac/sender/es.lproj/Localizable.strings | Bin 0 -> 2578 bytes .../mac/sender/fr.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/fr.lproj/Localizable.strings | Bin 0 -> 2694 bytes .../mac/sender/it.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/it.lproj/Localizable.strings | Bin 0 -> 2590 bytes .../mac/sender/ja.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/ja.lproj/Localizable.strings | Bin 0 -> 1792 bytes .../mac/sender/nl.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/nl.lproj/Localizable.strings | Bin 0 -> 2546 bytes .../mac/sender/no.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/no.lproj/Localizable.strings | Bin 0 -> 2484 bytes .../mac/sender/sl.lproj/InfoPlist.strings | Bin 0 -> 184 bytes .../mac/sender/sl.lproj/Localizable.strings | Bin 0 -> 2632 bytes .../mac/sender/sv.lproj/InfoPlist.strings | Bin 0 -> 156 bytes .../mac/sender/sv.lproj/Localizable.strings | Bin 0 -> 2588 bytes .../mac/sender/tr.lproj/InfoPlist.strings | Bin 0 -> 168 bytes .../mac/sender/tr.lproj/Localizable.strings | Bin 0 -> 2430 bytes .../src/client/mac/testapp/Controller.m | 9 +- .../mac/testapp/English.lproj/MainMenu.xib | 994 ++++++++++++-- .../src/client/mac/testapp/TestClass.mm | 2 +- .../mac/tests/SimpleStringDictionaryTest.h | 2 +- .../src/client/mac/tests/auto_tempdir.h | 72 + .../mac/tests/crash_generation_server_test.cc | 223 ++++ .../mac/tests/exception_handler_test.cc | 198 +++ .../src/client/minidump_file_writer-inl.h | 21 +- .../src/client/minidump_file_writer.cc | 25 +- .../src/client/minidump_file_writer.h | 4 +- .../client/minidump_file_writer_unittest.cc | 11 +- .../src/common/dwarf/bytereader.cc | 2 +- .../src/common/dwarf/bytereader.h | 2 +- .../src/common/dwarf/dwarf2reader.cc | 34 +- .../src/common/dwarf/dwarf2reader.h | 2 +- .../src/common/dwarf/line_state_machine.h | 2 +- .../src/common/dwarf_cfi_to_module.cc | 19 +- .../src/common/dwarf_cfi_to_module.h | 23 +- .../src/common/dwarf_cu_to_module.cc | 27 +- .../src/common/linux/dump_symbols.cc | 443 ++++-- .../src/common/linux/dump_symbols.h | 5 +- .../google-breakpad/src/common/linux/memory.h | 18 + .../src/common/mac/Breakpad.xcconfig | 57 + .../src/common/mac/BreakpadDebug.xcconfig | 32 + .../src/common/mac/BreakpadRelease.xcconfig | 33 + .../src/common/mac/HTTPMultipartUpload.m | 8 +- .../google-breakpad/src/common/mac/MachIPC.h | 13 +- .../google-breakpad/src/common/mac/MachIPC.mm | 39 +- .../src/common/mac/dump_syms.h | 12 +- .../src/common/mac/dump_syms.mm | 23 +- .../src/common/mac/macho_id.cc | 15 +- .../google-breakpad/src/common/mac/macho_id.h | 2 +- .../src/common/mac/macho_reader.cc | 2 +- .../src/common/mac/macho_reader_unittest.cc | 4 +- .../src/common/mac/macho_walker.cc | 16 +- .../src/common/mac/macho_walker.h | 4 + .../src/common/mac/scoped_task_suspend-inl.h | 56 + .../src/common/mac/string_utilities.cc | 2 +- .../google-breakpad/src/common/module.cc | 21 +- .../google-breakpad/src/common/module.h | 26 +- .../src/common/module_unittest.cc | 77 +- .../src/common/stabs_to_module.cc | 19 +- .../src/common/stabs_to_module_unittest.cc | 34 +- .../src/common/string_conversion.cc | 7 +- .../src/common/test_assembler.cc | 2 +- .../src/common/test_assembler_unittest.cc | 8 +- .../src/processor/minidump_unittest.cc | 4 +- .../processor/stackwalker_amd64_unittest.cc | 6 +- .../src/processor/stackwalker_arm_unittest.cc | 6 +- .../src/processor/stackwalker_sparc.cc | 2 +- .../src/processor/stackwalker_x86_unittest.cc | 6 +- .../src/processor/synth_minidump.cc | 14 +- .../src/processor/synth_minidump.h | 40 +- .../src/processor/synth_minidump_unittest.cc | 6 +- .../src/tools/linux/dump_syms/dump_syms.cc | 12 +- .../tools/linux/md2core/minidump-2-core.cc | 733 +++++++++- .../crash_report.xcodeproj/project.pbxproj | 164 +-- .../crash_report/on_demand_symbol_supplier.mm | 40 +- .../dump_syms.xcodeproj/project.pbxproj | 499 +++---- .../src/tools/mac/dump_syms/macho_dump.cc | 3 +- .../src/tools/mac/symupload/minidump_upload.m | 8 +- .../src/tools/mac/symupload/symupload.m | 6 +- .../symupload.xcodeproj/project.pbxproj | 85 +- 114 files changed, 5337 insertions(+), 1830 deletions(-) create mode 100644 toolkit/crashreporter/google-breakpad/.hg_archival.txt create mode 100644 toolkit/crashreporter/google-breakpad/.hgsvnexternals create mode 100644 toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_extension_linux.h create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/client_info.h create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.h create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.h delete mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler_test.cc create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/nl.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/nl.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/no.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/no.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/tr.lproj/InfoPlist.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/sender/tr.lproj/Localizable.strings create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/tests/auto_tempdir.h create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/tests/crash_generation_server_test.cc create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/tests/exception_handler_test.cc create mode 100644 toolkit/crashreporter/google-breakpad/src/common/mac/Breakpad.xcconfig create mode 100644 toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadDebug.xcconfig create mode 100644 toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadRelease.xcconfig create mode 100644 toolkit/crashreporter/google-breakpad/src/common/mac/scoped_task_suspend-inl.h diff --git a/toolkit/crashreporter/google-breakpad/.hg_archival.txt b/toolkit/crashreporter/google-breakpad/.hg_archival.txt new file mode 100644 index 000000000000..1f5c2a88d26b --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/.hg_archival.txt @@ -0,0 +1,5 @@ +repo: aa80aeafa44f5c17c84e1dac5a7119a6d1ef4341 +node: 2645d42a92c4144ec095d774a32d2fcaec1afa0b +branch: default +latesttag: null +latesttagdistance: 581 diff --git a/toolkit/crashreporter/google-breakpad/.hgsvnexternals b/toolkit/crashreporter/google-breakpad/.hgsvnexternals new file mode 100644 index 000000000000..d4d9953d3d80 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/.hgsvnexternals @@ -0,0 +1,7 @@ +[.] + src/testing -r175 http://googlemock.googlecode.com/svn/trunk/ + src/tools/gyp -r762 http://gyp.googlecode.com/svn/trunk +[src/third_party/glog] + glog http://google-glog.googlecode.com/svn/trunk +[src/third_party/protobuf] + protobuf http://protobuf.googlecode.com/svn/trunk diff --git a/toolkit/crashreporter/google-breakpad/README b/toolkit/crashreporter/google-breakpad/README index 93b8df08bb69..3bccd4be8d8c 100644 --- a/toolkit/crashreporter/google-breakpad/README +++ b/toolkit/crashreporter/google-breakpad/README @@ -1,2 +1,43 @@ Breakpad is a set of client and server components which implement a crash-reporting system. + + +----- +Getting started in 32-bit mode (from trunk) +Configure: CXXFLAGS=-m32 CFLAGS=-m32 CPPFLAGS=-m32 ./configure + Build: make + Test: make check + Install: make install + +If you need to reconfigure your build be sure to run "make distclean" first. + + +----- +To request change review: +0. Get access to a read-write copy of source. + Owners at http://code.google.com/p/google-breakpad/ are able to grant + this access. + +1. Check out a read-write copy of source using instructions at + http://code.google.com/p/google-breakpad/source/checkout + +2. Make changes. Build and test your changes. + For core code like processor use methods above. + For linux/mac/windows, there are test targets in each project file. + +3. Download http://codereview.appspot.com/static/upload.py + +4. Run upload.py from the 'src' directory: + upload.py --server=breakpad.appspot.com + + You will be prompted for credential and a description. + +5. At http://breakpad.appspot.com you'll find your issue listed; click on it, + and select Publish+Mail, and enter in the code reviewer and CC + google-breakpad-dev@googlegroups.com + +6. When applying code review feedback, specify the '-i' option when running + upload.py again and pass the issue number so it updates the existing issue, + rather than creating a new one. + Be sure to rerun upload.py from the same directory as you did for previous + uploads to allow for proper diff calculations. diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc index 77a67f8ee4b7..3b8a5c6fbbb4 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -268,7 +269,10 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { // crashed. The default action for all the signals which we catch is Core, so // this is the end of us. signal(sig, SIG_DFL); - tgkill(getpid(), sys_gettid(), sig); + + // TODO(markus): mask signal and return to caller + tgkill(getpid(), syscall(__NR_gettid), sig); + _exit(1); // not reached. } @@ -296,7 +300,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { return false; // Allow ourselves to be dumped. - sys_prctl(PR_SET_DUMPABLE, 1); + prctl(PR_SET_DUMPABLE, 1); CrashContext context; memcpy(&context.siginfo, info, sizeof(siginfo_t)); memcpy(&context.context, uc, sizeof(struct ucontext)); @@ -309,7 +313,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { sizeof(context.float_state)); } #endif - context.tid = sys_gettid(); + context.tid = syscall(__NR_gettid); if (crash_handler_ != NULL) { if (crash_handler_(&context, sizeof(context), callback_context_)) { diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc index fdc52074f8d6..a98fcaa7ea6d 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc @@ -76,6 +76,26 @@ bool AttachThread(pid_t pid) { return false; } } +#if defined(__i386) || defined(__x86_64) + // On x86, the stack pointer is NULL or -1, when executing trusted code in + // the seccomp sandbox. Not only does this cause difficulties down the line + // when trying to dump the thread's stack, it also results in the minidumps + // containing information about the trusted threads. This information is + // generally completely meaningless and just pollutes the minidumps. + // We thus test the stack pointer and exclude any threads that are part of + // the seccomp sandbox's trusted code. + user_regs_struct regs; + if (sys_ptrace(PTRACE_GETREGS, pid, NULL, ®s) == -1 || +#if defined(__i386) + !regs.esp +#elif defined(__x86_64) + !regs.rsp +#endif + ) { + sys_ptrace(PTRACE_DETACH, pid, NULL, NULL); + return false; + } +#endif return true; } @@ -138,11 +158,19 @@ bool LinuxDumper::Init() { bool LinuxDumper::ThreadsAttach() { if (threads_suspended_) return true; - bool good = true; - for (size_t i = 0; i < threads_.size(); ++i) - good &= AttachThread(threads_[i]); + for (size_t i = 0; i < threads_.size(); ++i) { + if (!AttachThread(threads_[i])) { + // If the thread either disappeared before we could attach to it, or if + // it was part of the seccomp sandbox's trusted code, it is OK to + // silently drop it from the minidump. + memmove(&threads_[i], &threads_[i+1], + (threads_.size() - i - 1) * sizeof(threads_[i])); + threads_.resize(threads_.size() - 1); + --i; + } + } threads_suspended_ = true; - return good; + return threads_.size() > 0; } bool LinuxDumper::ThreadsDetach() { diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_extension_linux.h b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_extension_linux.h new file mode 100644 index 000000000000..25bd8eb46d32 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_extension_linux.h @@ -0,0 +1,74 @@ +/* Copyright (c) 2010, Google Inc. + * 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 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. */ + +/* minidump_extension_linux.h: A definition of exception codes for + * Linux + * + * (This is C99 source, please don't corrupt it with C++.) + * + * Author: Adam Langley + * Split into its own file: Markus Gutschke */ + + +#ifndef SRC_CLIENT_LINUX_MINIDUMP_WRITER_MINIDUMP_EXTENSION_LINUX_H_ +#define SRC_CLIENT_LINUX_MINIDUMP_WRITER_MINIDUMP_EXTENSION_LINUX_H_ + +#include + +#include "google_breakpad/common/breakpad_types.h" + +// These are additional minidump stream values which are specific to the linux +// breakpad implementation. +enum { + MD_LINUX_CPU_INFO = 0x47670003, /* /proc/cpuinfo */ + MD_LINUX_PROC_STATUS = 0x47670004, /* /proc/$x/status */ + MD_LINUX_LSB_RELEASE = 0x47670005, /* /etc/lsb-release */ + MD_LINUX_CMD_LINE = 0x47670006, /* /proc/$x/cmdline */ + MD_LINUX_ENVIRON = 0x47670007, /* /proc/$x/environ */ + MD_LINUX_AUXV = 0x47670008, /* /proc/$x/auxv */ + MD_LINUX_MAPS = 0x47670009, /* /proc/$x/maps */ + MD_LINUX_DSO_DEBUG = 0x4767000A /* DSO data */ +}; + +typedef struct { + void* addr; + MDRVA name; + void* ld; +} MDRawLinkMap; + +typedef struct { + u_int32_t version; + MDRVA map; + u_int32_t dso_count; + void* brk; + void* ldbase; + void* dynamic; +} MDRawDebug; + +#endif // SRC_CLIENT_LINUX_MINIDUMP_WRITER_MINIDUMP_EXTENSION_LINUX_H_ diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc index e2a4375228fd..5acf57b9f902 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -48,6 +48,7 @@ #include #include +#include #include #include #include @@ -62,22 +63,12 @@ #include "client/linux/handler/exception_handler.h" #include "client/linux/minidump_writer/line_reader.h" #include "client/linux/minidump_writer/linux_dumper.h" +#include "client/linux/minidump_writer/minidump_extension_linux.h" #include "common/linux/linux_libc_support.h" #include "common/linux/linux_syscall_support.h" using google_breakpad::ThreadInfo; -// These are additional minidump stream values which are specific to the linux -// breakpad implementation. -enum { - MD_LINUX_CPU_INFO = 0x47670003, /* /proc/cpuinfo */ - MD_LINUX_PROC_STATUS = 0x47670004, /* /proc/$x/status */ - MD_LINUX_LSB_RELEASE = 0x47670005, /* /etc/lsb-release */ - MD_LINUX_CMD_LINE = 0x47670006, /* /proc/$x/cmdline */ - MD_LINUX_ENVIRON = 0x47670007, /* /proc/$x/environ */ - MD_LINUX_AUXV = 0x47670008 /* /proc/$x/auxv */ -}; - // Minidump defines register structures which are different from the raw // structures which we get from the kernel. These are platform specific // functions to juggle the ucontext and user structures into minidump format. @@ -457,9 +448,26 @@ class MinidumpWriter { } bool Dump() { + // The dynamic linker makes information available that helps gdb find all + // DSOs loaded into the program. If we can access this information, we dump + // it to a MD_LINUX_DSO_DEBUG stream. + struct r_debug* r_debug = NULL; + uint32_t dynamic_length = 0; + + for (int i = 0;;) { + ElfW(Dyn) dyn; + dynamic_length += sizeof(dyn); + dumper_.CopyFromProcess(&dyn, crashing_tid_, _DYNAMIC+i++, sizeof(dyn)); + if (dyn.d_tag == DT_DEBUG) { + r_debug = (struct r_debug*)dyn.d_un.d_ptr; + continue; + } else if (dyn.d_tag == DT_NULL) + break; + } + // A minidump file contains a number of tagged streams. This is the number // of stream which we write. - static const unsigned kNumWriters = 11; + const unsigned kNumWriters = 11 + !!r_debug; TypedMDRVA header(&minidump_writer_); TypedMDRVA dir(&minidump_writer_); @@ -526,11 +534,18 @@ class MinidumpWriter { NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); - dirent.stream_type = MD_LINUX_AUXV; + dirent.stream_type = MD_LINUX_MAPS; if (!WriteProcFile(&dirent.location, crashing_tid_, "maps")) NullifyDirectoryEntry(&dirent); dir.CopyIndex(dir_index++, &dirent); + if (r_debug) { + dirent.stream_type = MD_LINUX_DSO_DEBUG; + if (!WriteDSODebugStream(&dirent, r_debug, dynamic_length)) + NullifyDirectoryEntry(&dirent); + dir.CopyIndex(dir_index++, &dirent); + } + // If you add more directory entries, don't forget to update kNumWriters, // above. @@ -538,6 +553,123 @@ class MinidumpWriter { return true; } + // Check if the top of the stack is part of a system call that has been + // redirected by the seccomp sandbox. If so, try to pop the stack frames + // all the way back to the point where the interception happened. + void PopSeccompStackFrame(RawContextCPU* cpu, const MDRawThread& thread, + uint8_t* stack_copy) { +#if defined(__x86_64) + u_int64_t bp = cpu->rbp; + u_int64_t top = thread.stack.start_of_memory_range; + for (int i = 4; i--; ) { + if (bp < top || + bp + sizeof(bp) > thread.stack.start_of_memory_range + + thread.stack.memory.data_size || + bp & 1) { + break; + } + uint64_t old_top = top; + top = bp; + u_int8_t* bp_addr = stack_copy + bp - thread.stack.start_of_memory_range; + memcpy(&bp, bp_addr, sizeof(bp)); + if (bp == 0xDEADBEEFDEADBEEFull) { + struct { + uint64_t r15; + uint64_t r14; + uint64_t r13; + uint64_t r12; + uint64_t r11; + uint64_t r10; + uint64_t r9; + uint64_t r8; + uint64_t rdi; + uint64_t rsi; + uint64_t rdx; + uint64_t rcx; + uint64_t rbx; + uint64_t deadbeef; + uint64_t rbp; + uint64_t fakeret; + uint64_t ret; + /* char redzone[128]; */ + } seccomp_stackframe; + if (top - offsetof(typeof(seccomp_stackframe), deadbeef) < old_top || + top - offsetof(typeof(seccomp_stackframe), deadbeef) + + sizeof(seccomp_stackframe) > + thread.stack.start_of_memory_range+thread.stack.memory.data_size) { + break; + } + memcpy(&seccomp_stackframe, + bp_addr - offsetof(typeof(seccomp_stackframe), deadbeef), + sizeof(seccomp_stackframe)); + cpu->rbx = seccomp_stackframe.rbx; + cpu->rcx = seccomp_stackframe.rcx; + cpu->rdx = seccomp_stackframe.rdx; + cpu->rsi = seccomp_stackframe.rsi; + cpu->rdi = seccomp_stackframe.rdi; + cpu->rbp = seccomp_stackframe.rbp; + cpu->rsp = top + 4*sizeof(uint64_t) + 128; + cpu->r8 = seccomp_stackframe.r8; + cpu->r9 = seccomp_stackframe.r9; + cpu->r10 = seccomp_stackframe.r10; + cpu->r11 = seccomp_stackframe.r11; + cpu->r12 = seccomp_stackframe.r12; + cpu->r13 = seccomp_stackframe.r13; + cpu->r14 = seccomp_stackframe.r14; + cpu->r15 = seccomp_stackframe.r15; + cpu->rip = seccomp_stackframe.fakeret; + return; + } + } +#elif defined(__i386) + u_int32_t bp = cpu->ebp; + u_int32_t top = thread.stack.start_of_memory_range; + for (int i = 4; i--; ) { + if (bp < top || + bp + sizeof(bp) > thread.stack.start_of_memory_range + + thread.stack.memory.data_size || + bp & 1) { + break; + } + uint32_t old_top = top; + top = bp; + u_int8_t* bp_addr = stack_copy + bp - thread.stack.start_of_memory_range; + memcpy(&bp, bp_addr, sizeof(bp)); + if (bp == 0xDEADBEEFu) { + struct { + uint32_t edi; + uint32_t esi; + uint32_t edx; + uint32_t ecx; + uint32_t ebx; + uint32_t deadbeef; + uint32_t ebp; + uint32_t fakeret; + uint32_t ret; + } seccomp_stackframe; + if (top - offsetof(typeof(seccomp_stackframe), deadbeef) < old_top || + top - offsetof(typeof(seccomp_stackframe), deadbeef) + + sizeof(seccomp_stackframe) > + thread.stack.start_of_memory_range+thread.stack.memory.data_size) { + break; + } + memcpy(&seccomp_stackframe, + bp_addr - offsetof(typeof(seccomp_stackframe), deadbeef), + sizeof(seccomp_stackframe)); + cpu->ebx = seccomp_stackframe.ebx; + cpu->ecx = seccomp_stackframe.ecx; + cpu->edx = seccomp_stackframe.edx; + cpu->esi = seccomp_stackframe.esi; + cpu->edi = seccomp_stackframe.edi; + cpu->ebp = seccomp_stackframe.ebp; + cpu->esp = top + 4*sizeof(void*); + cpu->eip = seccomp_stackframe.fakeret; + return; + } + } +#endif + } + // Write information about the threads. bool WriteThreadListStream(MDRawDirectory* dirent) { const unsigned num_threads = dumper_.threads().size(); @@ -578,6 +710,7 @@ class MinidumpWriter { return false; my_memset(cpu.get(), 0, sizeof(RawContextCPU)); CPUFillFromUContext(cpu.get(), ucontext_, float_state_); + PopSeccompStackFrame(cpu.get(), thread, stack_copy); thread.thread_context = cpu.location(); crashing_thread_context_ = cpu.location(); } else { @@ -600,6 +733,7 @@ class MinidumpWriter { return false; my_memset(cpu.get(), 0, sizeof(RawContextCPU)); CPUFillFromThreadInfo(cpu.get(), info); + PopSeccompStackFrame(cpu.get(), thread, stack_copy); thread.thread_context = cpu.location(); if ((pid_t)thread.thread_id == crashing_tid_) { @@ -738,6 +872,83 @@ class MinidumpWriter { return true; } + bool WriteDSODebugStream(MDRawDirectory* dirent, struct r_debug* r_debug, + uint32_t dynamic_length) { + // The caller provided us with a pointer to "struct r_debug". We can + // look up the "r_map" field to get a linked list of all loaded DSOs. + // Our list of DSOs potentially is different from the ones in the crashing + // process. So, we have to be careful to never dereference pointers + // directly. Instead, we use CopyFromProcess() everywhere. + // See for a more detailed discussion of the how the dynamic + // loader communicates with debuggers. + + // Count the number of loaded DSOs + int dso_count = 0; + struct r_debug debug_entry; + dumper_.CopyFromProcess(&debug_entry, crashing_tid_, r_debug, + sizeof(debug_entry)); + for (struct link_map* ptr = debug_entry.r_map; ptr; ) { + struct link_map map; + dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map)); + ptr = map.l_next; + dso_count++; + } + + MDRVA linkmap_rva = minidump_writer_.kInvalidMDRVA; + if (dso_count > 0) { + // If we have at least one DSO, create an array of MDRawLinkMap + // entries in the minidump file. + TypedMDRVA linkmap(&minidump_writer_); + if (!linkmap.AllocateArray(dso_count)) + return false; + linkmap_rva = linkmap.location().rva; + int idx = 0; + + // Iterate over DSOs and write their information to mini dump + for (struct link_map* ptr = debug_entry.r_map; ptr; ) { + struct link_map map; + dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map)); + ptr = map.l_next; + char filename[257] = { 0 }; + if (map.l_name) { + dumper_.CopyFromProcess(filename, crashing_tid_, map.l_name, + sizeof(filename) - 1); + } + MDLocationDescriptor location; + if (!minidump_writer_.WriteString(filename, 0, &location)) + return false; + MDRawLinkMap entry; + entry.name = location.rva; + entry.addr = (void*)map.l_addr; + entry.ld = (void*)map.l_ld; + linkmap.CopyIndex(idx++, &entry); + } + } + + // Write MD_LINUX_DSO_DEBUG record + TypedMDRVA debug(&minidump_writer_); + if (!debug.AllocateObjectAndArray(1, dynamic_length)) + return false; + my_memset(debug.get(), 0, sizeof(MDRawDebug)); + dirent->stream_type = MD_LINUX_DSO_DEBUG; + dirent->location = debug.location(); + + debug.get()->version = debug_entry.r_version; + debug.get()->map = linkmap_rva; + debug.get()->dso_count = dso_count; + debug.get()->brk = (void*)debug_entry.r_brk; + debug.get()->ldbase = (void*)debug_entry.r_ldbase; + debug.get()->dynamic = (void*)&_DYNAMIC; + + char *dso_debug_data = new char[dynamic_length]; + dumper_.CopyFromProcess(dso_debug_data, crashing_tid_, &_DYNAMIC, + dynamic_length); + debug.CopyIndexAfterObject(0, dso_debug_data, dynamic_length); + delete[] dso_debug_data; + + return true; + } + private: void NullifyDirectoryEntry(MDRawDirectory* dirent) { dirent->stream_type = 0; @@ -787,7 +998,7 @@ class MinidumpWriter { i < sizeof(cpu_info_table) / sizeof(cpu_info_table[0]); i++) { CpuInfoEntry* entry = &cpu_info_table[i]; - if (entry->found) + if (entry->found && i) continue; if (!strncmp(line, entry->info_name, strlen(entry->info_name))) { const char* value = strchr(line, ':'); @@ -873,29 +1084,48 @@ popline: // We can't stat the files because several of the files that we want to // read are kernel seqfiles, which always have a length of zero. So we have // to read as much as we can into a buffer. - static const unsigned kMaxFileSize = 1024; - uint8_t* data = (uint8_t*) dumper_.allocator()->Alloc(kMaxFileSize); + static const unsigned kBufSize = 1024 - 2*sizeof(void*); + struct Buffers { + struct Buffers* next; + size_t len; + uint8_t data[kBufSize]; + } *buffers = + (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers)); + buffers->next = NULL; + buffers->len = 0; - size_t done = 0; - while (done < kMaxFileSize) { + size_t total = 0; + for (struct Buffers* bufptr = buffers;;) { ssize_t r; do { - r = sys_read(fd, data + done, kMaxFileSize - done); + r = sys_read(fd, &bufptr->data[bufptr->len], kBufSize - bufptr->len); } while (r == -1 && errno == EINTR); if (r < 1) break; - done += r; + + total += r; + bufptr->len += r; + if (bufptr->len == kBufSize) { + bufptr->next = + (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers)); + bufptr = bufptr->next; + bufptr->next = NULL; + bufptr->len = 0; + } } sys_close(fd); - if (!done) + if (!total) return false; UntypedMDRVA memory(&minidump_writer_); - if (!memory.Allocate(done)) + if (!memory.Allocate(total)) return false; - memory.Copy(data, done); + for (MDRVA pos = memory.position(); buffers; buffers = buffers->next) { + memory.Copy(pos, &buffers->data, buffers->len); + pos += buffers->len; + } *result = memory.location(); return true; } diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/client/mac/Breakpad.xcodeproj/project.pbxproj index f6cdcc0037d8..b6bb5fe767f0 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/Breakpad.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/Breakpad.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXAggregateTarget section */ @@ -22,6 +22,12 @@ F95BB8B3101F94D300AA053B /* PBXTargetDependency */, F95BB8B5101F94D300AA053B /* PBXTargetDependency */, F95BB8B7101F94D300AA053B /* PBXTargetDependency */, + 8B31023911F0CF0600FCF3E4 /* PBXTargetDependency */, + 8B31051711F1010E00FCF3E4 /* PBXTargetDependency */, + 8B31051911F1010E00FCF3E4 /* PBXTargetDependency */, + 8B31051B11F1010E00FCF3E4 /* PBXTargetDependency */, + 8B31051D11F1010E00FCF3E4 /* PBXTargetDependency */, + 8B31051F11F1010E00FCF3E4 /* PBXTargetDependency */, ); name = All; productName = All; @@ -32,10 +38,58 @@ 3329D4ED0FA16D820007BBC5 /* Breakpad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3329D4EC0FA16D820007BBC5 /* Breakpad.xib */; }; 33880C800F9E097100817F82 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 33880C7E0F9E097100817F82 /* InfoPlist.strings */; }; 4084699D0F5D9CF900FDCA37 /* crash_report_sender.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4084699C0F5D9CF900FDCA37 /* crash_report_sender.icns */; }; + 8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 8B3101CB11F0CDB000FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B3101EA11F0CDE300FCF3E4 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B3101E911F0CDE300FCF3E4 /* SenTestingKit.framework */; }; + 8B31029411F0D54300FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B3102E611F0D74C00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B3102EB11F0D78000FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B31FC8211EFD2B800FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 8B4BDAAF12012BC5009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; }; + 8B4BDABE12012CEF009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; }; + 8B4BDAC512012D05009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; }; 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; + D24BBBFD121050F000F3D417 /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; }; + D24BBD291211EDB100F3D417 /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; }; + D24BBD321212CACF00F3D417 /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; }; D2A5DD301188633800081F03 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; }; D2A5DD401188640400081F03 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; }; D2A5DD411188642E00081F03 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; }; + D2F9A3D51212F87C002747C1 /* exception_handler_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A3D41212F87C002747C1 /* exception_handler_test.cc */; }; + D2F9A43D12131F55002747C1 /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A43C12131F55002747C1 /* gmock-all.cc */; }; + D2F9A44012131F65002747C1 /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A43E12131F65002747C1 /* gtest_main.cc */; }; + D2F9A44112131F65002747C1 /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A43F12131F65002747C1 /* gtest-all.cc */; }; + D2F9A44412131F84002747C1 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F9A41512131EF0002747C1 /* libgtest.a */; }; + D2F9A4C9121336C7002747C1 /* client_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F9A4C4121336C7002747C1 /* client_info.h */; }; + D2F9A4CA121336C7002747C1 /* crash_generation_client.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F9A4C5121336C7002747C1 /* crash_generation_client.h */; }; + D2F9A4CB121336C7002747C1 /* crash_generation_client.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */; }; + D2F9A4CC121336C7002747C1 /* crash_generation_server.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F9A4C7121336C7002747C1 /* crash_generation_server.h */; }; + D2F9A4CD121336C7002747C1 /* crash_generation_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */; }; + D2F9A4DF12133AD9002747C1 /* crash_generation_client.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */; }; + D2F9A4E012133AD9002747C1 /* crash_generation_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */; }; + D2F9A4E112133AE2002747C1 /* crash_generation_client.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */; }; + D2F9A4E212133AE2002747C1 /* crash_generation_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */; }; + D2F9A52E121383A1002747C1 /* crash_generation_client.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */; }; + D2F9A52F121383A1002747C1 /* crash_generation_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */; }; + D2F9A530121383A1002747C1 /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; }; + D2F9A531121383A1002747C1 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; }; + D2F9A532121383A1002747C1 /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; }; + D2F9A533121383A1002747C1 /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; }; + D2F9A534121383A1002747C1 /* minidump_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536F0ECCE3FD009BE4BA /* minidump_generator.cc */; }; + D2F9A535121383A1002747C1 /* minidump_file_writer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */; }; + D2F9A536121383A1002747C1 /* convert_UTF.c in Sources */ = {isa = PBXBuildFile; fileRef = F92C53870ECCE6C0009BE4BA /* convert_UTF.c */; }; + D2F9A537121383A1002747C1 /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; }; + D2F9A538121383A1002747C1 /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53740ECCE635009BE4BA /* file_id.cc */; }; + D2F9A539121383A1002747C1 /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537A0ECCE635009BE4BA /* macho_id.cc */; }; + D2F9A53A121383A1002747C1 /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537C0ECCE635009BE4BA /* macho_utilities.cc */; }; + D2F9A53B121383A1002747C1 /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537E0ECCE635009BE4BA /* macho_walker.cc */; }; + D2F9A53C121383A1002747C1 /* string_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53820ECCE635009BE4BA /* string_utilities.cc */; }; + D2F9A53F121383A1002747C1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + D2F9A540121383A1002747C1 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; }; + D2F9A541121383A1002747C1 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F9A41512131EF0002747C1 /* libgtest.a */; }; + D2F9A553121383DC002747C1 /* crash_generation_server_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2F9A4CE121336F7002747C1 /* crash_generation_server_test.cc */; }; F91AF5D00FD60393009D8BE2 /* BreakpadFramework_Test.mm in Sources */ = {isa = PBXBuildFile; fileRef = F91AF5CF0FD60393009D8BE2 /* BreakpadFramework_Test.mm */; }; F91AF6210FD60784009D8BE2 /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; }; F9286B3A0F7EB25800A4DCC8 /* InspectorMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = F9286B390F7EB25800A4DCC8 /* InspectorMain.mm */; }; @@ -92,7 +146,6 @@ F93DE33D0F82C66B00608B94 /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537C0ECCE635009BE4BA /* macho_utilities.cc */; }; F93DE33E0F82C66B00608B94 /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537E0ECCE635009BE4BA /* macho_walker.cc */; }; F93DE33F0F82C66B00608B94 /* string_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53820ECCE635009BE4BA /* string_utilities.cc */; }; - F93DE3410F82C68300608B94 /* exception_handler_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F93DE3400F82C68300608B94 /* exception_handler_test.cc */; }; F945849E0F280E3C009A47BF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F945849C0F280E3C009A47BF /* Localizable.strings */; }; F9B630A0100FF96B00D0F4AC /* goArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9B6309F100FF96B00D0F4AC /* goArrow.png */; }; F9C44DB20EF07288003AEBAA /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44DAC0EF07288003AEBAA /* Controller.m */; }; @@ -114,6 +167,167 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 8B31023811F0CF0600FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B88FAFC9116BDCAD00407530; + remoteInfo = all_unittests; + }; + 8B31051611F1010E00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F93803BD0F80820F004D428B; + remoteInfo = generator_test; + }; + 8B31051811F1010E00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F93DE2D00F82A67300608B94; + remoteInfo = minidump_file_writer_unittest; + }; + 8B31051A11F1010E00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F93DE32B0F82C55600608B94; + remoteInfo = handler_test; + }; + 8B31051C11F1010E00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B89E0E731166575200DD08C9; + remoteInfo = macho_dump; + }; + 8B31051E11F1010E00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB894101F94C000AA053B /* symupload.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 9BD835FA0B0544950055103E; + remoteInfo = minidump_upload; + }; + 8B31F7A011EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B89E0E741166575200DD08C9; + remoteInfo = macho_dump; + }; + 8B31F7A211EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB024116BDFFF00407530; + remoteInfo = gtestmockall; + }; + 8B31F7A411EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB14B116CF4A700407530; + remoteInfo = byte_cursor_unittest; + }; + 8B31F7A611EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B89E0E9511665A6400DD08C9; + remoteInfo = macho_reader_unittest; + }; + 8B31F7A811EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB007116BDE8300407530; + remoteInfo = stabs_reader_unittest; + }; + 8B31F7AA11EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB135116CF30F00407530; + remoteInfo = bytereader_unittest; + }; + 8B31F7AC11EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FAF2F116A591E00407530; + remoteInfo = dwarf2reader_cfi_unittest; + }; + 8B31F7AE11EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB0DF116CEEA800407530; + remoteInfo = dwarf2diehandler_unittest; + }; + 8B31F7B011EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB10A116CF07900407530; + remoteInfo = dwarf_cu_to_module_unittest; + }; + 8B31F7B211EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB0F2116CEF1900407530; + remoteInfo = dwarf_line_to_module_unittest; + }; + 8B31F7B411EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB11F116CF27F00407530; + remoteInfo = dwarf_cfi_to_module_unittest; + }; + 8B31F7B611EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B84A91F4116CF784006C210E; + remoteInfo = stabs_to_module_unittest; + }; + 8B31F7B811EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B88FB0B9116CEABF00407530; + remoteInfo = module_unittest; + }; + 8B31F7BA11EF9A8700FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D21F97D211CBA0F200239E38; + remoteInfo = test_assembler_unittest; + }; + D2F9A44212131F80002747C1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2F9A41412131EF0002747C1; + remoteInfo = gtest; + }; + D2F9A52C121383A1002747C1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2F9A41412131EF0002747C1; + remoteInfo = gtest; + }; + D2F9A5DE12142A6A002747C1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2F9A52A121383A1002747C1; + remoteInfo = crash_generation_server_test; + }; F91AF6370FD60A74009D8BE2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -230,7 +444,7 @@ isa = PBXContainerItemProxy; containerPortal = F95BB889101F94AC00AA053B /* dump_syms.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8DD76F960486AA7600D96B5E; + remoteGlobalIDString = B8C5B5101166531A00D34F4E; remoteInfo = dump_syms; }; F95BB8B4101F94D300AA053B /* PBXContainerItemProxy */ = { @@ -278,14 +492,55 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 32DBCF5E0370ADEE00C91783 /* Breakpad_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad_Prefix.pch; path = Framework/Breakpad_Prefix.pch; sourceTree = ""; }; 3329D4EC0FA16D820007BBC5 /* Breakpad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Breakpad.xib; path = sender/Breakpad.xib; sourceTree = ""; }; 33880C7F0F9E097100817F82 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = sender/English.lproj/InfoPlist.strings; sourceTree = ""; }; 4084699C0F5D9CF900FDCA37 /* crash_report_sender.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = crash_report_sender.icns; path = sender/crash_report_sender.icns; sourceTree = ""; }; + 8B31007011F0CD3C00FCF3E4 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMDefines.h; path = ../../common/mac/GTMDefines.h; sourceTree = SOURCE_ROOT; }; + 8B3101E911F0CDE300FCF3E4 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; + 8B31022211F0CE1000FCF3E4 /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMGarbageCollection.h; path = ../../common/mac/GTMGarbageCollection.h; sourceTree = SOURCE_ROOT; }; + 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B31FFF611F0C90500FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; 8DC2EF5B0486A6940098B216 /* Breakpad.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Breakpad.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D2F9A3D41212F87C002747C1 /* exception_handler_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = exception_handler_test.cc; path = tests/exception_handler_test.cc; sourceTree = ""; }; + D2F9A41512131EF0002747C1 /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; }; + D2F9A43C12131F55002747C1 /* gmock-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "gmock-all.cc"; path = "../../testing/src/gmock-all.cc"; sourceTree = SOURCE_ROOT; }; + D2F9A43E12131F65002747C1 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gtest_main.cc; path = ../../testing/gtest/src/gtest_main.cc; sourceTree = ""; }; + D2F9A43F12131F65002747C1 /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "gtest-all.cc"; path = "../../testing/gtest/src/gtest-all.cc"; sourceTree = ""; }; + D2F9A4C4121336C7002747C1 /* client_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = client_info.h; path = crash_generation/client_info.h; sourceTree = ""; }; + D2F9A4C5121336C7002747C1 /* crash_generation_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crash_generation_client.h; path = crash_generation/crash_generation_client.h; sourceTree = ""; }; + D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crash_generation_client.cc; path = crash_generation/crash_generation_client.cc; sourceTree = ""; }; + D2F9A4C7121336C7002747C1 /* crash_generation_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crash_generation_server.h; path = crash_generation/crash_generation_server.h; sourceTree = ""; }; + D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crash_generation_server.cc; path = crash_generation/crash_generation_server.cc; sourceTree = ""; }; + D2F9A4CE121336F7002747C1 /* crash_generation_server_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crash_generation_server_test.cc; path = tests/crash_generation_server_test.cc; sourceTree = ""; }; + D2F9A546121383A1002747C1 /* crash_generation_server_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_generation_server_test; sourceTree = BUILT_PRODUCTS_DIR; }; + DE43467411C72855004F095F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/Localizable.strings; sourceTree = ""; }; + DE43467511C72857004F095F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/Localizable.strings; sourceTree = ""; }; + DE43467611C7285B004F095F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/Localizable.strings; sourceTree = ""; }; + DE43467711C72862004F095F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/Localizable.strings; sourceTree = ""; }; + DE43467811C72869004F095F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/Localizable.strings; sourceTree = ""; }; + DE43467911C7286D004F095F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/Localizable.strings; sourceTree = ""; }; + DE43467A11C72873004F095F /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/Localizable.strings; sourceTree = ""; }; + DE43467B11C72877004F095F /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/Localizable.strings; sourceTree = ""; }; + DE43467C11C7287A004F095F /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/Localizable.strings; sourceTree = ""; }; + DE43467E11C728DC004F095F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/Localizable.strings; sourceTree = ""; }; + DE43467F11C728E1004F095F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/Localizable.strings; sourceTree = ""; }; + DE43468611C72958004F095F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468711C7295D004F095F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468811C7295F004F095F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468911C72964004F095F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468A11C72967004F095F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468B11C7296B004F095F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468C11C7296D004F095F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468D11C7296F004F095F /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468E11C72971004F095F /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43468F11C72973004F095F /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/InfoPlist.strings; sourceTree = ""; }; + DE43469011C72976004F095F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/InfoPlist.strings; sourceTree = ""; }; F91AF5CF0FD60393009D8BE2 /* BreakpadFramework_Test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BreakpadFramework_Test.mm; path = tests/BreakpadFramework_Test.mm; sourceTree = ""; }; F9286B380F7EB25800A4DCC8 /* Inspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Inspector.h; path = crash_generation/Inspector.h; sourceTree = ""; }; F9286B390F7EB25800A4DCC8 /* InspectorMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InspectorMain.mm; path = crash_generation/InspectorMain.mm; sourceTree = ""; }; @@ -326,7 +581,7 @@ F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = minidump_file_writer.cc; path = ../minidump_file_writer.cc; sourceTree = SOURCE_ROOT; }; F92C53900ECCE70A009BE4BA /* minidump_file_writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minidump_file_writer.h; path = ../minidump_file_writer.h; sourceTree = SOURCE_ROOT; }; F92C53B70ECCE7B3009BE4BA /* Inspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Inspector.mm; path = crash_generation/Inspector.mm; sourceTree = SOURCE_ROOT; }; - F92C554A0ECCF530009BE4BA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + F92C554A0ECCF530009BE4BA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; F92C55CE0ECD0064009BE4BA /* Breakpad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad.h; path = Framework/Breakpad.h; sourceTree = ""; }; F92C55CF0ECD0064009BE4BA /* Breakpad.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Breakpad.mm; path = Framework/Breakpad.mm; sourceTree = ""; }; F92C56310ECD0DF1009BE4BA /* OnDemandServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnDemandServer.h; path = Framework/OnDemandServer.h; sourceTree = ""; }; @@ -341,7 +596,6 @@ F93DE2D10F82A67300608B94 /* minidump_file_writer_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = minidump_file_writer_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; F93DE2D70F82A70E00608B94 /* minidump_file_writer_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = minidump_file_writer_unittest.cc; path = ../minidump_file_writer_unittest.cc; sourceTree = SOURCE_ROOT; }; F93DE32C0F82C55600608B94 /* handler_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = handler_test; sourceTree = BUILT_PRODUCTS_DIR; }; - F93DE3400F82C68300608B94 /* exception_handler_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = exception_handler_test.cc; path = handler/exception_handler_test.cc; sourceTree = ""; }; F945849D0F280E3C009A47BF /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = sender/English.lproj/Localizable.strings; sourceTree = ""; }; F945859D0F78241E009A47BF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Framework/Info.plist; sourceTree = ""; }; F95BB87C101F949F00AA053B /* crash_report.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = crash_report.xcodeproj; path = ../../tools/mac/crash_report/crash_report.xcodeproj; sourceTree = SOURCE_ROOT; }; @@ -359,7 +613,7 @@ F9C44DBB0EF072A0003AEBAA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = testapp/English.lproj/MainMenu.xib; sourceTree = ""; }; F9C44DBF0EF0778F003AEBAA /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = testapp/Controller.h; sourceTree = ""; }; F9C44DC00EF0778F003AEBAA /* TestClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClass.h; path = testapp/TestClass.h; sourceTree = ""; }; - F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = ""; }; + F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; F9C44EE70EF0A3C1003AEBAA /* GTMLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMLogger.h; path = ../../common/mac/GTMLogger.h; sourceTree = SOURCE_ROOT; }; F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTMLogger.m; path = ../../common/mac/GTMLogger.m; sourceTree = SOURCE_ROOT; }; F9C77DDA0F7DD5CF0045F7DB /* UnitTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -380,6 +634,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D2F9A41312131EF0002747C1 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2F9A53E121383A1002747C1 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D2F9A53F121383A1002747C1 /* Foundation.framework in Frameworks */, + D2F9A540121383A1002747C1 /* libcrypto.dylib in Frameworks */, + D2F9A541121383A1002747C1 /* libgtest.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F92C53520ECCE349009BE4BA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -393,7 +664,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8B31FC8211EFD2B800FCF3E4 /* Foundation.framework in Frameworks */, F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */, + 8B4BDAAF12012BC5009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -402,6 +675,8 @@ buildActionMask = 2147483647; files = ( F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */, + 8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */, + 8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -409,6 +684,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8B31029411F0D54300FCF3E4 /* Foundation.framework in Frameworks */, + 8B4BDABE12012CEF009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -423,6 +700,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8B3102E611F0D74C00FCF3E4 /* Foundation.framework in Frameworks */, + 8B4BDAC512012D05009C7060 /* libcrypto.dylib in Frameworks */, + D2F9A44412131F84002747C1 /* libgtest.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -431,6 +711,8 @@ buildActionMask = 2147483647; files = ( F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */, + 8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */, + 8B3101CB11F0CDB000FCF3E4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -439,6 +721,9 @@ buildActionMask = 2147483647; files = ( F91AF6210FD60784009D8BE2 /* Breakpad.framework in Frameworks */, + 8B3101EA11F0CDE300FCF3E4 /* SenTestingKit.framework in Frameworks */, + 8B3102EB11F0D78000FCF3E4 /* Foundation.framework in Frameworks */, + D24BBBFD121050F000F3D417 /* breakpadUtilities.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -457,6 +742,8 @@ F93803BE0F80820F004D428B /* generator_test */, F93DE2D10F82A67300608B94 /* minidump_file_writer_unittest */, F93DE32C0F82C55600608B94 /* handler_test */, + D2F9A41512131EF0002747C1 /* libgtest.a */, + D2F9A546121383A1002747C1 /* crash_generation_server_test */, ); name = Products; sourceTree = ""; @@ -464,6 +751,10 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + D2F9A43812131F3B002747C1 /* gtest */, + 8B31FFF611F0C90500FCF3E4 /* Breakpad.xcconfig */, + 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */, + 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */, F95BB8A3101F94C300AA053B /* Tools */, 32DBCF5E0370ADEE00C91783 /* Breakpad_Prefix.pch */, F92C538D0ECCE6F2009BE4BA /* client */, @@ -478,6 +769,8 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( + 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */, + 8B3101E911F0CDE300FCF3E4 /* SenTestingKit.framework */, F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */, F92C554A0ECCF530009BE4BA /* Carbon.framework */, 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */, @@ -487,10 +780,19 @@ name = Frameworks; sourceTree = ""; }; + D2F9A43812131F3B002747C1 /* gtest */ = { + isa = PBXGroup; + children = ( + D2F9A43E12131F65002747C1 /* gtest_main.cc */, + D2F9A43F12131F65002747C1 /* gtest-all.cc */, + D2F9A43C12131F55002747C1 /* gmock-all.cc */, + ); + name = gtest; + sourceTree = ""; + }; F92C53590ECCE3BB009BE4BA /* handler */ = { isa = PBXGroup; children = ( - F93DE3400F82C68300608B94 /* exception_handler_test.cc */, F93803D90F8083D8004D428B /* minidump_generator_test.cc */, F92C53670ECCE3FD009BE4BA /* breakpad_exc_server.c */, F92C53680ECCE3FD009BE4BA /* breakpad_exc_server.h */, @@ -523,6 +825,8 @@ F92C53840ECCE68D009BE4BA /* mac */ = { isa = PBXGroup; children = ( + 8B31022211F0CE1000FCF3E4 /* GTMGarbageCollection.h */, + 8B31007011F0CD3C00FCF3E4 /* GTMDefines.h */, F9C77E0F0F7DDF650045F7DB /* testing */, F9C44EE70EF0A3C1003AEBAA /* GTMLogger.h */, F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */, @@ -574,6 +878,11 @@ F92C53B50ECCE799009BE4BA /* crash_generation */ = { isa = PBXGroup; children = ( + D2F9A4C4121336C7002747C1 /* client_info.h */, + D2F9A4C5121336C7002747C1 /* crash_generation_client.h */, + D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */, + D2F9A4C7121336C7002747C1 /* crash_generation_server.h */, + D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */, F9286B380F7EB25800A4DCC8 /* Inspector.h */, F9286B390F7EB25800A4DCC8 /* InspectorMain.mm */, F92C53B70ECCE7B3009BE4BA /* Inspector.mm */, @@ -620,6 +929,20 @@ isa = PBXGroup; children = ( F95BB892101F94AC00AA053B /* dump_syms */, + 8B31F7A111EF9A8700FCF3E4 /* macho_dump */, + 8B31F7A311EF9A8700FCF3E4 /* libgtestmockall.a */, + 8B31F7A511EF9A8700FCF3E4 /* byte_cursor_unittest */, + 8B31F7A711EF9A8700FCF3E4 /* macho_reader_unittest */, + 8B31F7A911EF9A8700FCF3E4 /* stabs_reader_unittest */, + 8B31F7AB11EF9A8700FCF3E4 /* bytereader_unittest */, + 8B31F7AD11EF9A8700FCF3E4 /* dwarf2reader_cfi_unittest */, + 8B31F7AF11EF9A8700FCF3E4 /* dwarf2diehandler_unittest */, + 8B31F7B111EF9A8700FCF3E4 /* dwarf_cu_to_module_unittest */, + 8B31F7B311EF9A8700FCF3E4 /* dwarf_line_to_module_unittest */, + 8B31F7B511EF9A8700FCF3E4 /* dwarf_cfi_to_module_unittest */, + 8B31F7B711EF9A8700FCF3E4 /* stabs_to_module_unittest */, + 8B31F7B911EF9A8700FCF3E4 /* module_unittest */, + 8B31F7BB11EF9A8700FCF3E4 /* test_assembler_unittest */, ); name = Products; sourceTree = ""; @@ -663,6 +986,8 @@ F9C77DDF0F7DD7CF0045F7DB /* tests */ = { isa = PBXGroup; children = ( + D2F9A4CE121336F7002747C1 /* crash_generation_server_test.cc */, + D2F9A3D41212F87C002747C1 /* exception_handler_test.cc */, F9C77DE00F7DD7E30045F7DB /* SimpleStringDictionaryTest.h */, F9C77DE10F7DD7E30045F7DB /* SimpleStringDictionaryTest.mm */, F91AF5CF0FD60393009D8BE2 /* BreakpadFramework_Test.mm */, @@ -688,6 +1013,16 @@ files = ( F92C55D00ECD0064009BE4BA /* Breakpad.h in Headers */, F92C56330ECD0DF1009BE4BA /* OnDemandServer.h in Headers */, + D2F9A4C9121336C7002747C1 /* client_info.h in Headers */, + D2F9A4CA121336C7002747C1 /* crash_generation_client.h in Headers */, + D2F9A4CC121336C7002747C1 /* crash_generation_server.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2F9A41112131EF0002747C1 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( ); runOnlyForDeploymentPostprocessing = 0; }; @@ -724,6 +1059,40 @@ productReference = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; productType = "com.apple.product-type.framework"; }; + D2F9A41412131EF0002747C1 /* gtest */ = { + isa = PBXNativeTarget; + buildConfigurationList = D2F9A42D12131F0E002747C1 /* Build configuration list for PBXNativeTarget "gtest" */; + buildPhases = ( + D2F9A41112131EF0002747C1 /* Headers */, + D2F9A41212131EF0002747C1 /* Sources */, + D2F9A41312131EF0002747C1 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = gtest; + productName = gtest; + productReference = D2F9A41512131EF0002747C1 /* libgtest.a */; + productType = "com.apple.product-type.library.static"; + }; + D2F9A52A121383A1002747C1 /* crash_generation_server_test */ = { + isa = PBXNativeTarget; + buildConfigurationList = D2F9A542121383A1002747C1 /* Build configuration list for PBXNativeTarget "crash_generation_server_test" */; + buildPhases = ( + D2F9A52D121383A1002747C1 /* Sources */, + D2F9A53E121383A1002747C1 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + D2F9A52B121383A1002747C1 /* PBXTargetDependency */, + ); + name = crash_generation_server_test; + productName = handler_test; + productReference = D2F9A546121383A1002747C1 /* crash_generation_server_test */; + productType = "com.apple.product-type.tool"; + }; F92C53530ECCE349009BE4BA /* Inspector */ = { isa = PBXNativeTarget; buildConfigurationList = F92C53580ECCE36D009BE4BA /* Build configuration list for PBXNativeTarget "Inspector" */; @@ -818,6 +1187,7 @@ buildRules = ( ); dependencies = ( + D2F9A44312131F80002747C1 /* PBXTargetDependency */, ); name = handler_test; productName = handler_test; @@ -858,6 +1228,7 @@ F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */, F93DE3700F82CC1300608B94 /* PBXTargetDependency */, F91AF6380FD60A74009D8BE2 /* PBXTargetDependency */, + D2F9A5DF12142A6A002747C1 /* PBXTargetDependency */, ); name = UnitTests; productName = UnitTests; @@ -870,8 +1241,22 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; + knownRegions = ( + English, + da, + de, + es, + fr, + it, + ja, + nl, + no, + sl, + sv, + tr, + ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; @@ -901,11 +1286,111 @@ F93803BD0F80820F004D428B /* generator_test */, F93DE2D00F82A67300608B94 /* minidump_file_writer_unittest */, F93DE32B0F82C55600608B94 /* handler_test */, + D2F9A41412131EF0002747C1 /* gtest */, + D2F9A52A121383A1002747C1 /* crash_generation_server_test */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 8B31F7A111EF9A8700FCF3E4 /* macho_dump */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = macho_dump; + remoteRef = 8B31F7A011EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7A311EF9A8700FCF3E4 /* libgtestmockall.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libgtestmockall.a; + remoteRef = 8B31F7A211EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7A511EF9A8700FCF3E4 /* byte_cursor_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = byte_cursor_unittest; + remoteRef = 8B31F7A411EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7A711EF9A8700FCF3E4 /* macho_reader_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = macho_reader_unittest; + remoteRef = 8B31F7A611EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7A911EF9A8700FCF3E4 /* stabs_reader_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = stabs_reader_unittest; + remoteRef = 8B31F7A811EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7AB11EF9A8700FCF3E4 /* bytereader_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = bytereader_unittest; + remoteRef = 8B31F7AA11EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7AD11EF9A8700FCF3E4 /* dwarf2reader_cfi_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = dwarf2reader_cfi_unittest; + remoteRef = 8B31F7AC11EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7AF11EF9A8700FCF3E4 /* dwarf2diehandler_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = dwarf2diehandler_unittest; + remoteRef = 8B31F7AE11EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7B111EF9A8700FCF3E4 /* dwarf_cu_to_module_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = dwarf_cu_to_module_unittest; + remoteRef = 8B31F7B011EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7B311EF9A8700FCF3E4 /* dwarf_line_to_module_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = dwarf_line_to_module_unittest; + remoteRef = 8B31F7B211EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7B511EF9A8700FCF3E4 /* dwarf_cfi_to_module_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = dwarf_cfi_to_module_unittest; + remoteRef = 8B31F7B411EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7B711EF9A8700FCF3E4 /* stabs_to_module_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = stabs_to_module_unittest; + remoteRef = 8B31F7B611EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7B911EF9A8700FCF3E4 /* module_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = module_unittest; + remoteRef = 8B31F7B811EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8B31F7BB11EF9A8700FCF3E4 /* test_assembler_unittest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = test_assembler_unittest; + remoteRef = 8B31F7BA11EF9A8700FCF3E4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; F95BB885101F949F00AA053B /* crash_report */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; @@ -1019,7 +1504,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\necho running minidump generator tests...\n\"${BUILT_PRODUCTS_DIR}/generator_test\"\necho Running exception handler tests...\n\"${BUILT_PRODUCTS_DIR}/handler_test\"\n"; + shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n\necho running minidump generator tests...\n\"${BUILT_PRODUCTS_DIR}/generator_test\"\necho Running exception handler tests...\n\"${BUILT_PRODUCTS_DIR}/handler_test\"\necho Running crash generation server tests...\n\"${BUILT_PRODUCTS_DIR}/crash_generation_server_test\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1032,6 +1517,41 @@ F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */, F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */, F92C56340ECD0DF1009BE4BA /* OnDemandServer.mm in Sources */, + D2F9A4CB121336C7002747C1 /* crash_generation_client.cc in Sources */, + D2F9A4CD121336C7002747C1 /* crash_generation_server.cc in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2F9A41212131EF0002747C1 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D2F9A43D12131F55002747C1 /* gmock-all.cc in Sources */, + D2F9A44012131F65002747C1 /* gtest_main.cc in Sources */, + D2F9A44112131F65002747C1 /* gtest-all.cc in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2F9A52D121383A1002747C1 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D2F9A553121383DC002747C1 /* crash_generation_server_test.cc in Sources */, + D2F9A52E121383A1002747C1 /* crash_generation_client.cc in Sources */, + D2F9A52F121383A1002747C1 /* crash_generation_server.cc in Sources */, + D2F9A530121383A1002747C1 /* MachIPC.mm in Sources */, + D2F9A531121383A1002747C1 /* breakpad_nlist_64.cc in Sources */, + D2F9A532121383A1002747C1 /* dynamic_images.cc in Sources */, + D2F9A533121383A1002747C1 /* exception_handler.cc in Sources */, + D2F9A534121383A1002747C1 /* minidump_generator.cc in Sources */, + D2F9A535121383A1002747C1 /* minidump_file_writer.cc in Sources */, + D2F9A536121383A1002747C1 /* convert_UTF.c in Sources */, + D2F9A537121383A1002747C1 /* string_conversion.cc in Sources */, + D2F9A538121383A1002747C1 /* file_id.cc in Sources */, + D2F9A539121383A1002747C1 /* macho_id.cc in Sources */, + D2F9A53A121383A1002747C1 /* macho_utilities.cc in Sources */, + D2F9A53B121383A1002747C1 /* macho_walker.cc in Sources */, + D2F9A53C121383A1002747C1 /* string_utilities.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1078,6 +1598,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D2F9A4DF12133AD9002747C1 /* crash_generation_client.cc in Sources */, + D2F9A4E012133AD9002747C1 /* crash_generation_server.cc in Sources */, + D24BBD291211EDB100F3D417 /* MachIPC.mm in Sources */, D2A5DD401188640400081F03 /* breakpad_nlist_64.cc in Sources */, F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */, F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */, @@ -1109,6 +1632,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D2F9A4E112133AE2002747C1 /* crash_generation_client.cc in Sources */, + D2F9A4E212133AE2002747C1 /* crash_generation_server.cc in Sources */, + D24BBD321212CACF00F3D417 /* MachIPC.mm in Sources */, D2A5DD411188642E00081F03 /* breakpad_nlist_64.cc in Sources */, F93DE3350F82C66B00608B94 /* dynamic_images.cc in Sources */, F93DE3360F82C66B00608B94 /* exception_handler.cc in Sources */, @@ -1121,7 +1647,7 @@ F93DE33D0F82C66B00608B94 /* macho_utilities.cc in Sources */, F93DE33E0F82C66B00608B94 /* macho_walker.cc in Sources */, F93DE33F0F82C66B00608B94 /* string_utilities.cc in Sources */, - F93DE3410F82C68300608B94 /* exception_handler_test.cc in Sources */, + D2F9A3D51212F87C002747C1 /* exception_handler_test.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1149,6 +1675,51 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 8B31023911F0CF0600FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = all_unittests; + targetProxy = 8B31023811F0CF0600FCF3E4 /* PBXContainerItemProxy */; + }; + 8B31051711F1010E00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = F93803BD0F80820F004D428B /* generator_test */; + targetProxy = 8B31051611F1010E00FCF3E4 /* PBXContainerItemProxy */; + }; + 8B31051911F1010E00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = F93DE2D00F82A67300608B94 /* minidump_file_writer_unittest */; + targetProxy = 8B31051811F1010E00FCF3E4 /* PBXContainerItemProxy */; + }; + 8B31051B11F1010E00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = F93DE32B0F82C55600608B94 /* handler_test */; + targetProxy = 8B31051A11F1010E00FCF3E4 /* PBXContainerItemProxy */; + }; + 8B31051D11F1010E00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = macho_dump; + targetProxy = 8B31051C11F1010E00FCF3E4 /* PBXContainerItemProxy */; + }; + 8B31051F11F1010E00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = minidump_upload; + targetProxy = 8B31051E11F1010E00FCF3E4 /* PBXContainerItemProxy */; + }; + D2F9A44312131F80002747C1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2F9A41412131EF0002747C1 /* gtest */; + targetProxy = D2F9A44212131F80002747C1 /* PBXContainerItemProxy */; + }; + D2F9A52B121383A1002747C1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2F9A41412131EF0002747C1 /* gtest */; + targetProxy = D2F9A52C121383A1002747C1 /* PBXContainerItemProxy */; + }; + D2F9A5DF12142A6A002747C1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2F9A52A121383A1002747C1 /* crash_generation_server_test */; + targetProxy = D2F9A5DE12142A6A002747C1 /* PBXContainerItemProxy */; + }; F91AF6380FD60A74009D8BE2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 8DC2EF4F0486A6940098B216 /* Breakpad */; @@ -1241,6 +1812,17 @@ isa = PBXVariantGroup; children = ( 33880C7F0F9E097100817F82 /* English */, + DE43468711C7295D004F095F /* da */, + DE43468611C72958004F095F /* de */, + DE43468811C7295F004F095F /* es */, + DE43468911C72964004F095F /* fr */, + DE43468A11C72967004F095F /* it */, + DE43468B11C7296B004F095F /* ja */, + DE43468C11C7296D004F095F /* nl */, + DE43468D11C7296F004F095F /* no */, + DE43468E11C72971004F095F /* sl */, + DE43468F11C72973004F095F /* sv */, + DE43469011C72976004F095F /* tr */, ); name = InfoPlist.strings; sourceTree = ""; @@ -1249,6 +1831,17 @@ isa = PBXVariantGroup; children = ( F945849D0F280E3C009A47BF /* English */, + DE43467411C72855004F095F /* da */, + DE43467511C72857004F095F /* de */, + DE43467611C7285B004F095F /* es */, + DE43467711C72862004F095F /* fr */, + DE43467811C72869004F095F /* it */, + DE43467E11C728DC004F095F /* ja */, + DE43467911C7286D004F095F /* nl */, + DE43467A11C72873004F095F /* no */, + DE43467B11C72877004F095F /* sl */, + DE43467C11C7287A004F095F /* sv */, + DE43467F11C728E1004F095F /* tr */, ); name = Localizable.strings; sourceTree = ""; @@ -1275,18 +1868,12 @@ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = Breakpad; @@ -1297,14 +1884,12 @@ 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = Breakpad; @@ -1314,48 +1899,110 @@ }; 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Debug; }; 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../..//**"; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + }; + name = Release; + }; + D2F9A41612131EF0002747C1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../testing, + ../../testing/include, + ../../testing/gtest, + ../../testing/gtest/include, + ); PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + PRODUCT_NAME = gtest; + }; + name = Debug; + }; + D2F9A41712131EF0002747C1 /* Debug With Code Coverage */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + PREBINDING = NO; + PRODUCT_NAME = gtest; + }; + name = "Debug With Code Coverage"; + }; + D2F9A41812131EF0002747C1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + PREBINDING = NO; + PRODUCT_NAME = gtest; + ZERO_LINK = NO; + }; + name = Release; + }; + D2F9A543121383A1002747C1 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + HEADER_SEARCH_PATHS = ( + ../.., + ../../testing, + ../../testing/include, + ../../testing/gtest, + ../../testing/gtest/include, + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build/Debug\"", + ); + PRODUCT_NAME = crash_generation_server_test; + }; + name = Debug; + }; + D2F9A544121383A1002747C1 /* Debug With Code Coverage */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ../..; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\"$(SRCROOT)/build/Debug\\\"", + ); + PRODUCT_NAME = handler_test; + }; + name = "Debug With Code Coverage"; + }; + D2F9A545121383A1002747C1 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ../..; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\"$(SRCROOT)/build/Debug\\\"", + ); + PRODUCT_NAME = handler_test; }; name = Release; }; F92C53560ECCE34A009BE4BA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "$(inherited)", - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = Inspector; }; name = Debug; @@ -1363,45 +2010,22 @@ F92C53570ECCE34A009BE4BA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/bin; - LD_GENERATE_MAP_FILE = YES; - OTHER_LDFLAGS = ( - "$(inherited)", - "-lcrypto", - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = Inspector; - ZERO_LINK = NO; }; name = Release; }; F92C563D0ECD10B3009BE4BA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/lib; + HEADER_SEARCH_PATHS = ../..; LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)"; OTHER_LDFLAGS = ( "$(inherited)", "-headerpad_max_install_names", - "-lcrypto", ); - PREBINDING = NO; PRODUCT_NAME = breakpadUtilities; }; name = Debug; @@ -1409,47 +2033,23 @@ F92C563E0ECD10B3009BE4BA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/lib; + HEADER_SEARCH_PATHS = ../..; LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)"; OTHER_LDFLAGS = ( "$(inherited)", "-headerpad_max_install_names", - "-lcrypto", ); - PREBINDING = NO; PRODUCT_NAME = breakpadUtilities; - ZERO_LINK = NO; }; name = Release; }; F92C56A30ECE04A8009BE4BA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = "sender/crash_report_sender-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = crash_report_sender; }; name = Debug; @@ -1457,181 +2057,94 @@ F92C56A40ECE04A8009BE4BA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = "sender/crash_report_sender-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = crash_report_sender; - ZERO_LINK = NO; }; name = Release; }; F93803C00F808210004D428B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Foundation, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = generator_test; - USER_HEADER_SEARCH_PATHS = ../../; }; name = Debug; }; F93803C10F808210004D428B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Foundation, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = generator_test; - ZERO_LINK = NO; }; name = Release; }; F93DE2D30F82A67400608B94 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = minidump_file_writer_unittest; - USER_HEADER_SEARCH_PATHS = ../../; }; name = Debug; }; F93DE2D40F82A67400608B94 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = minidump_file_writer_unittest; - ZERO_LINK = NO; }; name = Release; }; F93DE32E0F82C55700608B94 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Foundation, + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + HEADER_SEARCH_PATHS = ( + ../.., + ../../testing, + ../../testing/include, + ../../testing/gtest, + ../../testing/gtest/include, + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build/Debug\"", ); - PREBINDING = NO; PRODUCT_NAME = handler_test; - USER_HEADER_SEARCH_PATHS = ../../; }; name = Debug; }; F93DE32F0F82C55700608B94 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Foundation, + HEADER_SEARCH_PATHS = ../..; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build/Debug\"", ); - PREBINDING = NO; PRODUCT_NAME = handler_test; - ZERO_LINK = NO; }; name = Release; }; F93DE3B90F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; }; name = "Debug With Code Coverage"; }; F93DE3BA0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = Breakpad; @@ -1642,19 +2155,7 @@ F93DE3BB0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lcrypto", - "$(inherited)", - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = Inspector; }; name = "Debug With Code Coverage"; @@ -1662,24 +2163,14 @@ F93DE3BC0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; - INSTALL_PATH = /usr/local/lib; + HEADER_SEARCH_PATHS = ../..; LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)"; OTHER_LDFLAGS = ( "$(inherited)", "-headerpad_max_install_names", - "-lcrypto", ); - PREBINDING = NO; PRODUCT_NAME = breakpadUtilities; }; name = "Debug With Code Coverage"; @@ -1687,23 +2178,8 @@ F93DE3BD0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - HEADER_SEARCH_PATHS = "../..//**"; + HEADER_SEARCH_PATHS = ../..; INFOPLIST_FILE = "sender/crash_report_sender-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = crash_report_sender; }; name = "Debug With Code Coverage"; @@ -1711,24 +2187,8 @@ F93DE3BE0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = testapp/Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = BreakpadTest; }; name = "Debug With Code Coverage"; @@ -1736,9 +2196,6 @@ F93DE3BF0F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = All; }; name = "Debug With Code Coverage"; @@ -1746,28 +2203,14 @@ F93DE3C00F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "UnitTests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - LIBRARY_SEARCH_PATHS = ./gcov; - OTHER_LDFLAGS = ( - "-lgcov", - "-framework", - Cocoa, - "-framework", - SenTestingKit, + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", ); - PREBINDING = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + HEADER_SEARCH_PATHS = ../..; + INFOPLIST_FILE = "UnitTests-Info.plist"; PRODUCT_NAME = UnitTests; - USER_HEADER_SEARCH_PATHS = "../../ ../../common/mac/**"; WRAPPER_EXTENSION = octest; }; name = "Debug With Code Coverage"; @@ -1775,86 +2218,34 @@ F93DE3C10F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - LIBRARY_SEARCH_PATHS = ./gcov; - OTHER_LDFLAGS = ( - "-lgcov", - "-lcrypto", - "-framework", - Foundation, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = generator_test; - USER_HEADER_SEARCH_PATHS = ../../; }; name = "Debug With Code Coverage"; }; F93DE3C20F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - LIBRARY_SEARCH_PATHS = ./gcov; - OTHER_LDFLAGS = ( - "-lgcov", - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../..; PRODUCT_NAME = minidump_file_writer_unittest; - USER_HEADER_SEARCH_PATHS = ../../; }; name = "Debug With Code Coverage"; }; F93DE3C30F830E7000608B94 /* Debug With Code Coverage */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - LIBRARY_SEARCH_PATHS = ./gcov; - OTHER_LDFLAGS = ( - "-lcrypto", - "-lgcov", - "-framework", - Foundation, + HEADER_SEARCH_PATHS = ../..; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/build/Debug\"", ); - PREBINDING = NO; PRODUCT_NAME = handler_test; - USER_HEADER_SEARCH_PATHS = ../../; }; name = "Debug With Code Coverage"; }; F94585850F782326009A47BF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = All; }; name = Debug; @@ -1862,35 +2253,15 @@ F94585860F782326009A47BF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = All; - ZERO_LINK = NO; }; name = Release; }; F9C44DA80EF060A8003AEBAA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = testapp/Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = BreakpadTest; }; name = Debug; @@ -1898,46 +2269,22 @@ F9C44DA90EF060A8003AEBAA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; INFOPLIST_FILE = testapp/Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; PRODUCT_NAME = BreakpadTest; - ZERO_LINK = NO; }; name = Release; }; F9C77DDC0F7DD5D00045F7DB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; - INFOPLIST_FILE = "UnitTests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", ); - PREBINDING = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + INFOPLIST_FILE = "UnitTests-Info.plist"; PRODUCT_NAME = UnitTests; - USER_HEADER_SEARCH_PATHS = "../../ ../../common/mac/**"; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -1945,25 +2292,14 @@ F9C77DDD0F7DD5D00045F7DB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; - INFOPLIST_FILE = "UnitTests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Cocoa, - "-framework", - SenTestingKit, + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", ); - PREBINDING = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + INFOPLIST_FILE = "UnitTests-Info.plist"; PRODUCT_NAME = UnitTests; WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; }; name = Release; }; @@ -1990,6 +2326,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + D2F9A42D12131F0E002747C1 /* Build configuration list for PBXNativeTarget "gtest" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D2F9A41612131EF0002747C1 /* Debug */, + D2F9A41712131EF0002747C1 /* Debug With Code Coverage */, + D2F9A41812131EF0002747C1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D2F9A542121383A1002747C1 /* Build configuration list for PBXNativeTarget "crash_generation_server_test" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D2F9A543121383A1002747C1 /* Debug */, + D2F9A544121383A1002747C1 /* Debug With Code Coverage */, + D2F9A545121383A1002747C1 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; F92C53580ECCE36D009BE4BA /* Build configuration list for PBXNativeTarget "Inspector" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.h b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.h index 6b5ce66ac897..52ea6c6b8cad 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.h @@ -110,16 +110,19 @@ typedef bool (*BreakpadFilterCallback)(int exception_type, // Key: Value: // BREAKPAD_PRODUCT Product name (e.g., "MyAwesomeProduct") // This one is used as the key to identify -// the product when uploading +// the product when uploading. Falls back to +// CFBundleName if not specified. // REQUIRED // // BREAKPAD_PRODUCT_DISPLAY This is the display name, e.g. a pretty // name for the product when the crash_sender -// pops up UI for the user. Falls back to +// pops up UI for the user. Falls back first to +// CFBundleDisplayName and then to // BREAKPAD_PRODUCT if not specified. // // BREAKPAD_VERSION Product version (e.g., 1.2.3), used -// as metadata for crash report +// as metadata for crash report. Falls back to +// CFBundleVersion if not specified. // REQUIRED // // BREAKPAD_VENDOR Vendor name, used in UI (e.g. "A report has diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.mm b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.mm index 23e5d9bfc6cb..12b5f283c835 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.mm +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.mm @@ -55,6 +55,10 @@ using google_breakpad::KeyValueEntry; +using google_breakpad::MachPortSender; +using google_breakpad::MachReceiveMessage; +using google_breakpad::MachSendMessage; +using google_breakpad::ReceivePort; using google_breakpad::SimpleStringDictionary; using google_breakpad::SimpleStringDictionaryIterator; @@ -164,7 +168,7 @@ class Breakpad { : handler_(NULL), config_params_(NULL), send_and_exit_(true), - filter_callback_(NULL), + filter_callback_(NULL), filter_callback_context_(NULL) { inspector_path_[0] = 0; } @@ -265,7 +269,7 @@ bool Breakpad::ExceptionHandlerDirectCallback(void *context, //============================================================================= #pragma mark - -#include +#include //============================================================================= // Returns the pathname to the Resources directory for this version of @@ -286,28 +290,21 @@ NSString * GetResourcePath() { // // Get the pathname to the code which contains this function - void *address = nil; - NSModule module = nil; - _dyld_lookup_and_bind_fully("_GetResourcePath", - &address, - &module); - - if (module && address) { - const char* moduleName = NSNameOfModule(module); - if (moduleName) { - // The "Resources" directory should be in the same directory as the - // executable code, since that's how the Breakpad framework is built. - resourcePath = [NSString stringWithUTF8String:moduleName]; - resourcePath = [resourcePath stringByDeletingLastPathComponent]; - resourcePath = [resourcePath stringByAppendingPathComponent:@"Resources/"]; - } else { - DEBUGLOG(stderr, "Missing moduleName\n"); - } + Dl_info info; + if (dladdr((const void*)GetResourcePath, &info) != 0) { + NSFileManager *filemgr = [NSFileManager defaultManager]; + NSString *filePath = + [filemgr stringWithFileSystemRepresentation:info.dli_fname + length:strlen(info.dli_fname)]; + NSString *bundlePath = [filePath stringByDeletingLastPathComponent]; + // The "Resources" directory should be in the same directory as the + // executable code, since that's how the Breakpad framework is built. + resourcePath = [bundlePath stringByAppendingPathComponent:@"Resources/"]; } else { DEBUGLOG(stderr, "Could not find GetResourcePath\n"); // fallback plan NSBundle *bundle = - [NSBundle bundleWithIdentifier:@"com.Google.BreakpadFramework"]; + [NSBundle bundleWithIdentifier:@"com.Google.BreakpadFramework"]; resourcePath = [bundle resourcePath]; } @@ -371,9 +368,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) { // Create the handler (allocating it in our special protected pool) handler_ = - new (gBreakpadAllocator->Allocate(sizeof(google_breakpad::ExceptionHandler))) - google_breakpad::ExceptionHandler( - Breakpad::ExceptionHandlerDirectCallback, this, true); + new (gBreakpadAllocator->Allocate( + sizeof(google_breakpad::ExceptionHandler))) + google_breakpad::ExceptionHandler( + Breakpad::ExceptionHandlerDirectCallback, this, true); return true; } @@ -403,22 +401,23 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { NSString *urlStr = [parameters objectForKey:@BREAKPAD_URL]; NSString *interval = [parameters objectForKey:@BREAKPAD_REPORT_INTERVAL]; NSString *inspectorPathString = - [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION]; + [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION]; NSString *reporterPathString = - [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION]; + [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION]; NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT]; NSArray *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES]; - NSString *logFileTailSize = [parameters objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE]; + NSString *logFileTailSize = + [parameters objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE]; NSString *requestUserText = - [parameters objectForKey:@BREAKPAD_REQUEST_COMMENTS]; + [parameters objectForKey:@BREAKPAD_REQUEST_COMMENTS]; NSString *requestEmail = [parameters objectForKey:@BREAKPAD_REQUEST_EMAIL]; NSString *vendor = - [parameters objectForKey:@BREAKPAD_VENDOR]; + [parameters objectForKey:@BREAKPAD_VENDOR]; NSString *dumpSubdirectory = - [parameters objectForKey:@BREAKPAD_DUMP_DIRECTORY]; + [parameters objectForKey:@BREAKPAD_DUMP_DIRECTORY]; - NSDictionary *serverParameters = - [parameters objectForKey:@BREAKPAD_SERVER_PARAMETER_DICT]; + NSDictionary *serverParameters = + [parameters objectForKey:@BREAKPAD_SERVER_PARAMETER_DICT]; // These may have been set above as user prefs, which take priority. if (!skipConfirm) { @@ -431,8 +430,12 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { if (!product) product = [parameters objectForKey:@"CFBundleName"]; - if (!display) - display = product; + if (!display) { + display = [parameters objectForKey:@"CFBundleDisplayName"]; + if (!display) { + display = product; + } + } if (!version) version = [parameters objectForKey:@"CFBundleVersion"]; @@ -512,8 +515,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { // Find Reporter. if (!reporterPathString) { reporterPathString = - [resourcePath stringByAppendingPathComponent:@"crash_report_sender.app"]; - reporterPathString = [[NSBundle bundleWithPath:reporterPathString] executablePath]; + [resourcePath + stringByAppendingPathComponent:@"crash_report_sender.app"]; + reporterPathString = + [[NSBundle bundleWithPath:reporterPathString] executablePath]; } // Verify that there is a Reporter application. @@ -558,9 +563,9 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { dictionary.SetKeyValue(BREAKPAD_SKIP_CONFIRM, [skipConfirm UTF8String]); dictionary.SetKeyValue(BREAKPAD_CONFIRM_TIMEOUT, [timeout UTF8String]); dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION, - [inspectorPathString fileSystemRepresentation]); + [inspectorPathString fileSystemRepresentation]); dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION, - [reporterPathString fileSystemRepresentation]); + [reporterPathString fileSystemRepresentation]); dictionary.SetKeyValue(BREAKPAD_LOGFILE_UPLOAD_SIZE, [logFileTailSize UTF8String]); dictionary.SetKeyValue(BREAKPAD_REQUEST_COMMENTS, @@ -569,11 +574,11 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { dictionary.SetKeyValue(BREAKPAD_VENDOR, [vendor UTF8String]); dictionary.SetKeyValue(BREAKPAD_DUMP_DIRECTORY, [dumpSubdirectory UTF8String]); - + struct timeval tv; gettimeofday(&tv, NULL); char timeStartedString[32]; - sprintf(timeStartedString, "%d", tv.tv_sec); + sprintf(timeStartedString, "%zd", tv.tv_sec); dictionary.SetKeyValue(BREAKPAD_PROCESS_START_TIME, timeStartedString); @@ -591,7 +596,7 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { // For each key-value pair, call BreakpadAddUploadParameter() NSEnumerator *keyEnumerator = [serverParameters keyEnumerator]; NSString *aParameter; - while (aParameter = [keyEnumerator nextObject]) { + while ((aParameter = [keyEnumerator nextObject])) { BreakpadAddUploadParameter(this, aParameter, [serverParameters objectForKey:aParameter]); } @@ -600,7 +605,7 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) { } //============================================================================= -void Breakpad::SetKeyValue(NSString *key, NSString *value) { +void Breakpad::SetKeyValue(NSString *key, NSString *value) { // We allow nil values. This is the same as removing the keyvalue. if (!config_params_ || !key) return; @@ -609,7 +614,7 @@ void Breakpad::SetKeyValue(NSString *key, NSString *value) { } //============================================================================= -NSString * Breakpad::KeyValue(NSString *key) { +NSString *Breakpad::KeyValue(NSString *key) { if (!config_params_ || !key) return nil; @@ -618,25 +623,24 @@ NSString * Breakpad::KeyValue(NSString *key) { } //============================================================================= -void Breakpad::RemoveKeyValue(NSString *key) { - if (!config_params_ || !key) - return; +void Breakpad::RemoveKeyValue(NSString *key) { + if (!config_params_ || !key) return; config_params_->RemoveKey([key UTF8String]); } //============================================================================= -void Breakpad::GenerateAndSendReport() { +void Breakpad::GenerateAndSendReport() { config_params_->SetKeyValue(BREAKPAD_ON_DEMAND, "YES"); - HandleException(0, 0, 0, mach_thread_self()); + HandleException(0, 0, 0, mach_thread_self()); config_params_->SetKeyValue(BREAKPAD_ON_DEMAND, "NO"); } //============================================================================= -bool Breakpad::HandleException(int exception_type, - int exception_code, - int exception_subcode, - mach_port_t crashing_thread) { +bool Breakpad::HandleException(int exception_type, + int exception_code, + int exception_subcode, + mach_port_t crashing_thread) { DEBUGLOG(stderr, "Breakpad: an exception occurred\n"); if (filter_callback_) { @@ -712,8 +716,7 @@ bool Breakpad::HandleException(int exception_type, // If we don't want any forwarding, return true here to indicate that we've // processed things as much as we want. - if (send_and_exit_) - return true; + if (send_and_exit_) return true; return false; } @@ -739,11 +742,11 @@ BreakpadRef BreakpadCreate(NSDictionary *parameters) { // since once it does its allocations and locks the memory, smashes to itself // don't affect anything we care about. gMasterAllocator = - new ProtectedMemoryAllocator(sizeof(ProtectedMemoryAllocator) * 2); + new ProtectedMemoryAllocator(sizeof(ProtectedMemoryAllocator) * 2); gKeyValueAllocator = - new (gMasterAllocator->Allocate(sizeof(ProtectedMemoryAllocator))) - ProtectedMemoryAllocator(sizeof(SimpleStringDictionary)); + new (gMasterAllocator->Allocate(sizeof(ProtectedMemoryAllocator))) + ProtectedMemoryAllocator(sizeof(SimpleStringDictionary)); // Create a mutex for use in accessing the SimpleStringDictionary int mutexResult = pthread_mutex_init(&gDictionaryMutex, NULL); @@ -761,8 +764,8 @@ BreakpadRef BreakpadCreate(NSDictionary *parameters) { */ gBreakpadAllocator = - new (gMasterAllocator->Allocate(sizeof(ProtectedMemoryAllocator))) - ProtectedMemoryAllocator(breakpad_pool_size); + new (gMasterAllocator->Allocate(sizeof(ProtectedMemoryAllocator))) + ProtectedMemoryAllocator(breakpad_pool_size); // Stack-based autorelease pool for Breakpad::Create() obj-c code. NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.mm b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.mm index 11b126c2eb3a..386854602c05 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.mm +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.mm @@ -116,7 +116,7 @@ void OnDemandServer::LaunchOnDemand() { // and holding on to this port delays launching until the current process // exits! mach_port_deallocate(mach_task_self(), server_port_); - server_port_ = NULL; + server_port_ = MACH_PORT_DEAD; // Now, the service is still registered and all we need to do is send // a mach message to the service port in order to launch the server. diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.mm b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.mm index d328ee5dbf6b..a8930858ee5e 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.mm +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.mm @@ -44,6 +44,8 @@ #import "common/mac/SimpleStringDictionary.h" #import "common/mac/MachIPC.h" +#import "GTMDefines.h" + #import #if VERBOSE @@ -91,14 +93,14 @@ static BOOL EnsureDirectoryPathExists(NSString *dirPath) { // Break up the difference into components NSString *diff = [dirPath substringFromIndex:[common length] + 1]; NSArray *components = [diff pathComponents]; - unsigned count = [components count]; + NSUInteger count = [components count]; // Rebuild the path one component at a time NSDictionary *attrs = [NSDictionary dictionaryWithObject:[NSNumber numberWithUnsignedLong:0750] forKey:NSFilePosixPermissions]; path = common; - for (unsigned i = 0; i < count; ++i) { + for (NSUInteger i = 0; i < count; ++i) { path = [path stringByAppendingPathComponent:[components objectAtIndex:i]]; if (![mgr createDirectoryAtPath:path attributes:attrs]) @@ -329,12 +331,12 @@ kern_return_t Inspector::ReadMessages() { // we are expected to read. // Read each key/value pair, one mach message per key/value pair. for (unsigned int i = 0; i < info.parameter_count; ++i) { - MachReceiveMessage message; - result = receive_port.WaitForMessage(&message, 1000); + MachReceiveMessage parameter_message; + result = receive_port.WaitForMessage(¶meter_message, 1000); if(result == KERN_SUCCESS) { KeyValueMessageData &key_value_data = - (KeyValueMessageData&)*message.GetData(); + (KeyValueMessageData&)*parameter_message.GetData(); // If we get a blank key, make sure we don't increment the // parameter count; in some cases (notably on-demand generation // many times in a short period of time) caused the Mach IPC @@ -376,11 +378,11 @@ void Inspector::SetCrashTimeParameters() { if (processStartTimeString) { time_t processStartTime = strtol(processStartTimeString, NULL, 10); time_t processUptime = tv.tv_sec - processStartTime; - sprintf(processUptimeString, "%d", processUptime); + sprintf(processUptimeString, "%zd", processUptime); config_params_.SetKeyValue(BREAKPAD_PROCESS_UP_TIME, processUptimeString); } - sprintf(processCrashtimeString, "%d", tv.tv_sec); + sprintf(processCrashtimeString, "%zd", tv.tv_sec); config_params_.SetKeyValue(BREAKPAD_PROCESS_CRASH_TIME, processCrashtimeString); } diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/client_info.h b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/client_info.h new file mode 100644 index 000000000000..a3a95dcaced7 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/client_info.h @@ -0,0 +1,47 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +#ifndef CLIENT_MAC_CRASH_GENERATION_CLIENT_INFO_H_ +#define CLIENT_MAC_CRASH_GENERATION_CLIENT_INFO_H_ + +namespace google_breakpad { + +class ClientInfo { + public: + explicit ClientInfo(pid_t pid) : pid_(pid) {} + + pid_t pid() const { return pid_; } + + private: + pid_t pid_; +}; + +} // namespace google_breakpad + +#endif // CLIENT_MAC_CRASH_GENERATION_CLIENT_INFO_H_ diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc new file mode 100644 index 000000000000..0742887669d2 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc @@ -0,0 +1,73 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +#include "client/mac/crash_generation/crash_generation_client.h" + +#include "client/mac/crash_generation/crash_generation_server.h" +#include "common/mac/MachIPC.h" + +namespace google_breakpad { + +bool CrashGenerationClient::RequestDumpForException( + int exception_type, + int exception_code, + int exception_subcode, + mach_port_t crashing_thread) { + // The server will send a message to this port indicating that it + // has finished its work. + ReceivePort acknowledge_port; + + MachSendMessage message(kDumpRequestMessage); + message.AddDescriptor(mach_task_self()); // this task + message.AddDescriptor(crashing_thread); // crashing thread + message.AddDescriptor(mach_thread_self()); // handler thread + message.AddDescriptor(acknowledge_port.GetPort()); // message receive port + + ExceptionInfo info; + info.exception_type = exception_type; + info.exception_code = exception_code; + info.exception_subcode = exception_subcode; + message.SetData(&info, sizeof(info)); + + const mach_msg_timeout_t kSendTimeoutMs = 2 * 1000; + kern_return_t result = sender_.SendMessage(message, kSendTimeoutMs); + if (result != KERN_SUCCESS) + return false; + + // Give the server slightly longer to reply since it has to + // inspect this task and write the minidump. + const mach_msg_timeout_t kReceiveTimeoutMs = 5 * 1000; + MachReceiveMessage acknowledge_message; + result = acknowledge_port.WaitForMessage(&acknowledge_message, + kReceiveTimeoutMs); + + return result == KERN_SUCCESS; +} + +} // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.h b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.h new file mode 100644 index 000000000000..527f577a517a --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.h @@ -0,0 +1,65 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +#ifndef GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_ +#define GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_ + +#include "common/mac/MachIPC.h" + +namespace google_breakpad { + +class CrashGenerationClient { + public: + explicit CrashGenerationClient(const char* mach_port_name) + : sender_(mach_port_name) { + } + + // Request the crash server to generate a dump. + // + // Return true if the dump was successful; false otherwise. + bool RequestDumpForException(int exception_type, + int exception_code, + int exception_subcode, + mach_port_t crashing_thread); + + bool RequestDump() { + return RequestDumpForException(0, 0, 0, MACH_PORT_NULL); + } + + private: + MachPortSender sender_; + + // Prevent copy construction and assignment. + CrashGenerationClient(const CrashGenerationClient&); + CrashGenerationClient& operator=(const CrashGenerationClient&); +}; + +} // namespace google_breakpad + +#endif // GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_ diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc new file mode 100644 index 000000000000..44548ef0ebda --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc @@ -0,0 +1,160 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +#include "client/mac/crash_generation/crash_generation_server.h" + +#include "client/mac/crash_generation/client_info.h" +#include "client/mac/handler/minidump_generator.h" +#include "common/mac/scoped_task_suspend-inl.h" + +namespace google_breakpad { + +CrashGenerationServer::CrashGenerationServer( + const char *mach_port_name, + OnClientDumpRequestCallback dump_callback, + void *dump_context, + OnClientExitingCallback exit_callback, + void *exit_context, + bool generate_dumps, + const std::string &dump_path) + : dump_callback_(dump_callback), + dump_context_(dump_context), + exit_callback_(exit_callback), + exit_context_(exit_context), + generate_dumps_(generate_dumps), + dump_dir_(dump_path.empty() ? "/tmp" : dump_path), + started_(false), + receive_port_(mach_port_name), + mach_port_name_(mach_port_name) { +} + +CrashGenerationServer::~CrashGenerationServer() { + if (started_) + Stop(); +} + +bool CrashGenerationServer::Start() { + int thread_create_result = pthread_create(&server_thread_, NULL, + &WaitForMessages, this); + started_ = thread_create_result == 0; + return started_; +} + +bool CrashGenerationServer::Stop() { + if (!started_) + return false; + + // Send a quit message to the background thread, and then join it. + MachPortSender sender(mach_port_name_.c_str()); + MachSendMessage quit_message(kQuitMessage); + const mach_msg_timeout_t kSendTimeoutMs = 2 * 1000; + kern_return_t result = sender.SendMessage(quit_message, kSendTimeoutMs); + if (result == KERN_SUCCESS) { + int thread_join_result = pthread_join(server_thread_, NULL); + started_ = thread_join_result != 0; + } + + return !started_; +} + +// static +void *CrashGenerationServer::WaitForMessages(void *server) { + CrashGenerationServer *self = + reinterpret_cast(server); + while (self->WaitForOneMessage()) {} + return NULL; +} + +bool CrashGenerationServer::WaitForOneMessage() { + MachReceiveMessage message; + kern_return_t result = receive_port_.WaitForMessage(&message, + MACH_MSG_TIMEOUT_NONE); + if (result == KERN_SUCCESS) { + switch (message.GetMessageID()) { + case kDumpRequestMessage: { + ExceptionInfo &info = (ExceptionInfo &)*message.GetData(); + + mach_port_t remote_task = message.GetTranslatedPort(0); + mach_port_t crashing_thread = message.GetTranslatedPort(1); + mach_port_t handler_thread = message.GetTranslatedPort(2); + mach_port_t ack_port = message.GetTranslatedPort(3); + pid_t remote_pid = -1; + pid_for_task(remote_task, &remote_pid); + ClientInfo client(remote_pid); + + bool result; + std::string dump_path; + if (generate_dumps_) { + ScopedTaskSuspend suspend(remote_task); + + MinidumpGenerator generator(remote_task, handler_thread); + dump_path = generator.UniqueNameInDirectory(dump_dir_, NULL); + + if (info.exception_type && info.exception_code) { + generator.SetExceptionInformation(info.exception_type, + info.exception_code, + info.exception_subcode, + crashing_thread); + } + result = generator.Write(dump_path.c_str()); + } else { + result = true; + } + + if (result && dump_callback_) { + dump_callback_(dump_context_, client, dump_path); + } + + // TODO(ted): support a way for the client to send additional data, + // perhaps with a callback so users of the server can read the data + // themselves? + + if (ack_port != MACH_PORT_DEAD && ack_port != MACH_PORT_NULL) { + MachPortSender sender(ack_port); + MachSendMessage ack_message(kAcknowledgementMessage); + const mach_msg_timeout_t kSendTimeoutMs = 2 * 1000; + + sender.SendMessage(ack_message, kSendTimeoutMs); + } + + if (exit_callback_) { + exit_callback_(exit_context_, client); + } + break; + } + case kQuitMessage: + return false; + } + } else { // result != KERN_SUCCESS + return false; + } + return true; +} + +} // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.h b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.h new file mode 100644 index 000000000000..e174f9d0da08 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.h @@ -0,0 +1,139 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +#ifndef GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_SERVER_H_ +#define GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_SERVER_H_ + +#include + +#include "common/mac/MachIPC.h" + +namespace google_breakpad { + +class ClientInfo; + +// Messages the server can read via its mach port +enum { + kDumpRequestMessage = 1, + kAcknowledgementMessage = 2, + kQuitMessage = 3 +}; + +// Exception details sent by the client when requesting a dump. +struct ExceptionInfo { + int exception_type; + int exception_code; + int exception_subcode; +}; + +class CrashGenerationServer { + public: + // WARNING: callbacks may be invoked on a different thread + // than that which creates the CrashGenerationServer. They must + // be thread safe. + typedef void (*OnClientDumpRequestCallback)(void *context, + const ClientInfo &client_info, + const std::string &file_path); + + typedef void (*OnClientExitingCallback)(void *context, + const ClientInfo &client_info); + + // Create an instance with the given parameters. + // + // mach_port_name: Named server port to listen on. + // dump_callback: Callback for a client crash dump request. + // dump_context: Context for client crash dump request callback. + // exit_callback: Callback for client process exit. + // exit_context: Context for client exit callback. + // generate_dumps: Whether to automatically generate dumps. + // Client code of this class might want to generate dumps explicitly + // in the crash dump request callback. In that case, false can be + // passed for this parameter. + // dump_path: Path for generating dumps; required only if true is + // passed for generateDumps parameter; NULL can be passed otherwise. + CrashGenerationServer(const char *mach_port_name, + OnClientDumpRequestCallback dump_callback, + void *dump_context, + OnClientExitingCallback exit_callback, + void *exit_context, + bool generate_dumps, + const std::string &dump_path); + + ~CrashGenerationServer(); + + // Perform initialization steps needed to start listening to clients. + // + // Return true if initialization is successful; false otherwise. + bool Start(); + + // Stop the server. + bool Stop(); + + private: + // Return a unique filename at which a minidump can be written. + bool MakeMinidumpFilename(std::string &outFilename); + + // Loop reading client messages and responding to them until + // a quit message is received. + static void *WaitForMessages(void *server); + + // Wait for a single client message and respond to it. Returns false + // if a quit message was received or if an error occurred. + bool WaitForOneMessage(); + + OnClientDumpRequestCallback dump_callback_; + void *dump_context_; + + OnClientExitingCallback exit_callback_; + void *exit_context_; + + bool generate_dumps_; + + std::string dump_dir_; + + bool started_; + + // The mach port that receives requests to dump from child processes. + ReceivePort receive_port_; + + // The name of the mach port. Stored so the Stop method can message + // the background thread to shut it down. + std::string mach_port_name_; + + // The thread that waits on the receive port. + pthread_t server_thread_; + + // Disable copy constructor and operator=. + CrashGenerationServer(const CrashGenerationServer&); + CrashGenerationServer& operator=(const CrashGenerationServer&); +}; + +} // namespace google_breakpad + +#endif // GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_SERVER_H_ diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc index c220d88dd1d3..4b655c79366b 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc @@ -137,7 +137,7 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { breakpad_nlist space[BUFSIZ/sizeof (breakpad_nlist)]; const register char *s1, *s2; - register int n, m; + register register_t n, m; int maxlen, nreq; off_t sa; /* symbol address */ off_t ss; /* start of strings */ @@ -160,14 +160,14 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { (N_BADMAG(buf) && *((long *)&buf) != MH_MAGIC && NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC) && /* nealsid: The following is the big-endian ppc64 check */ - (*((uint32_t*)&buf)) != FAT_MAGIC) { + (*((long*)&buf)) != FAT_MAGIC) { return (-1); } /* Deal with fat file if necessary */ if (NXSwapBigLongToHost(*((long *)&buf)) == FAT_MAGIC || /* nealsid: The following is the big-endian ppc64 check */ - *((int*)&buf) == FAT_MAGIC) { + *((unsigned int *)&buf) == FAT_MAGIC) { struct host_basic_info hbi; struct fat_header fh; struct fat_arch *fat_archs, *fap; @@ -191,7 +191,7 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { } /* Convert fat_narchs to host byte order */ - fh.nfat_arch = NXSwapBigLongToHost(fh.nfat_arch); + fh.nfat_arch = NXSwapBigIntToHost(fh.nfat_arch); /* Read in the fat archs */ fat_archs = (struct fat_arch *)malloc(fh.nfat_arch * @@ -201,7 +201,7 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { } if (read(fd, (char *)fat_archs, sizeof(struct fat_arch) * fh.nfat_arch) != - sizeof(struct fat_arch) * fh.nfat_arch) { + (ssize_t)sizeof(struct fat_arch) * fh.nfat_arch) { free(fat_archs); return (-1); } @@ -212,15 +212,15 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { */ for (i = 0; i < fh.nfat_arch; i++) { fat_archs[i].cputype = - NXSwapBigLongToHost(fat_archs[i].cputype); + NXSwapBigIntToHost(fat_archs[i].cputype); fat_archs[i].cpusubtype = - NXSwapBigLongToHost(fat_archs[i].cpusubtype); + NXSwapBigIntToHost(fat_archs[i].cpusubtype); fat_archs[i].offset = - NXSwapBigLongToHost(fat_archs[i].offset); + NXSwapBigIntToHost(fat_archs[i].offset); fat_archs[i].size = - NXSwapBigLongToHost(fat_archs[i].size); + NXSwapBigIntToHost(fat_archs[i].size); fat_archs[i].align = - NXSwapBigLongToHost(fat_archs[i].align); + NXSwapBigIntToHost(fat_archs[i].align); } fap = NULL; @@ -257,7 +257,7 @@ __breakpad_fdnlist_64(int fd, breakpad_nlist *list, const char **symbolNames) { } } - if (*((int *)&buf) == MH_MAGIC_64) { + if (*((unsigned int *)&buf) == MH_MAGIC_64) { struct mach_header_64 mh; struct load_command *load_commands, *lcp; struct symtab_command *stp; diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc index 6af3e931db06..1d5f1f9bd8e6 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc @@ -34,6 +34,7 @@ extern "C" { // needed to compile on Leopard } #include "breakpad_nlist_64.h" +#include #include #include #include @@ -129,7 +130,7 @@ static void* ReadTaskString(task_port_t target_task, size_to_end > kMaxStringLength ? kMaxStringLength : size_to_end; kern_return_t kr; - return ReadTaskMemory(target_task, address, size_to_read, &kr); + return ReadTaskMemory(target_task, address, (size_t)size_to_read, &kr); } return NULL; @@ -276,13 +277,11 @@ void DynamicImage::Print() { //============================================================================== // Loads information about dynamically loaded code in the given task. DynamicImages::DynamicImages(mach_port_t task) - : task_(task) { + : task_(task), image_list_() { ReadImageInfoForTask(); } -void* DynamicImages::GetDyldAllImageInfosPointer() -{ - +void* DynamicImages::GetDyldAllImageInfosPointer() { const char *imageSymbolName = "_dyld_all_image_infos"; const char *dyldPath = "/usr/lib/dyld"; #ifndef __LP64__ @@ -298,6 +297,8 @@ void* DynamicImages::GetDyldAllImageInfosPointer() if(list.n_value) { return reinterpret_cast(list.n_value); } + + return NULL; #else struct nlist_64 l[8]; struct nlist_64 &list = l[0]; @@ -311,11 +312,10 @@ void* DynamicImages::GetDyldAllImageInfosPointer() if(invalidEntriesCount != 0) { return NULL; } - if (list.n_value) { - return reinterpret_cast(list.n_value); - } + assert(list.n_value); + return reinterpret_cast(list.n_value); #endif - return NULL; + } //============================================================================== // This code was written using dyld_debug.c (from Darwin) as a guide. @@ -363,7 +363,7 @@ void DynamicImages::ReadImageInfoForTask() { // Now determine the total amount we really want to read based on the // size of the load commands. We need the header plus all of the // load commands. - unsigned int header_size = + size_t header_size = sizeof(breakpad_mach_header) + header->sizeofcmds; free(header); diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.h b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.h index 85ba8cf99adf..72eb221b06d9 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.h @@ -103,7 +103,7 @@ class MachHeader { class DynamicImage { public: DynamicImage(breakpad_mach_header *header, // we take ownership - int header_size, // includes load commands + size_t header_size, // includes load commands breakpad_mach_header *load_address, char *inFilePath, uintptr_t image_mod_date, @@ -111,6 +111,11 @@ class DynamicImage { : header_(header), header_size_(header_size), load_address_(load_address), + vmaddr_(0), + vmsize_(0), + slide_(0), + version_(0), + file_path_(NULL), file_mod_date_(image_mod_date), task_(task) { InitializeFilePath(inFilePath); @@ -128,7 +133,7 @@ class DynamicImage { breakpad_mach_header *GetMachHeader() {return header_;} // Size of mach_header plus load commands - int GetHeaderSize() const {return header_size_;} + size_t GetHeaderSize() const {return header_size_;} // Full path to mach-o binary char *GetFilePath() {return file_path_;} @@ -158,8 +163,11 @@ class DynamicImage { // Debugging void Print(); - + private: + DynamicImage(const DynamicImage &); + DynamicImage &operator=(const DynamicImage &); + friend class DynamicImages; // Sanity checking @@ -180,7 +188,7 @@ class DynamicImage { void CalculateMemoryAndVersionInfo(); breakpad_mach_header *header_; // our local copy of the header - int header_size_; // mach_header plus load commands + size_t header_size_; // mach_header plus load commands breakpad_mach_header *load_address_; // base address image is mapped into mach_vm_address_t vmaddr_; mach_vm_size_t vmsize_; @@ -231,13 +239,13 @@ class DynamicImages { explicit DynamicImages(mach_port_t task); ~DynamicImages() { - for (int i = 0; i < (int)image_list_.size(); ++i) { + for (int i = 0; i < GetImageCount(); ++i) { delete image_list_[i]; } } // Returns the number of dynamically loaded mach-o images. - int GetImageCount() const {return image_list_.size();} + int GetImageCount() const {return static_cast(image_list_.size());} // Returns an individual image. DynamicImage *GetImage(int i) { @@ -256,14 +264,14 @@ class DynamicImages { // Debugging void Print() { - for (int i = 0; i < (int)image_list_.size(); ++i) { + for (int i = 0; i < GetImageCount(); ++i) { image_list_[i]->Print(); } } void TestPrint() { const breakpad_mach_header *header; - for (int i = 0; i < (int)image_list_.size(); ++i) { + for (int i = 0; i < GetImageCount(); ++i) { printf("dyld: %p: name = %s\n", _dyld_get_image_header(i), _dyld_get_image_name(i) ); diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc index 9886a5293d78..89cc4e90c6b0 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc @@ -33,6 +33,7 @@ #include "client/mac/handler/exception_handler.h" #include "client/mac/handler/minidump_generator.h" #include "common/mac/macho_utilities.h" +#include "common/mac/scoped_task_suspend-inl.h" #ifndef USE_PROTECTED_ALLOCATIONS #define USE_PROTECTED_ALLOCATIONS 0 @@ -221,7 +222,8 @@ ExceptionHandler::ExceptionHandler(const string &dump_path, FilterCallback filter, MinidumpCallback callback, void *callback_context, - bool install_handler) + bool install_handler, + const char *port_name) : dump_path_(), filter_(filter), callback_(callback), @@ -237,6 +239,8 @@ ExceptionHandler::ExceptionHandler(const string &dump_path, // This will update to the ID and C-string pointers set_dump_path(dump_path); MinidumpGenerator::GatherSystemInformation(); + if (port_name) + crash_generation_client_.reset(new CrashGenerationClient(port_name)); Setup(install_handler); } @@ -293,10 +297,42 @@ bool ExceptionHandler::WriteMinidump() { bool ExceptionHandler::WriteMinidump(const string &dump_path, MinidumpCallback callback, void *callback_context) { - ExceptionHandler handler(dump_path, NULL, callback, callback_context, false); + ExceptionHandler handler(dump_path, NULL, callback, callback_context, false, + NULL); return handler.WriteMinidump(); } +// static +bool ExceptionHandler::WriteMinidumpForChild(mach_port_t child, + mach_port_t child_blamed_thread, + const string &dump_path, + MinidumpCallback callback, + void *callback_context) { + ScopedTaskSuspend suspend(child); + + MinidumpGenerator generator(child, MACH_PORT_NULL); + string dump_id; + string dump_filename = generator.UniqueNameInDirectory(dump_path, &dump_id); + + generator.SetExceptionInformation(EXC_BREAKPOINT, +#if defined (__i386__) || defined(__x86_64__) + EXC_I386_BPT, +#elif defined (__ppc__) || defined (__ppc64__) + EXC_PPC_BREAKPOINT, +#else + #error architecture not supported +#endif + 0, + child_blamed_thread); + bool result = generator.Write(dump_filename.c_str()); + + if (callback) { + return callback(dump_path.c_str(), dump_id.c_str(), + callback_context, result); + } + return result; +} + bool ExceptionHandler::WriteMinidumpWithException(int exception_type, int exception_code, int exception_subcode, @@ -312,6 +348,18 @@ bool ExceptionHandler::WriteMinidumpWithException(int exception_type, if (exception_type && exception_code) _exit(exception_type); } + } else if (IsOutOfProcess()) { + if (exception_type && exception_code) { + // If this is a real exception, give the filter (if any) a chance to + // decide if this should be sent. + if (filter_ && !filter_(callback_context_)) + return false; + return crash_generation_client_->RequestDumpForException( + exception_type, + exception_code, + exception_subcode, + thread_name); + } } else { string minidump_id; @@ -321,7 +369,7 @@ bool ExceptionHandler::WriteMinidumpWithException(int exception_type, MinidumpGenerator md; if (exception_type && exception_code) { // If this is a real exception, give the filter (if any) a chance to - // decided if this should be sent + // decide if this should be sent. if (filter_ && !filter_(callback_context_)) return false; @@ -453,10 +501,11 @@ void *ExceptionHandler::WaitForMessage(void *exception_handler_class) { // Wait for the exception info while (1) { receive.header.msgh_local_port = self->handler_port_; - receive.header.msgh_size = sizeof(receive); + receive.header.msgh_size = static_cast(sizeof(receive)); kern_return_t result = mach_msg(&(receive.header), MACH_RCV_MSG | MACH_RCV_LARGE, 0, - sizeof(receive), self->handler_port_, + receive.header.msgh_size, + self->handler_port_, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h index 896eecda7d93..763532555573 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h @@ -40,6 +40,9 @@ #include +#include "client/mac/crash_generation/crash_generation_client.h" +#include "processor/scoped_ptr.h" + namespace google_breakpad { using std::string; @@ -86,9 +89,12 @@ class ExceptionHandler { // If install_handler is true, then a minidump will be written whenever // an unhandled exception occurs. If it is false, minidumps will only // be written when WriteMinidump is called. + // If port_name is non-NULL, attempt to perform out-of-process dump generation + // If port_name is NULL, in-process dump generation will be used. ExceptionHandler(const string &dump_path, FilterCallback filter, MinidumpCallback callback, - void *callback_context, bool install_handler); + void *callback_context, bool install_handler, + const char *port_name); // A special constructor if we want to bypass minidump writing and // simply get a callback with the exception information. @@ -115,6 +121,19 @@ class ExceptionHandler { static bool WriteMinidump(const string &dump_path, MinidumpCallback callback, void *callback_context); + // Write a minidump of child immediately. This can be used to capture + // the execution state of a child process independently of a crash. + static bool WriteMinidumpForChild(mach_port_t child, + mach_port_t child_blamed_thread, + const std::string &dump_path, + MinidumpCallback callback, + void *callback_context); + + // Returns whether out-of-process dump generation is used or not. + bool IsOutOfProcess() const { + return crash_generation_client_.get() != NULL; + } + private: // Install the mach exception handler bool InstallHandler(); @@ -206,6 +225,9 @@ class ExceptionHandler { // True, if we're using the mutext to indicate when mindump writing occurs bool use_minidump_write_mutex_; + + // Client for out-of-process dump generation. + scoped_ptr crash_generation_client_; }; } // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler_test.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler_test.cc deleted file mode 100644 index 0a1ecbe7b07b..000000000000 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler_test.cc +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) 2006, Google Inc. -// 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 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. - -/* -g++ -framework CoreFoundation -I../../.. ../../minidump_file_writer.cc ../../../common/convert_UTF.c ../../../common/string_conversion.cc ../../../common/mac/string_utilities.cc exception_handler.cc minidump_generator.cc exception_handler_test.cc -o exception_handler_test -mmacosx-version-min=10.4 ../../../common/mac/file_id.cc dynamic_images.cc ../../../common/mac/macho_id.cc ../../../common/mac/macho_walker.cc -lcrypto ../../../common/mac/macho_utilities.cc -*/ - -#include -#include -#include - -#include - -#include "exception_handler.h" -#include "minidump_generator.h" - -using std::string; -using google_breakpad::ExceptionHandler; - -static void *SleepyFunction(void *) { - while (1) { - sleep(10000); - } - return NULL; -} - -static void Crasher() { - int *a = (int*)0x42; - - fprintf(stdout, "Going to crash...\n"); - fprintf(stdout, "A = %d", *a); -} - -static void SoonToCrash() { - Crasher(); -} - -bool MDCallback(const char *dump_dir, const char *file_name, - void *context, bool success) { - string path(dump_dir); - string dest(dump_dir); - path.append(file_name); - path.append(".dmp"); - - fprintf(stdout, "Minidump: %s\n", path.c_str()); - // Indicate that we've handled the callback - exit(0); -} - -int main(int argc, char * const argv[]) { - char buffer[PATH_MAX]; - - // Home dir - snprintf(buffer, sizeof(buffer), "/tmp/"); - - string path(buffer); - ExceptionHandler eh(path, NULL, MDCallback, NULL, true); - pthread_t t; - - if (pthread_create(&t, NULL, SleepyFunction, NULL) == 0) { - pthread_detach(t); - } else { - perror("pthread_create"); - } - -// // Dump a test -// eh.WriteMinidump(); - - // Test the handler - SoonToCrash(); - - return 0; -} diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc index f6d0638ccc70..0c54cf42f0f1 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc @@ -57,7 +57,8 @@ namespace google_breakpad { // constructor when generating from within the crashed process MinidumpGenerator::MinidumpGenerator() - : exception_type_(0), + : writer_(), + exception_type_(0), exception_code_(0), exception_subcode_(0), exception_thread_(0), @@ -71,12 +72,14 @@ MinidumpGenerator::MinidumpGenerator() // crashed process MinidumpGenerator::MinidumpGenerator(mach_port_t crashing_task, mach_port_t handler_thread) - : exception_type_(0), + : writer_(), + exception_type_(0), exception_code_(0), exception_subcode_(0), exception_thread_(0), crashing_task_(crashing_task), - handler_thread_(handler_thread) { + handler_thread_(handler_thread), + dynamic_images_(NULL) { if (crashing_task != mach_task_self()) { dynamic_images_ = new DynamicImages(crashing_task_); } else { @@ -191,7 +194,7 @@ bool MinidumpGenerator::Write(const char *path) { if (!header.Allocate()) return false; - int writer_count = sizeof(writers) / sizeof(writers[0]); + int writer_count = static_cast(sizeof(writers) / sizeof(writers[0])); // If we don't have exception information, don't write out the // exception stream @@ -355,7 +358,7 @@ bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state, #define AddReg(a) context_ptr->a = REGISTER_FROM_THREADSTATE(machine_state, a) #define AddGPR(a) context_ptr->gpr[a] = REGISTER_FROM_THREADSTATE(machine_state, r ## a) - + AddReg(srr0); AddReg(cr); AddReg(xer); @@ -488,7 +491,7 @@ bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state, // not used in the flags register. Since the minidump format // specifies 32 bits for the flags register, we can truncate safely // with no loss. - context_ptr->eflags = machine_state->__rflags; + context_ptr->eflags = static_cast(machine_state->__rflags); AddReg(cs); AddReg(fs); AddReg(gs); @@ -502,7 +505,8 @@ bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state, bool MinidumpGenerator::WriteThreadStream(mach_port_t thread_id, MDRawThread *thread) { breakpad_thread_state_data_t state; - mach_msg_type_number_t state_count = sizeof(state); + mach_msg_type_number_t state_count + = static_cast(sizeof(state)); if (thread_get_state(thread_id, BREAKPAD_MACHINE_THREAD_STATE, state, &state_count) == @@ -532,7 +536,10 @@ bool MinidumpGenerator::WriteThreadListStream( return false; // Don't include the generator thread - non_generator_thread_count = thread_count - 1; + if (handler_thread_ != MACH_PORT_NULL) + non_generator_thread_count = thread_count - 1; + else + non_generator_thread_count = thread_count; if (!list.AllocateObjectAndArray(non_generator_thread_count, sizeof(MDRawThread))) return false; @@ -577,7 +584,8 @@ MinidumpGenerator::WriteExceptionStream(MDRawDirectory *exception_stream) { exception_ptr->exception_record.exception_flags = exception_code_; breakpad_thread_state_data_t state; - mach_msg_type_number_t stateCount = sizeof(state); + mach_msg_type_number_t stateCount + = static_cast(sizeof(state)); if (thread_get_state(exception_thread_, BREAKPAD_MACHINE_THREAD_STATE, @@ -727,7 +735,7 @@ bool MinidumpGenerator::WriteModuleStream(unsigned int index, return false; module->base_of_image = image->GetVMAddr() + image->GetVMAddrSlide(); - module->size_of_image = image->GetVMSize(); + module->size_of_image = static_cast(image->GetVMSize()); module->module_name_rva = string_location.rva; // We'll skip the executable module, because they don't have @@ -794,7 +802,7 @@ bool MinidumpGenerator::WriteModuleStream(unsigned int index, return false; module->base_of_image = seg->vmaddr + slide; - module->size_of_image = seg->vmsize; + module->size_of_image = static_cast(seg->vmsize); module->module_name_rva = string_location.rva; if (!WriteCVRecord(module, cpu_type, name)) @@ -931,7 +939,7 @@ bool MinidumpGenerator::WriteMiscInfoStream(MDRawDirectory *misc_info_stream) { misc_info_stream->location = info.location(); MDRawMiscInfo *info_ptr = info.get(); - info_ptr->size_of_info = sizeof(MDRawMiscInfo); + info_ptr->size_of_info = static_cast(sizeof(MDRawMiscInfo)); info_ptr->flags1 = MD_MISCINFO_FLAGS1_PROCESS_ID | MD_MISCINFO_FLAGS1_PROCESS_TIMES | MD_MISCINFO_FLAGS1_PROCESSOR_POWER_INFO; @@ -943,33 +951,38 @@ bool MinidumpGenerator::WriteMiscInfoStream(MDRawDirectory *misc_info_stream) { struct rusage usage; if (getrusage(RUSAGE_SELF, &usage) != -1) { // Omit the fractional time since the MDRawMiscInfo only wants seconds - info_ptr->process_user_time = usage.ru_utime.tv_sec; - info_ptr->process_kernel_time = usage.ru_stime.tv_sec; + info_ptr->process_user_time = + static_cast(usage.ru_utime.tv_sec); + info_ptr->process_kernel_time = + static_cast(usage.ru_stime.tv_sec); } int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, info_ptr->process_id }; + u_int mibsize = static_cast(sizeof(mib) / sizeof(mib[0])); size_t size; - if (!sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &size, NULL, 0)) { + if (!sysctl(mib, mibsize, NULL, &size, NULL, 0)) { mach_vm_address_t addr; if (mach_vm_allocate(mach_task_self(), &addr, size, true) == KERN_SUCCESS) { struct kinfo_proc *proc = (struct kinfo_proc *)addr; - if (!sysctl(mib, sizeof(mib) / sizeof(mib[0]), proc, &size, NULL, 0)) - info_ptr->process_create_time = proc->kp_proc.p_starttime.tv_sec; + if (!sysctl(mib, mibsize, proc, &size, NULL, 0)) + info_ptr->process_create_time = + static_cast(proc->kp_proc.p_starttime.tv_sec); mach_vm_deallocate(mach_task_self(), addr, size); } } // Speed uint64_t speed; + const uint64_t kOneMillion = 1000 * 1000; size = sizeof(speed); sysctlbyname("hw.cpufrequency_max", &speed, &size, NULL, 0); - info_ptr->processor_max_mhz = speed / (1000 * 1000); - info_ptr->processor_mhz_limit = speed / (1000 * 1000); + info_ptr->processor_max_mhz = static_cast(speed / kOneMillion); + info_ptr->processor_mhz_limit = static_cast(speed / kOneMillion); size = sizeof(speed); sysctlbyname("hw.cpufrequency", &speed, &size, NULL, 0); - info_ptr->processor_current_mhz = speed / (1000 * 1000); + info_ptr->processor_current_mhz = static_cast(speed / kOneMillion); return true; } diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj index 996ff42e75ee..b140a71a2824 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj @@ -3,10 +3,24 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 8BFC813F11FF9A58002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814411FF9A9C002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814511FF9A9D002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814811FF9B13002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814911FF9B13002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814A11FF9B13002CB4DC /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */; }; + 8BFC814B11FF9B3F002CB4DC /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */; }; + 8BFC814C11FF9B3F002CB4DC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */; }; + 8BFC81A211FF9C2E002CB4DC /* CPlusTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC819211FF9C23002CB4DC /* CPlusTest.framework */; }; + 8BFC81A311FF9C2F002CB4DC /* CPlusTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BFC819211FF9C23002CB4DC /* CPlusTest.framework */; }; + 8BFC81AD11FF9C8A002CB4DC /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */; }; + 8BFC81AE11FF9C8C002CB4DC /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */; }; + 8BFC81AF11FF9C8C002CB4DC /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */; }; + 8BFC81B011FF9C8D002CB4DC /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */; }; 9B35FF5A0B267D5F008DE8C7 /* convert_UTF.c in Sources */ = {isa = PBXBuildFile; fileRef = 9B35FF560B267D5F008DE8C7 /* convert_UTF.c */; }; 9B35FF5B0B267D5F008DE8C7 /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B35FF580B267D5F008DE8C7 /* string_conversion.cc */; }; 9B37CEEC0AF98ECD00FA4BD4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B37CEEB0AF98ECD00FA4BD4 /* CoreFoundation.framework */; }; @@ -94,12 +108,18 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 8BFC812011FF99D5002CB4DC /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; + 8BFC812111FF99D5002CB4DC /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 8BFC812211FF99D5002CB4DC /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 8BFC815411FF9B7F002CB4DC /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + 8BFC819211FF9C23002CB4DC /* CPlusTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CPlusTest.framework; path = Library/Frameworks/CPlusTest.framework; sourceTree = DEVELOPER_DIR; }; 8DD76F6C0486A84900D96B5E /* generator_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generator_test; sourceTree = BUILT_PRODUCTS_DIR; }; 9B35FF560B267D5F008DE8C7 /* convert_UTF.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = convert_UTF.c; path = ../../../common/convert_UTF.c; sourceTree = SOURCE_ROOT; }; 9B35FF570B267D5F008DE8C7 /* convert_UTF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = convert_UTF.h; path = ../../../common/convert_UTF.h; sourceTree = SOURCE_ROOT; }; 9B35FF580B267D5F008DE8C7 /* string_conversion.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = string_conversion.cc; path = ../../../common/string_conversion.cc; sourceTree = SOURCE_ROOT; }; 9B35FF590B267D5F008DE8C7 /* string_conversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = string_conversion.h; path = ../../../common/string_conversion.h; sourceTree = SOURCE_ROOT; }; - 9B37CEEB0AF98ECD00FA4BD4 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; + 9B37CEEB0AF98ECD00FA4BD4 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 9B7CA84E0B1297F200CD3A1D /* unit_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = unit_test; sourceTree = BUILT_PRODUCTS_DIR; }; 9B7CA8530B12989000CD3A1D /* minidump_file_writer_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = minidump_file_writer_unittest.cc; path = ../../minidump_file_writer_unittest.cc; sourceTree = ""; }; 9BD82A9B0B00267E0055103E /* handler_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = handler_test; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -132,11 +152,11 @@ F9721F310E8B07E800D7E813 /* dwarftests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = dwarftests.mm; sourceTree = ""; }; F9721F380E8B0CFC00D7E813 /* dump_syms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dump_syms.h; path = ../../../common/mac/dump_syms.h; sourceTree = SOURCE_ROOT; }; F9721F390E8B0D0D00D7E813 /* dump_syms.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = dump_syms.mm; path = ../../../common/mac/dump_syms.mm; sourceTree = SOURCE_ROOT; }; - F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; F9721F760E8B0DC700D7E813 /* bytereader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bytereader.cc; path = ../../../common/dwarf/bytereader.cc; sourceTree = SOURCE_ROOT; }; F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2reader.cc; path = ../../../common/dwarf/dwarf2reader.cc; sourceTree = SOURCE_ROOT; }; F9721F780E8B0DC700D7E813 /* functioninfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = functioninfo.cc; path = ../../../common/dwarf/functioninfo.cc; sourceTree = SOURCE_ROOT; }; - F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = /System/Library/Frameworks/SenTestingKit.framework; sourceTree = ""; }; + F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; F9721FA80E8B0E4800D7E813 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../../common/md5.c; sourceTree = SOURCE_ROOT; }; F982089A0DB3280D0017AECA /* breakpad_nlist_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = breakpad_nlist_test.h; sourceTree = ""; }; F982089B0DB3280D0017AECA /* breakpad_nlist_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = breakpad_nlist_test.cc; sourceTree = ""; }; @@ -156,6 +176,7 @@ buildActionMask = 2147483647; files = ( 9B37CEEC0AF98ECD00FA4BD4 /* CoreFoundation.framework in Frameworks */, + 8BFC813F11FF9A58002CB4DC /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -163,6 +184,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8BFC814511FF9A9D002CB4DC /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -171,6 +193,7 @@ buildActionMask = 2147483647; files = ( 9BD82AC10B0029DF0055103E /* CoreFoundation.framework in Frameworks */, + 8BFC814411FF9A9C002CB4DC /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,6 +201,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8BFC814A11FF9B13002CB4DC /* libcrypto.dylib in Frameworks */, + 8BFC814B11FF9B3F002CB4DC /* SenTestingKit.framework in Frameworks */, + 8BFC814C11FF9B3F002CB4DC /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -185,6 +211,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8BFC814811FF9B13002CB4DC /* libcrypto.dylib in Frameworks */, + 8BFC81A211FF9C2E002CB4DC /* CPlusTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -194,6 +222,8 @@ files = ( F9721F6C0E8B0D7000D7E813 /* Cocoa.framework in Frameworks */, F9721FA20E8B0E2300D7E813 /* SenTestingKit.framework in Frameworks */, + 8BFC814911FF9B13002CB4DC /* libcrypto.dylib in Frameworks */, + 8BFC81A311FF9C2F002CB4DC /* CPlusTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -203,6 +233,9 @@ 08FB7794FE84155DC02AAC07 /* MinidumpWriter */ = { isa = PBXGroup; children = ( + 8BFC812011FF99D5002CB4DC /* Breakpad.xcconfig */, + 8BFC812111FF99D5002CB4DC /* BreakpadDebug.xcconfig */, + 8BFC812211FF99D5002CB4DC /* BreakpadRelease.xcconfig */, F9721FA80E8B0E4800D7E813 /* md5.c */, F9721F760E8B0DC700D7E813 /* bytereader.cc */, F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */, @@ -261,9 +294,12 @@ 9B37CEEA0AF98EB600FA4BD4 /* Frameworks */ = { isa = PBXGroup; children = ( + 8BFC813E11FF9A58002CB4DC /* libcrypto.dylib */, + 8BFC815411FF9B7F002CB4DC /* Carbon.framework */, F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */, F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */, 9B37CEEB0AF98ECD00FA4BD4 /* CoreFoundation.framework */, + 8BFC819211FF9C23002CB4DC /* CPlusTest.framework */, ); name = Frameworks; sourceTree = ""; @@ -414,7 +450,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "minidump_test" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* MinidumpWriter */; projectDirPath = ""; @@ -513,6 +549,7 @@ D2F6510E0BEF94EB00920385 /* macho_walker.cc in Sources */, D2F651110BEF951700920385 /* string_conversion.cc in Sources */, D2F651150BEF953000920385 /* convert_UTF.c in Sources */, + 8BFC81B011FF9C8D002CB4DC /* breakpad_nlist_64.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -524,6 +561,7 @@ 9B7CA8550B1298A100CD3A1D /* minidump_file_writer.cc in Sources */, 9BC1D2940B336F2300F2A2B4 /* convert_UTF.c in Sources */, 9BC1D2950B336F2500F2A2B4 /* string_conversion.cc in Sources */, + 8BFC81AE11FF9C8C002CB4DC /* breakpad_nlist_64.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -543,6 +581,7 @@ D2F6511E0BEF973600920385 /* macho_id.cc in Sources */, D2F6511F0BEF973900920385 /* macho_utilities.cc in Sources */, D2F651210BEF975400920385 /* macho_walker.cc in Sources */, + 8BFC81AF11FF9C8C002CB4DC /* breakpad_nlist_64.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -580,6 +619,7 @@ files = ( F9AE5B390DBFDBDB00505983 /* dynamic_images.cc in Sources */, F9AE5B3A0DBFDBDB00505983 /* DynamicImagesTests.cc in Sources */, + 8BFC81AD11FF9C8A002CB4DC /* breakpad_nlist_64.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -589,154 +629,78 @@ 1DEB923208733DC60010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_CW_ASM_SYNTAX = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_PASCAL_STRINGS = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_THREADSAFE_STATICS = NO; - INSTALL_PATH = "$(HOME)/bin"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", + ); PRODUCT_NAME = generator_test; USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Debug; }; 1DEB923308733DC60010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(DEVELOPER_FRAMEWORKS_DIR)\"", ); - GCC_CW_ASM_SYNTAX = NO; - GCC_ENABLE_PASCAL_STRINGS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_THREADSAFE_STATICS = NO; - INSTALL_PATH = "$(HOME)/bin"; PRODUCT_NAME = generator_test; USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Release; }; 1DEB923608733DC60010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8BFC812111FF99D5002CB4DC /* BreakpadDebug.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_LDFLAGS = "-lcrypto"; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Debug; }; 1DEB923708733DC60010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8BFC812211FF99D5002CB4DC /* BreakpadRelease.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_LDFLAGS = "-lcrypto"; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Release; }; 9B7CA8510B12984300CD3A1D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; - PREBINDING = NO; PRODUCT_NAME = unit_test; USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Debug; }; 9B7CA8520B12984300CD3A1D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - PREBINDING = NO; PRODUCT_NAME = unit_test; USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Release; }; 9BD82AA70B0026BF0055103E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-Wall"; - PREBINDING = NO; PRODUCT_NAME = handler_test; USER_HEADER_SEARCH_PATHS = "../../.. $(inherited)"; - ZERO_LINK = NO; }; name = Debug; }; 9BD82AA80B0026BF0055103E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-Wall"; - PREBINDING = NO; PRODUCT_NAME = handler_test; USER_HEADER_SEARCH_PATHS = "../../.. $(inherited)"; - ZERO_LINK = NO; }; name = Release; }; F93A88770E8B4C700026AF89 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = "obj-cTestCases-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; PRODUCT_NAME = octestcases; USER_HEADER_SEARCH_PATHS = "../../../..//**"; WRAPPER_EXTENSION = octest; @@ -746,58 +710,20 @@ F93A88780E8B4C700026AF89 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_CHAR_IS_UNSIGNED_CHAR = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; INFOPLIST_FILE = "obj-cTestCases-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Cocoa, - "-framework", - SenTestingKit, - ); - PREBINDING = NO; PRODUCT_NAME = octestcases; USER_HEADER_SEARCH_PATHS = "../../../..//**"; WRAPPER_EXTENSION = octest; - ZERO_LINK = NO; }; name = Release; }; F9AE19C40DB04A9500C98454 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(NATIVE_ARCH_64_BIT)", - ppc64, - ); - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; INFOPLIST_FILE = "minidump_tests64-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - "-framework", - CPlusTest, - ); - PREBINDING = NO; PRODUCT_NAME = minidump_tests64; - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; USER_HEADER_SEARCH_PATHS = "../../../**"; WRAPPER_EXTENSION = cptest; }; @@ -806,57 +732,19 @@ F9AE19C50DB04A9500C98454 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - "$(NATIVE_ARCH_64_BIT)", - ppc64, - ); - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; INFOPLIST_FILE = "minidump_tests64-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - "-framework", - CPlusTest, - ); - PREBINDING = NO; PRODUCT_NAME = minidump_tests64; - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; USER_HEADER_SEARCH_PATHS = "../../../**"; WRAPPER_EXTENSION = cptest; - ZERO_LINK = NO; }; name = Release; }; F9AE5B350DBFDBA300505983 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; INFOPLIST_FILE = "minidump_tests32-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Carbon, - "-framework", - CPlusTest, - "-lcrypto", - ); - PREBINDING = NO; PRODUCT_NAME = minidump_tests32; USER_HEADER_SEARCH_PATHS = "../../../**"; WRAPPER_EXTENSION = cptest; @@ -866,28 +754,11 @@ F9AE5B370DBFDBA300505983 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; INFOPLIST_FILE = "minidump_tests32-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; - OTHER_LDFLAGS = ( - "-lcrypto", - "-framework", - Carbon, - "-framework", - CPlusTest, - ); - PREBINDING = NO; PRODUCT_NAME = minidump_tests32; USER_HEADER_SEARCH_PATHS = "../../../**"; WRAPPER_EXTENSION = cptest; - ZERO_LINK = NO; }; name = Release; }; diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.cc index 10768541196f..6142ad124a15 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.cc @@ -59,7 +59,7 @@ ProtectedMemoryAllocator::~ProtectedMemoryAllocator() { } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -char *ProtectedMemoryAllocator::Allocate(size_t bytes) { +char *ProtectedMemoryAllocator::Allocate(vm_size_t bytes) { if (valid_ && next_alloc_offset_ + bytes <= pool_size_) { char *p = (char*)base_address_ + next_alloc_offset_; next_alloc_offset_ += bytes; diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.h b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.h index ed4f51d5cf80..7e188db268ad 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.h @@ -53,7 +53,7 @@ class ProtectedMemoryAllocator { // Fails by returning NULL is no more space is available. // Please note that the pointers returned from this method should not // be freed in any way (for example by calling free() on them ). - char * Allocate(size_t n); + char * Allocate(vm_size_t n); // Returns the base address of the allocation pool. char * GetBaseAddress() { return (char*)base_address_; } @@ -78,7 +78,7 @@ class ProtectedMemoryAllocator { private: vm_size_t pool_size_; vm_address_t base_address_; - int next_alloc_offset_; + vm_size_t next_alloc_offset_; bool valid_; }; diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.h b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.h index ca5b30797e63..c0728ca8c111 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.h @@ -35,6 +35,7 @@ #include #include "client/mac/Framework/Breakpad.h" +#import "GTMDefines.h" #define kClientIdPreferenceKey @"clientid" @@ -53,10 +54,10 @@ extern NSString *const kDefaultServerType; // work in the middle of a validation. @interface LengthLimitingTextField : NSTextField { @private - unsigned int maximumLength_; + NSUInteger maximumLength_; } -- (void) setMaximumLength:(unsigned int)maxLength; +- (void)setMaximumLength:(NSUInteger)maxLength; @end @interface Reporter : NSObject { diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.m b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.m index 6aa8887d999a..cdee262b14d4 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.m +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.m @@ -56,20 +56,20 @@ NSString *const kDefaultServerType = @"google"; @interface NSView (ResizabilityExtentions) // Shifts the view vertically by the given amount. -- (void)breakpad_shiftVertically:(float)offset; +- (void)breakpad_shiftVertically:(CGFloat)offset; // Shifts the view horizontally by the given amount. -- (void)breakpad_shiftHorizontally:(float)offset; +- (void)breakpad_shiftHorizontally:(CGFloat)offset; @end @implementation NSView (ResizabilityExtentions) -- (void)breakpad_shiftVertically:(float)offset { +- (void)breakpad_shiftVertically:(CGFloat)offset { NSPoint origin = [self frame].origin; origin.y += offset; [self setFrameOrigin:origin]; } -- (void)breakpad_shiftHorizontally:(float)offset { +- (void)breakpad_shiftHorizontally:(CGFloat)offset { NSPoint origin = [self frame].origin; origin.x += offset; [self setFrameOrigin:origin]; @@ -79,11 +79,11 @@ NSString *const kDefaultServerType = @"google"; @interface NSWindow (ResizabilityExtentions) // Adjusts the window height by heightDelta relative to its current height, // keeping all the content at the same size. -- (void)breakpad_adjustHeight:(float)heightDelta; +- (void)breakpad_adjustHeight:(CGFloat)heightDelta; @end @implementation NSWindow (ResizabilityExtentions) -- (void)breakpad_adjustHeight:(float)heightDelta { +- (void)breakpad_adjustHeight:(CGFloat)heightDelta { [[self contentView] setAutoresizesSubviews:NO]; NSRect windowFrame = [self frame]; @@ -101,16 +101,16 @@ NSString *const kDefaultServerType = @"google"; // Grows or shrinks the height of the field to the minimum required to show the // current text, preserving the existing width and origin. // Returns the change in height. -- (float)breakpad_adjustHeightToFit; +- (CGFloat)breakpad_adjustHeightToFit; // Grows or shrinks the width of the field to the minimum required to show the // current text, preserving the existing height and origin. // Returns the change in width. -- (float)breakpad_adjustWidthToFit; +- (CGFloat)breakpad_adjustWidthToFit; @end @implementation NSTextField (ResizabilityExtentions) -- (float)breakpad_adjustHeightToFit { +- (CGFloat)breakpad_adjustHeightToFit { NSRect oldFrame = [self frame]; // Starting with the 10.5 SDK, height won't grow, so make it huge to start. NSRect presizeFrame = oldFrame; @@ -125,7 +125,7 @@ NSString *const kDefaultServerType = @"google"; return newSize.height - NSHeight(oldFrame); } -- (float)breakpad_adjustWidthToFit { +- (CGFloat)breakpad_adjustWidthToFit { NSRect oldFrame = [self frame]; [self sizeToFit]; return NSWidth([self frame]) - NSWidth(oldFrame); @@ -136,11 +136,11 @@ NSString *const kDefaultServerType = @"google"; // Resizes to fit the label using IB-style size-to-fit metrics and enforcing a // minimum width of 70, while preserving the right edge location. // Returns the change in width. -- (float)breakpad_smartSizeToFit; +- (CGFloat)breakpad_smartSizeToFit; @end @implementation NSButton (ResizabilityExtentions) -- (float)breakpad_smartSizeToFit { +- (CGFloat)breakpad_smartSizeToFit { NSRect oldFrame = [self frame]; [self sizeToFit]; NSRect newFrame = [self frame]; @@ -218,7 +218,8 @@ NSString *const kDefaultServerType = @"google"; // Run an alert window with the given timeout. Returns // NSRunStoppedResponse if the timeout is exceeded. A timeout of 0 // queues the message immediately in the modal run loop. -- (int)runModalWindow:(NSWindow*)window withTimeout:(NSTimeInterval)timeout; +- (NSInteger)runModalWindow:(NSWindow*)window + withTimeout:(NSTimeInterval)timeout; // Returns a unique client id (user-specific), creating a persistent // one in the user defaults, if necessary. @@ -386,7 +387,7 @@ NSString *const kDefaultServerType = @"google"; } // Otherwise, if we have no client id, generate one! - srandom([[NSDate date] timeIntervalSince1970]); + srandom((int)[[NSDate date] timeIntervalSince1970]); long clientId1 = random(); long clientId2 = random(); long clientId3 = random(); @@ -403,8 +404,8 @@ NSString *const kDefaultServerType = @"google"; unsigned int logFileCounter = 0; NSString *logPath; - int logFileTailSize = [[parameters_ objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE] - intValue]; + size_t logFileTailSize = + [[parameters_ objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE] intValue]; NSMutableArray *logFilenames; // An array of NSString, one per log file logFilenames = [[NSMutableArray alloc] init]; @@ -544,7 +545,7 @@ NSString *const kDefaultServerType = @"google"; // Get the timeout value for the notification. NSTimeInterval timeout = [self messageTimeout]; - int buttonPressed = NSAlertAlternateReturn; + NSInteger buttonPressed = NSAlertAlternateReturn; // Determine whether we should create a text box for user feedback. if ([self shouldRequestComments]) { BOOL didLoadNib = [NSBundle loadNibNamed:@"Breakpad" owner:self]; @@ -592,7 +593,7 @@ NSString *const kDefaultServerType = @"google"; [commentMessage_ setStringValue:[NSString stringWithFormat:@"%@\n\n%@", [self explanatoryDialogText], NSLocalizedString(@"commentsMsg", @"")]]; - float commentHeightDelta = [commentMessage_ breakpad_adjustHeightToFit]; + CGFloat commentHeightDelta = [commentMessage_ breakpad_adjustHeightToFit]; [headerBox_ breakpad_shiftVertically:commentHeightDelta]; [alertWindow_ breakpad_adjustHeight:commentHeightDelta]; @@ -600,7 +601,7 @@ NSString *const kDefaultServerType = @"google"; // section depending on whether or not we are asking for email. if (includeEmail) { [emailMessage_ setStringValue:NSLocalizedString(@"emailMsg", @"")]; - float emailHeightDelta = [emailMessage_ breakpad_adjustHeightToFit]; + CGFloat emailHeightDelta = [emailMessage_ breakpad_adjustHeightToFit]; [preEmailBox_ breakpad_shiftVertically:emailHeightDelta]; [alertWindow_ breakpad_adjustHeight:emailHeightDelta]; } else { @@ -609,7 +610,7 @@ NSString *const kDefaultServerType = @"google"; // Localize the email label, and shift the associated text field. [emailLabel_ setStringValue:NSLocalizedString(@"emailLabel", @"")]; - float emailLabelWidthDelta = [emailLabel_ breakpad_adjustWidthToFit]; + CGFloat emailLabelWidthDelta = [emailLabel_ breakpad_adjustWidthToFit]; [emailEntryField_ breakpad_shiftHorizontally:emailLabelWidthDelta]; // Localize the placeholder text. @@ -620,12 +621,12 @@ NSString *const kDefaultServerType = @"google"; // Localize the privacy policy label, and keep it right-aligned to the arrow. [privacyLinkLabel_ setStringValue:NSLocalizedString(@"privacyLabel", @"")]; - float privacyLabelWidthDelta = [privacyLinkLabel_ breakpad_adjustWidthToFit]; + CGFloat privacyLabelWidthDelta = [privacyLinkLabel_ breakpad_adjustWidthToFit]; [privacyLinkLabel_ breakpad_shiftHorizontally:(-privacyLabelWidthDelta)]; // Localize the buttons, and keep the cancel button at the right distance. [sendButton_ setTitle:NSLocalizedString(@"sendReportButton", @"")]; - float sendButtonWidthDelta = [sendButton_ breakpad_smartSizeToFit]; + CGFloat sendButtonWidthDelta = [sendButton_ breakpad_smartSizeToFit]; [cancelButton_ breakpad_shiftHorizontally:(-sendButtonWidthDelta)]; [cancelButton_ setTitle:NSLocalizedString(@"cancelButton", @"")]; [cancelButton_ breakpad_smartSizeToFit]; @@ -633,12 +634,13 @@ NSString *const kDefaultServerType = @"google"; - (void)removeEmailPrompt { [emailSectionBox_ setHidden:YES]; - float emailSectionHeight = NSHeight([emailSectionBox_ frame]); + CGFloat emailSectionHeight = NSHeight([emailSectionBox_ frame]); [preEmailBox_ breakpad_shiftVertically:(-emailSectionHeight)]; [alertWindow_ breakpad_adjustHeight:(-emailSectionHeight)]; } -- (int)runModalWindow:(NSWindow*)window withTimeout:(NSTimeInterval)timeout { +- (NSInteger)runModalWindow:(NSWindow*)window + withTimeout:(NSTimeInterval)timeout { // Queue a |stopModal| message to be performed in |timeout| seconds. if (timeout > 0.001) { remainingDialogTime_ = timeout; @@ -653,7 +655,7 @@ NSString *const kDefaultServerType = @"google"; // Run the window modally and wait for either a |stopModal| message or a // button click. [NSApp activateIgnoringOtherApps:YES]; - int returnMethod = [NSApp runModalForWindow:window]; + NSInteger returnMethod = [NSApp runModalForWindow:window]; return returnMethod; } @@ -717,7 +719,7 @@ doCommandBySelector:(SEL)commandSelector { if (remainingDialogTime_ > 59) { // calculate minutes remaining for UI purposes - displayedTimeLeft = (remainingDialogTime_ / 60); + displayedTimeLeft = (int)(remainingDialogTime_ / 60); if (displayedTimeLeft == 1) { formatString = NSLocalizedString(@"countdownMsgMinuteSingular", @""); @@ -725,8 +727,8 @@ doCommandBySelector:(SEL)commandSelector { formatString = NSLocalizedString(@"countdownMsgMinutesPlural", @""); } } else { - displayedTimeLeft = remainingDialogTime_; - if (remainingDialogTime_ == 1) { + displayedTimeLeft = (int)remainingDialogTime_; + if (displayedTimeLeft == 1) { formatString = NSLocalizedString(@"countdownMsgSecondSingular", @""); } else { formatString = NSLocalizedString(@"countdownMsgSecondsPlural", @""); @@ -797,7 +799,8 @@ doCommandBySelector:(SEL)commandSelector { NSTimeInterval now = CFAbsoluteTimeGetCurrent(); NSTimeInterval spanSeconds = (now - lastTime); - [programDict setObject:[NSNumber numberWithFloat:now] forKey:kLastSubmission]; + [programDict setObject:[NSNumber numberWithDouble:now] + forKey:kLastSubmission]; [ud setObject:programDict forKey:program]; [ud synchronize]; @@ -1055,7 +1058,7 @@ doCommandBySelector:(SEL)commandSelector { //============================================================================= @implementation LengthLimitingTextField -- (void) setMaximumLength:(unsigned int)maxLength { +- (void)setMaximumLength:(NSUInteger)maxLength { maximumLength_ = maxLength; } @@ -1072,7 +1075,7 @@ shouldChangeTextInRange:(NSRange)affectedCharRange } // Figure out what the new string length would be, taking into // account user selections. - int newStringLength = + NSUInteger newStringLength = [[textView string] length] - affectedCharRange.length + [replacementString length]; if (newStringLength > maximumLength_) { @@ -1088,7 +1091,7 @@ shouldChangeTextInRange:(NSRange)affectedCharRange NSText* fieldEditor = [self currentEditor]; if (fieldEditor != nil) { // Check for a single "Command" modifier - unsigned int modifiers = [event modifierFlags]; + NSUInteger modifiers = [event modifierFlags]; modifiers &= NSDeviceIndependentModifierFlagsMask; if (modifiers == NSCommandKeyMask) { // Now, check for Select All, Cut, Copy, or Paste key equivalents. diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..4cfd32c54b7f216718ef1a97d69bd92a2a92a143 GIT binary patch literal 156 zcmezOpFxSinZb?0iJ_Dsk0FI2har{0k0FsE7f35HC@|OpF-S!bP^_3C1IP;k$`ml< f14T-JtRkSSH3JtGQ(PD_fjSC+CMGgel4B+SuMryf literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..2b8bb969398e68e8cec2fb664b816d9c5761a3d4 GIT binary patch literal 2428 zcmc(h$!-%t5Qgi_Q;aNp$-xmEgOJ!FMS_483-05cc)Z9n8|zvtE&C;$GM$ZVm&KtZC`C+6U%uY+miRhKJzvTtB>pyNR0UmEDh@=@(KH6 zzEeH}BvUk|tk3M+o>;54_YTd}GUO+Ah1JxC!FCJjmwZ~*MPH|~GUplLC9$@>;@hK0 z@s(qvBU|U{Eau}mDy&+KWfR{tG$-i`ghr*qb}=fPJ*%sWjLCI-cFZih%+?W;r8qb_e& zh!RR5YCs>}on8)`)o-rcJ487JxvG5sCcga}oeebyzvk}PWM zs~6MI4Tm{=33{=no1TYgsG2Hm$$1awL?Qp`RLN|R)te?*!QN~apKPf6b?Q;Yz8r_n z@~ZWYavM{$m67Kn-8ehPq1K%*x25TKOC0NcuE%)mB9$^XM_{>RE!}l(VhP`jD97x^ zEGpg=jm!HKtkC#9yWWY4ud?s~&tg2QMRU35>SEu$svFgVve?=&ElqltD6png9%iN1 znozTyE%}eVc7x|QPv7ir0P$C!QPIxsE2RO z>El|T?EPN4nR_=ds2g+3U3vo+RkTwwEy(DCoATW5!qb7*CC>y@bejxV&pB;c6$(O1 zRy$Nlfs8m2(P7!- ohMZC|>K$|HJiW4KVbCO|9OPDti7{!vAp77px(XcPSgwD*yrIM+KmY&$ literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..73da36f48b35902943a91752a8f9d5df5f82fa90 GIT binary patch literal 2746 zcmeH}%We}v5JhXvSF|j$$-iP4#WBV5D+-jTK#HKc~g`S5t({r$IdMf?yi*{;B47K`J`29@s zLHk4f7FvBt7Sb5&e&0Iw!di{JLunRPNq%G>Wwo$@+ipqvjaJJJT|3yR>>!1;OI^YC z?5%#UZK*x9g6^iSeJz=}(3D!idipQ*2ASI0viW)giW6ZSN#>#du4|KzQWh7wZnW?L z7CaC1U#$Ghwf`71dka~JvQy96*f9>I`BU+cJMfZuayZoeRG5Puxn8gj+8HZju>zn1 zQ(t?;+RO%TBEm}Yyd?v8IF|-kK%4SNO=FJOyRbVwkxibK9wWFWdWsbahVQXf&!Zo$ z-oTVttDd906oz28k_j$dtz(LHfDco}`d(-wPj=_TSeA$vyeWqJc_XjnX0-Y*g_Rs- zc07;iKSTbNA>WnVx$~KR;hsK$DT(WQ_R3y*A8%$zUkst^;bSdZ4{Oj>rE6WV8crsb zWv=5HCho%G*txOeQx9Qp;r&O?PuxEFVFuxkNST^+4U^)XBw!v>>sHT^f%I>omHCHs zA$!%MSbxY8y_sV>mS&tdM{6xS4SYA|K6X3aK>WCZ*YX9<6xW4tlj}mWfEiEqqTWz@ zbPLfXEh+M;R6Yu27Rxi;$GMXyGmKf-FIl_Q z+c*QM|0hXju5c2R>zSXky3P8~^(G!6(N6qS;N)OpWjmjRk+>@DrZXc~;b86gO7}(ZV?I<`kSjgqvrRja9{VT=K>DP4&wdX%$>q??|VkFIM zkMo(6fy`IWSb@bo&k#tPy3EaU-x)lk`&AW6XYl>3oJu!V@&G}X9YNcAD#dN5}u$in*R~<(byyH|{=uE35 z#TnJC^q$_)Go`vDeglvTx;{=maHW|rShJlBZ}&+jGA)<#2#a$rp7OfQXZ-GZ+UtpX Yf^W>SO_4SwcZsuUXIq?2+09Y@1@J)L6aWAK literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..a82c013e059dbf7918192662fe2d4030ff6aee37 GIT binary patch literal 184 zcmbu2I|_g>5JX??DMGFxHY%3hVKD}T_`zu5<<&WWoyD;1o0;AF!PC%DbFvUfjPw|@ prpHl9US#E9B1(hYpnaDUlyah`UJ}d7mJ}a1TQxJAQpWZF!wVZxASeI; literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..c31d6f48bb2c7e913abc209842492eeb7d2364af GIT binary patch literal 2578 zcmds(%Wl(95Qb;XQ&Fbq zO-YNy3Pp~`?@>=&5k(oj7Yroavfa?sP5r zO#Czb=ej16%%yQIde_GGz(zgZD{1C7m;B7$$ZBp=w>^^db6q2Q>sE4WBo$sJx?j4N z9ov@-XfoLkZy>|tR5mk7F7$RKZTN6=t3)q^wXi+ef3^kDp)_ZbNmyPB1O7@~=vVHu z6>lzz9D%;FFHR3JlNqpNx`PeGp)KiLXhrz7mBkIBbEX{)0n2Y{{6jT+~{0;?UEvYo_9{DZqs{Hc2U2b`6n) zwX}PfdbS8LBe|`XN0PyBp?Re;!wnp@2PYQEa`>thO;^M4lP0dq?OoP~R>A_Cq_e>p zaH{8dZx^#!?pKL~iLF(tJBhXRb7g3gE}q*r#Thk>?xSj*CcB#b+ulHgPsKSNSbsMX9ZYp*L>l28{z8f^`mPoazOm8 zPWofzsl$KnF*Wv7=lIwz{I{nQves`Vyqu`fE#n(GYdtS`np5)Uc5qjahmRkVp0kr!Xoy%{^#4{ZcofVUp*W7iA<$0 nfX)|t@^??eIlC>UL$^+UFq!v{sk+v?UqpRBe-lyPPsH;J4xqw_ literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..4cfd32c54b7f216718ef1a97d69bd92a2a92a143 GIT binary patch literal 156 zcmezOpFxSinZb?0iJ_Dsk0FI2har{0k0FsE7f35HC@|OpF-S!bP^_3C1IP;k$`ml< f14T-JtRkSSH3JtGQ(PD_fjSC+CMGgel4B+SuMryf literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..c32f8ff7a6219853e541db1bf3df512b3f5e7786 GIT binary patch literal 2694 zcmd^>OKuZE5Qb~b4cLt=vWdVJEI~+whlE4|QLG$bVmr=A_Sj@5LC$G78q4?+!2eab zJ>$fAEZ8B-_H=hW|N5(X{`~IQu4UG@+Rm-8(#BS4eQGnUGdtF5yVkQO)@kj1lxA)d$&c-`tmZa!+Z{>2)wg5&_B6|FuFvF_ zmmPa2nMx8P{nmP}U3)6Y(w2J8++Jo=SuVAEt!UWgoOqEhC3B(wj=i}jx&wI_OQwkn zJC!Zm^R+y%9(fcK{exI8yI`1B+p<8eR0iNi26Jh#x72FsYp||m>D*4VQ(0HL$CA#p z6Ua~(biq66f&0=eL`;{$_`)sE{pnIsT}gi8=#|F#LVHyBm%f2*$g-CUv#3p+$BLMv z{-H_cckGqxwQCFhQ||r|{`fpE#=&8zCk+(DwTPG_UxqD9;b!3mZQ7H49nSAmn zn24~7$x`W)BB7U}@9CSNB$xn9P5KkB13!nYg-1NH=Q?Y86n>^|1rMf6Oe=bpK5R=T z-sf&N@T(k!#twPokJ)k}{YopQV6q0H^(tFrD*2CjwOm&eEFzbLQB3pAsvjytA{lAs z&-8qAqHnUKvB?dC-i36CBqmF>?%Adq4|&*TCpw>a8$0{*0u~ePrn$cN$a?*>*Xzib zcfrJgX6QDnN1B9V`H7n#>K9ex?qnU4l)JD{=F63B;)OTdQAhfxN165Sg%W(AqD}0u zvOULx--qiC;0-46Zm`hZh@Gj{O})|LE~tg!Om@pvH lQvYqs@4$V)6XLrszj$9tlDEA*CcCz`hq7z?yX`G<`wKXU=jQ+b literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..4cfd32c54b7f216718ef1a97d69bd92a2a92a143 GIT binary patch literal 156 zcmezOpFxSinZb?0iJ_Dsk0FI2har{0k0FsE7f35HC@|OpF-S!bP^_3C1IP;k$`ml< f14T-JtRkSSH3JtGQ(PD_fjSC+CMGgel4B+SuMryf literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..a4b7fd3acd5f3b8030d47d81fa4c3db03a1d987c GIT binary patch literal 2590 zcmd^>%Wl(95Qb;XQ$!V2r3xCs5`@HERJ2gF@BmKYB$g68%B5BNgggpsc5HzEo5`u& z;Iyj54q0}N$8+ZL|1)#)`&ZZYtz&1lw7C^l+Q=4qA6ljNj(ycz?yFCdETu8j-M7rw zmGnE35B1D+_obO>$5`uq>)Hd`X~^DcXJ!-WkL-i2W;Sr!JJNokd&iD!PtuvL$=b`6 ze({p)`>wszb0JB`zU%JGPhl%b@Lkwc`{vR<*HyT5s(qy*&Fw(epWhPCvGhmMNs$~X zg7CHQ{Zscr6cdkyJU|Rdd&ERpdhGn7H&m@F9z;3OwI?~ufLzUYlL@|p zPvG6tIv4ucHOlZ#?r%I=>fzsT4}uB1zGDjqH}N4is(_qo*0)FVzcByA9(w<5V;^Lv z;(H`E={azXy4ba+zBi#6U0q2#_1D5SQT!qsQ6IT1(x;iUsp)}#Y1UqUElJE)ir`%A zh4-Sh(y)`OSLl$!wM$8&XDZ3bh8eL?h4*!#yYTPSEVBZQRL4|s<$CmCniNsf_}|R# zy|m}5aC#)XMwCl=BL;epJn?j;3t4WD-7A`p^gfd`CP?6t>X~Y00?^$tL!#H1xsd^L zFXm3qdeTYAvPNU%y_b-lN&0i0Ygi73Q=V;Xo+!r5Q5(zN#BrK8rX#V|>=WhC_0f&# z1t&!dl6P5dvs10@5NXZHkv#VFK54}Du7UBhYwyAMxkq@ZGv@Dohe9k)Jn916(T?h2 zBC@_|C2E9-Vu}y!RI$J*yuJ3h%5*Lp(cvW~G8Mx7+??g9^5D93{3ly%z0&tmULv}* zk12PiIHX6jr1S+!@>^mCt#YA-3D EKfkuZ{r~^~ literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..4cfd32c54b7f216718ef1a97d69bd92a2a92a143 GIT binary patch literal 156 zcmezOpFxSinZb?0iJ_Dsk0FI2har{0k0FsE7f35HC@|OpF-S!bP^_3C1IP;k$`ml< f14T-JtRkSSH3JtGQ(PD_fjSC+CMGgel4B+SuMryf literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..1f1a4fee5cd6f98defce31446463266b67048904 GIT binary patch literal 1792 zcmb_dJ!n&56ulJ`b#ZqwM7wloj&3S~#12CK+Jq2mhxnSlByG}{*d{HhRIG@!R-r^h z(M=q5a1aL(CkH_{aj=s^=^$3Ox>=0perbM9e-L@RyzhJOe&?Qh?oTSeJ<=mCiAX^v zWKpWErhtZ#_tMu=Rq>LgljG+%t@r_LU zn7*U_T9w(_-~UsmRf*$r%;c=9Mhr_3EsVjN%;0S)4hxI-W~TOD^I-u;m#o<`K1ULa{W|6uzr$Ma;x_X1 zy24z2XU%;ev)ANj4?GGhw-7ao(zaIB)!u21zMnj_hHZ9Oj_daRc}etj*5v-muizo; zK&93njVN|PXg#SM8fX3VJ?I4i@9xG`_ihIL*}aT0oD+FZSyNI709s%T3u&uNA|jI~)e zjXZ1SY>76CGj3E@2DQ2eMI{Q5BpN&2`btn&ymoS^GLyM>qpNm1&2H0B5QS&WQ&o2E(ZC~>IDOY;W6`DSvlTat9c z4q0~Y&-|P@cV=#W{T$e#Wp-|jEp1|zjcuj*wbhzucA;76qt9AtByp{GWVw%P$!A)> z);HHXl4LH88;uWbV9%`ASv!_yZZpY`?UStLR=Dk+q~Gc7*|FxCEZ6#7xTVzwQ)UPD zUV9Tqhu?3mdnc)p{58Hl*4oPT7y9;P@$DWAr;;5@CV2-_quI*t-AbwXT=UYS%=Hbt zyD)~_cVWDBjY^}ic%|PTj+y97+3CyfaAO(H7J6VD{}JOH}h?09Jxb| zvitYxj-2J-nL69XBN;;{sI(tBv^~damkSis!b(q^aiLlCoY)1=%4?gxbn6*TE>Q8< zj;=%&AW7C!om4`y6Z5twrHt)Kj(VCX&mYHfq%|U-w$}26pCn6IvQ&*z8@{Ahs_k5n1*V~wfOE06qPB|bi@ zGwI^Dlt!&_bg;JP4L7{fH>i6s6B(zyR77zjfH3vamXD`wV~4&$^zby>*q~#yR!)SE z6J$4a;-S6#!+P>dznTaw(cIfMt+NLbna|>Gm`RhK+{OWh$h^Y7YCUz|58|QG1LhXb zr6iV;hb1x%+ufd>Fmf+e&i2fS197&!uC-1{w`2h!o5Z6%`y=smCu+pKU;rkJt$l)rPaz|8=^+?@M7a)!IS l?Thc!eUK$+?~8BVk)*2r#ext_7SMAo(| z{Z6z;L@T@3ey$UL8tc21)s=SqUPqQ*p74Du`BXB&Yv0z|K{t3L1~SSO;ZpmNEe;|h zmJm~BQ$5HH6iMbHL1&}bGHG&FSx4vB4l(ju=mBFg^awX~$;Q_p#8gUpF4>VXjbxGN zBE=0B;223GllOpEsNhCB6Z;~GnLHwg#gYCwNo0rIL6C2sCy@j+0-Dq^R}60zv#;^L z)f2Bj^n$y`3LMBO(Lb34&!_zU|FwK>PaXgNw4QKkAOr(*+xEg)2x$7AgiG*%J}PY= z#hV>p=hwdzSK)>It}%R=k@ z8A=>=ZJC)^JVff89qKeww28F+MDsR?smA+*q^R;tyJ4PQH_*M@d8VSUfY{e|Oz%#1 zDj^hZAu!Lkh}6h4!zdnb(QXeaVfDWgl>s$Ki)o{p+h z=t+hCSezMZJ=f_&tDpdqSnY^2m1L+EH)P<~N|{!|qLAHuI}OMJi(pjhX6A+ksb;0y z4nHuT>eSyuaGM?iUHWSyt-4dOc+OjY%K*9#{?;fQ`g`2hsoZXz2c{YG=~Qm>og}h< Pms``@x!jum9?R`F*M+v{ literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..585f6221dc91a2e19ef05347bbee12e0626e227e GIT binary patch literal 184 zcmbu2Jq|!X5QRUj#2sX>AsR#}uCPHtuws$8Jf2>scyA{2e&)I{^u{1IB!nNG1-)F0l9u!ThX?+YAMgMG literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..b7dfeecebe02c401d3d6e6f124fe16974d81fd60 GIT binary patch literal 2632 zcmds(%Wo1<6vhu*6aI$@v71IAy408$ABl_B5Sw;?p_K9(NM~px3;%TW`<=ruLxVKB zG=zEFdmi8U&g0InpFKOZ%r307JDXT;V=MH2V@thfcB!|KKYi6oDTy2XhnD<#Dfvw6 zH@YVMhmuUvxYhHi_3W8-8f%}VnQSikv3-%%WY=!HBk6bgcdRdccCoV1%89+#6$F`0 z{hI5#(*DHStzvJ+qCT*qd8dw%#7`elDA1$y9zXWUo*}BlijmM8yhtCwjwf zjf|Dtb?`gTQ!O=d97G0NUG2kR={WB^ia;Cjgf3QAvX75;3u{Yzp|zR&9t%aLwIp7N zIAl|6?$$sZOrde@ve;Va3C-9K&NA5pS?<`#KW6ZiJy*RS%ObTkP%g-PQl6+Va{t;jn;9E=1uVod zxi0K6UwyB&Li!6y;oK+H zJi5B#u_GLG5!fE{cct~z$|Uj9nMNJKVHe^g6b%6FFmUk9-Zum_zh$Tj^ICu7|x?+bDICtjff3!ng%p4`vR%wFnVvFW5f-6N6J-FU!?K4tE z4?CBN>8yeO)?-?U&7OV_{_A>|Q~6B(u5eRFJu$&aUhxbsaEjHgDyozW+2SOxs&B2R zORu2^Jw;a%4Hn_I&>WbHS0+|7(in>;-=uuPdH?_b literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/InfoPlist.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/InfoPlist.strings new file mode 100644 index 0000000000000000000000000000000000000000..4cfd32c54b7f216718ef1a97d69bd92a2a92a143 GIT binary patch literal 156 zcmezOpFxSinZb?0iJ_Dsk0FI2har{0k0FsE7f35HC@|OpF-S!bP^_3C1IP;k$`ml< f14T-JtRkSSH3JtGQ(PD_fjSC+CMGgel4B+SuMryf literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/Localizable.strings b/toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/Localizable.strings new file mode 100644 index 0000000000000000000000000000000000000000..f7d1251668bb433b683da995409eacb54d5fc0be GIT binary patch literal 2588 zcmd^>+iKfD5QgWvPqCO9+CXjE%Y;A=2?Uxnp(YO?pPk4DEZHUR+q^N5={!uedP1_N_dfub@*mM7WWjsO2-_^rM4-4SC|XK{a)gMODvP;5hWHtn6ac2f0E z=w4Nva<5(}?0IA_EaIp$3ob|HtB+>Bz9OHTTo!&u84fibx-IlXT4S;xyin`WLYF;N zx~A0HThg-+Ug(AqOw>Q2g4DZWp#IqGy4bI>q*>MT-KJBqwi~Rc$ka#A{k=~5Pu9g$ z-PK21SOa_G`&hFJ89rC2E rS%Ib6uKyMMiMJbTpKn(lLH|xvTl;*QCYtK(-iyMY=HuyEQDP&@P+*beKOYHnPJP8 zw4gB!S=hZhcjnBQGjqB9-LwNstZjwOY-pMFE$8{lCOjv0&Qs6tzOqtaamCfK)bA(Q zC#+xbopN=sOxZEu{=k~{%<7f3PwY(X8vDL|!E0(=_g%;O9ar7#{aG%2-JSQVOT{T@f~^flbKH})KDzJQ0Q;t8#^= zk}jpn=maS>#lBTjud24{kJMF|yV{}?!spU`j-3Vd?!&6rj#7(tVyX+o_9o`f_R1Bl z{?#TYIK`=dbY}6Z(j1IkFD%S>{rLD7h|T#gLW%R;f%`5>H;fGijj9t zwYHI!BIY33b4@Eh&CbzXJ~1Kh*W%Qf6T1T#i@7$d%&2lgX(lP3@Gj;TD~88+Q*X`I zF0Y#NnkcGr)oaX8;avMVCZ^``bp_RZ_7Cq6OyP9MBvs}MduZno@0a)zt1;70J@28{ zLGwIEPiq`Ps>+=48xyRs5Aa{`(TTL4=4b2;i#a(RRi@+mRFHPX_4Ok@Ue~7h)wxyf z(IjfGFgzUh8}?G^x(@eQDDx8|=j3r*!94Ihrgq5r*|Z=2X`syspFSvhXeYY2Np4kc zm8lq%*9O`th+m>Eb*5e_;BJE7Y}G-^MIOazZqkWPfylT#7x#G=O4iI;up{QR)LEU< v^0O;O8xQ)Q5hr|A*?$*hTP`Q=TUt=xZ_A}ihB~pOuYb#>8e>;3+oSve2xX}~ literal 0 HcmV?d00001 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.m b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.m index a324f147e999..87c43024bc10 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.m +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.m @@ -31,6 +31,7 @@ #import "Controller.h" #import "TestClass.h" +#import "GTMDefines.h" #include #include @@ -51,7 +52,7 @@ } - (IBAction)forkTestOptions:(id)sender { - int tag = [[sender selectedCell] tag]; + NSInteger tag = [[sender selectedCell] tag]; NSLog(@"sender tag: %d", tag); if (tag <= 2) { bpForkOption = tag; @@ -75,7 +76,7 @@ NSString *resourcePath = [[NSBundle bundleForClass: [self class]] resourcePath]; - NSString *execProgname; + NSString *execProgname = nil; if (progCrashPoint == DURINGLAUNCH) { execProgname = [resourcePath stringByAppendingString:@"/crashduringload"]; } else if (progCrashPoint == AFTERLAUNCH) { @@ -129,11 +130,11 @@ } - (IBAction)crash:(id)sender { - int tag = [sender tag]; + NSInteger tag = [sender tag]; if (tag == 1) { [NSObject cancelPreviousPerformRequestsWithTarget:self]; - [self performSelector:@selector(causeCrash) withObject:nil afterDelay:10]; + [self performSelector:@selector(causeCrash) withObject:nil afterDelay:10.0]; [sender setState:NSOnState]; return; } diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.xib b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.xib index ebc623c42a07..840c0db33bb7 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.xib +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.xib @@ -3,10 +3,22 @@ 1050 10F569 - 762 + 788 1038.29 461.00 + com.apple.InterfaceBuilder.CocoaPlugin + 788 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + YES YES @@ -15,17 +27,6 @@ YES - - YES - - - - YES - - - YES - - YES @@ -52,7 +53,7 @@ {1.79769e+308, 1.79769e+308} {213, 107} - + 256 YES @@ -61,6 +62,7 @@ 301 {{14, 140}, {292, 32}} + YES 67239424 @@ -88,6 +90,7 @@ 301 {{14, 76}, {292, 32}} + 2 YES @@ -113,6 +116,7 @@ 301 {{14, 108}, {292, 32}} + 1 YES @@ -138,6 +142,7 @@ 268 {{14, 44}, {292, 32}} + YES 67239424 @@ -158,6 +163,7 @@ 268 {{14, 12}, {292, 32}} + YES 67239424 @@ -175,6 +181,8 @@ {320, 188} + + {{0, 0}, {1440, 878}} {213, 129} @@ -782,7 +790,7 @@ {1.79769e+308, 1.79769e+308} - + 256 YES @@ -804,7 +812,7 @@ 5 1211912703 - 128 + 0 NSRadioButton @@ -821,7 +829,7 @@ 6 1211912703 - 128 + 0 549453824 {18, 18} @@ -930,7 +938,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 7 1211912703 - 128 + 0 549453824 {18, 18} @@ -1040,7 +1048,7 @@ AAAAAAAAAAAAAAAAAABtbW9kAAAAAAAAIvAAACaQAAAAAMJtVwAAAAAAAAAAAAAAAAAAAAAAA 5 1211912703 - 128 + 0 @@ -1080,7 +1088,7 @@ AAAAAAAAAAAAAAAAAABtbW9kAAAAAAAAIvAAACaQAAAAAMJtVwAAAAAAAAAAAAAAAAAAAAAAA 1211912703 - 128 + 0 @@ -1095,7 +1103,7 @@ AAAAAAAAAAAAAAAAAABtbW9kAAAAAAAAIvAAACaQAAAAAMJtVwAAAAAAAAAAAAAAAAAAAAAAA 1 1211912703 - 128 + 0 549453824 {18, 18} @@ -1201,7 +1209,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 2 1211912703 - 128 + 0 549453824 {18, 18} @@ -1309,7 +1317,7 @@ AAAAAAAAAAAAAAAAAABtbW9kAAAAAAAAIvAAACaQAAAAAMJtVwAAAAAAAAAAAAAAAAAAAAAAARadio 1211912703 - 128 + 0 549453824 {18, 18} @@ -1378,7 +1386,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 3 1211912703 - 128 + 0 @@ -1393,7 +1401,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 4 1211912703 - 128 + 0 549453824 {18, 18} @@ -1502,7 +1510,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA Radio 1211912703 - 128 + 0 549453824 {18, 18} @@ -1579,6 +1587,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {787, 260} + {{0, 0}, {1440, 878}} {1.79769e+308, 1.79769e+308} @@ -2614,194 +2623,382 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES + -3.IBPluginDependency -3.ImportedFromIB2 + 103.IBPluginDependency 103.ImportedFromIB2 + 106.IBPluginDependency 106.ImportedFromIB2 + 111.IBPluginDependency 111.ImportedFromIB2 + 112.IBPluginDependency 112.ImportedFromIB2 + 124.IBPluginDependency 124.ImportedFromIB2 + 125.IBPluginDependency 125.ImportedFromIB2 + 126.IBPluginDependency 126.ImportedFromIB2 + 129.IBPluginDependency 129.ImportedFromIB2 + 130.IBPluginDependency 130.ImportedFromIB2 + 131.IBPluginDependency 131.ImportedFromIB2 + 134.IBPluginDependency 134.ImportedFromIB2 + 136.IBPluginDependency 136.ImportedFromIB2 + 143.IBPluginDependency 143.ImportedFromIB2 + 144.IBPluginDependency 144.ImportedFromIB2 + 145.IBPluginDependency 145.ImportedFromIB2 + 149.IBPluginDependency 149.ImportedFromIB2 + 150.IBPluginDependency 150.ImportedFromIB2 + 154.IBPluginDependency 154.ImportedFromIB2 + 155.IBPluginDependency 155.ImportedFromIB2 + 156.IBPluginDependency 156.ImportedFromIB2 + 157.IBPluginDependency 157.ImportedFromIB2 + 158.IBPluginDependency 158.ImportedFromIB2 + 159.IBPluginDependency 159.ImportedFromIB2 + 160.IBPluginDependency 160.ImportedFromIB2 + 161.IBPluginDependency 161.ImportedFromIB2 + 162.IBPluginDependency 162.ImportedFromIB2 + 163.IBPluginDependency 163.ImportedFromIB2 + 164.IBPluginDependency 164.ImportedFromIB2 + 167.IBPluginDependency 167.ImportedFromIB2 + 168.IBPluginDependency 168.ImportedFromIB2 + 169.IBPluginDependency 169.ImportedFromIB2 + 171.IBPluginDependency 171.ImportedFromIB2 + 172.IBPluginDependency 172.ImportedFromIB2 + 173.IBPluginDependency 173.ImportedFromIB2 + 174.IBPluginDependency 174.ImportedFromIB2 + 184.IBPluginDependency 184.ImportedFromIB2 + 185.IBPluginDependency 185.ImportedFromIB2 + 187.IBPluginDependency 187.ImportedFromIB2 + 189.IBPluginDependency 189.ImportedFromIB2 + 19.IBPluginDependency 19.ImportedFromIB2 + 191.IBPluginDependency 191.ImportedFromIB2 + 196.IBPluginDependency 196.ImportedFromIB2 + 197.IBPluginDependency 197.ImportedFromIB2 + 2.IBPluginDependency 2.ImportedFromIB2 + 204.IBPluginDependency 204.ImportedFromIB2 + 206.IBPluginDependency 206.ImportedFromIB2 207.ImportedFromIB2 21.IBEditorWindowLastContentRect + 21.IBPluginDependency 21.IBWindowTemplateEditedContentRect 21.ImportedFromIB2 21.windowTemplate.hasMinSize 21.windowTemplate.minSize + 210.IBPluginDependency 210.ImportedFromIB2 + 212.IBPluginDependency 212.ImportedFromIB2 + 218.IBPluginDependency 218.ImportedFromIB2 220.IBEditorWindowLastContentRect + 220.IBPluginDependency 220.IBWindowTemplateEditedContentRect 220.ImportedFromIB2 + 221.IBPluginDependency 221.ImportedFromIB2 + 226.IBPluginDependency 226.ImportedFromIB2 + 227.IBPluginDependency 227.ImportedFromIB2 + 228.IBPluginDependency 228.ImportedFromIB2 + 23.IBPluginDependency 23.ImportedFromIB2 + 232.IBPluginDependency 232.ImportedFromIB2 + 233.IBPluginDependency 233.ImportedFromIB2 + 234.IBPluginDependency 234.ImportedFromIB2 + 236.IBPluginDependency 236.ImportedFromIB2 + 237.IBPluginDependency 237.ImportedFromIB2 + 238.IBPluginDependency 238.ImportedFromIB2 + 239.IBPluginDependency 239.ImportedFromIB2 + 24.IBPluginDependency 24.ImportedFromIB2 + 248.IBPluginDependency 248.ImportedFromIB2 + 272.IBPluginDependency 272.ImportedFromIB2 29.IBEditorWindowLastContentRect + 29.IBPluginDependency 29.ImportedFromIB2 + 325.IBPluginDependency 325.ImportedFromIB2 + 329.IBPluginDependency + 330.IBPluginDependency + 331.IBPluginDependency + 332.IBPluginDependency + 333.IBPluginDependency + 334.IBPluginDependency + 335.IBPluginDependency + 336.IBPluginDependency + 337.IBPluginDependency + 5.IBPluginDependency 5.ImportedFromIB2 + 56.IBPluginDependency 56.ImportedFromIB2 + 57.IBPluginDependency 57.ImportedFromIB2 + 58.IBPluginDependency 58.ImportedFromIB2 + 72.IBPluginDependency 72.ImportedFromIB2 + 73.IBPluginDependency 73.ImportedFromIB2 + 74.IBPluginDependency 74.ImportedFromIB2 + 75.IBPluginDependency 75.ImportedFromIB2 + 77.IBPluginDependency 77.ImportedFromIB2 + 78.IBPluginDependency 78.ImportedFromIB2 + 79.IBPluginDependency 79.ImportedFromIB2 + 80.IBPluginDependency 80.ImportedFromIB2 + 81.IBPluginDependency 81.ImportedFromIB2 + 82.IBPluginDependency 82.ImportedFromIB2 + 83.IBPluginDependency 83.ImportedFromIB2 + 92.IBPluginDependency 92.ImportedFromIB2 YES + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{42, 911}, {320, 188}} - {{42, 911}, {320, 188}} + {{510, 1250}, {320, 188}} + com.apple.InterfaceBuilder.CocoaPlugin + {{510, 1250}, {320, 188}} {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - {{21, 862}, {787, 260}} - {{21, 862}, {787, 260}} + {{-55, 1287}, {787, 260}} + com.apple.InterfaceBuilder.CocoaPlugin + {{-55, 1287}, {787, 260}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{0, 1114}, {362, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -2848,6 +3045,40 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id + + YES + + YES + crash: + forkTestGo: + forkTestOptions: + generateReportWithoutCrash: + showForkTestWindow: + + + YES + + crash: + id + + + forkTestGo: + id + + + forkTestOptions: + id + + + generateReportWithoutCrash: + id + + + showForkTestWindow: + id + + + YES @@ -2861,6 +3092,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSWindow + + YES + + YES + forkTestOptions_ + window_ + + + YES + + forkTestOptions_ + NSWindow + + + window_ + NSWindow + + + + + IBProjectSource + testapp/Controller.h + + + + Controller + NSObject IBUserSource @@ -2875,6 +3133,586 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSBrowser + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSDocument + NSObject + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocument.h + + + + NSDocument + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentScripting.h + + + + NSDocumentController + NSObject + + YES + + YES + clearRecentDocuments: + newDocument: + openDocument: + saveAllDocuments: + + + YES + id + id + id + id + + + + YES + + YES + clearRecentDocuments: + newDocument: + openDocument: + saveAllDocuments: + + + YES + + clearRecentDocuments: + id + + + newDocument: + id + + + openDocument: + id + + + saveAllDocuments: + id + + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentController.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMovieView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMovieView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSTableView + NSControl + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + 0 IBCocoaFramework @@ -2882,12 +3720,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 YES - ../GoogleBreakpadTest.xcodeproj + ../../Breakpad.xcodeproj 3 YES diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.mm b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.mm index cade633e94ec..6e6a8833d5bf 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.mm +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.mm @@ -78,7 +78,7 @@ void InternalTestClass::InternalFunction(AStruct &s) { float InternalTestClass::kStaticFloatValue = 42; static float PlainOldFunction() { - return 3.14145; + return 3.14145f; } @implementation TestClass diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/tests/SimpleStringDictionaryTest.h b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/SimpleStringDictionaryTest.h index 1f48517f6741..53f6ae42247b 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/tests/SimpleStringDictionaryTest.h +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/SimpleStringDictionaryTest.h @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#import +#import "GTMSenTestCase.h" #import "SimpleStringDictionary.h" @interface SimpleStringDictionaryTest : GTMTestCase { diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/tests/auto_tempdir.h b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/auto_tempdir.h new file mode 100644 index 000000000000..b6473a5cdd40 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/auto_tempdir.h @@ -0,0 +1,72 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. + +// Utility class for creating a temporary directory for unit tests +// that is deleted in the destructor. +#ifndef GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR +#define GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR + +#include +#include + +#include + +namespace google_breakpad { + +class AutoTempDir { + public: + AutoTempDir() { + char tempDir[16] = "/tmp/XXXXXXXXXX"; + mkdtemp(tempDir); + path = tempDir; + } + + ~AutoTempDir() { + // First remove any files in the dir + DIR* dir = opendir(path.c_str()); + if (!dir) + return; + + dirent* entry; + while ((entry = readdir(dir)) != NULL) { + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) + continue; + std::string entryPath = path + "/" + entry->d_name; + unlink(entryPath.c_str()); + } + closedir(dir); + rmdir(path.c_str()); + } + + std::string path; +}; + +} // namespace google_breakpad + +#endif // GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/tests/crash_generation_server_test.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/crash_generation_server_test.cc new file mode 100644 index 000000000000..1ea5bf16f29c --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/crash_generation_server_test.cc @@ -0,0 +1,223 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. +// +// crash_generation_server_test.cc +// Unit tests for CrashGenerationServer + +#include +#include +#include +#include +#include + +#include + +#include "breakpad_googletest_includes.h" +#include "client/mac/crash_generation/client_info.h" +#include "client/mac/crash_generation/crash_generation_client.h" +#include "client/mac/crash_generation/crash_generation_server.h" +#include "client/mac/handler/exception_handler.h" +#include "client/mac/tests/auto_tempdir.h" + +namespace { +using std::string; +using google_breakpad::AutoTempDir; +using google_breakpad::ClientInfo; +using google_breakpad::CrashGenerationClient; +using google_breakpad::CrashGenerationServer; +using google_breakpad::ExceptionHandler; +using testing::Test; + +class CrashGenerationServerTest : public Test { +public: + // The port name to receive messages on + char mach_port_name[128]; + // Filename of the last dump that was generated + string last_dump_name; + // PID of the child process + pid_t child_pid; + // A temp dir + AutoTempDir temp_dir; + // Counter just to ensure that we don't hit the same port again + static int i; + + void SetUp() { + sprintf(mach_port_name, + "com.google.breakpad.ServerTest.%d.%d", getpid(), + CrashGenerationServerTest::i++); + child_pid = (pid_t)-1; + } +}; +int CrashGenerationServerTest::i = 0; + +// Test that starting and stopping a server works +TEST_F(CrashGenerationServerTest, testStartStopServer) { + CrashGenerationServer server(mach_port_name, + NULL, // dump callback + NULL, // dump context + NULL, // exit callback + NULL, // exit context + false, // generate dumps + ""); // dump path + ASSERT_TRUE(server.Start()); + ASSERT_TRUE(server.Stop()); +} + +// Test that requesting a dump via CrashGenerationClient works +// Test without actually dumping +TEST_F(CrashGenerationServerTest, testRequestDumpNoDump) { + CrashGenerationServer server(mach_port_name, + NULL, // dump callback + NULL, // dump context + NULL, // exit callback + NULL, // exit context + false, // don't generate dumps + temp_dir.path); // dump path + ASSERT_TRUE(server.Start()); + + pid_t pid = fork(); + ASSERT_NE(-1, pid); + if (pid == 0) { + CrashGenerationClient client(mach_port_name); + bool result = client.RequestDump(); + exit(result ? 0 : 1); + } + + int ret; + ASSERT_EQ(pid, waitpid(pid, &ret, 0)); + EXPECT_TRUE(WIFEXITED(ret)); + EXPECT_EQ(0, WEXITSTATUS(ret)); + EXPECT_TRUE(server.Stop()); + // check that no minidump was written + string pattern = temp_dir.path + "/*"; + glob_t dirContents; + ret = glob(pattern.c_str(), GLOB_NOSORT, NULL, &dirContents); + EXPECT_EQ(GLOB_NOMATCH, ret); + if (ret != GLOB_NOMATCH) + globfree(&dirContents); +} + +void dumpCallback(void *context, const ClientInfo &client_info, + const std::string &file_path) { + if (context) { + CrashGenerationServerTest* self = + reinterpret_cast(context); + if (!file_path.empty()) + self->last_dump_name = file_path; + self->child_pid = client_info.pid(); + } +} + +void *RequestDump(void *context) { + CrashGenerationClient client((const char*)context); + bool result = client.RequestDump(); + return (void*)(result ? 0 : 1); +} + +// Test that actually writing a minidump works +TEST_F(CrashGenerationServerTest, testRequestDump) { + CrashGenerationServer server(mach_port_name, + dumpCallback, // dump callback + this, // dump context + NULL, // exit callback + NULL, // exit context + true, // generate dumps + temp_dir.path); // dump path + ASSERT_TRUE(server.Start()); + + pid_t pid = fork(); + ASSERT_NE(-1, pid); + if (pid == 0) { + // Have to spawn off a separate thread to request the dump, + // because MinidumpGenerator assumes the handler thread is not + // the only thread + pthread_t thread; + if (pthread_create(&thread, NULL, RequestDump, (void*)mach_port_name) != 0) + exit(1); + void* result; + pthread_join(thread, &result); + exit(reinterpret_cast(result)); + } + + int ret; + ASSERT_EQ(pid, waitpid(pid, &ret, 0)); + EXPECT_TRUE(WIFEXITED(ret)); + EXPECT_EQ(0, WEXITSTATUS(ret)); + EXPECT_TRUE(server.Stop()); + // check that minidump was written + ASSERT_FALSE(last_dump_name.empty()); + struct stat st; + EXPECT_EQ(0, stat(last_dump_name.c_str(), &st)); + EXPECT_LT(0, st.st_size); + // check client's PID + ASSERT_EQ(pid, child_pid); +} + +static void Crasher() { + int *a = (int*)0x42; + + fprintf(stdout, "Going to crash...\n"); + fprintf(stdout, "A = %d", *a); +} + +// Test that crashing a child process with an OOP ExceptionHandler installed +// results in a minidump being written by the CrashGenerationServer in +// the parent. +TEST_F(CrashGenerationServerTest, testChildProcessCrash) { + CrashGenerationServer server(mach_port_name, + dumpCallback, // dump callback + this, // dump context + NULL, // exit callback + NULL, // exit context + true, // generate dumps + temp_dir.path); // dump path + ASSERT_TRUE(server.Start()); + + pid_t pid = fork(); + ASSERT_NE(-1, pid); + if (pid == 0) { + // Instantiate an OOP exception handler. + ExceptionHandler eh("", NULL, NULL, NULL, true, mach_port_name); + Crasher(); + // not reached + exit(0); + } + + int ret; + ASSERT_EQ(pid, waitpid(pid, &ret, 0)); + EXPECT_FALSE(WIFEXITED(ret)); + EXPECT_TRUE(server.Stop()); + // check that minidump was written + ASSERT_FALSE(last_dump_name.empty()); + struct stat st; + EXPECT_EQ(0, stat(last_dump_name.c_str(), &st)); + EXPECT_LT(0, st.st_size); +} + +} // namespace diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/tests/exception_handler_test.cc b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/exception_handler_test.cc new file mode 100644 index 000000000000..09237313e434 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/tests/exception_handler_test.cc @@ -0,0 +1,198 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. + +// exception_handler_test.cc: Unit tests for google_breakpad::ExceptionHandler + +#include +#include + +#include "breakpad_googletest_includes.h" +#include "client/mac/handler/exception_handler.h" +#include "client/mac/tests/auto_tempdir.h" +#include "common/mac/MachIPC.h" + +namespace { +using std::string; +using google_breakpad::AutoTempDir; +using google_breakpad::ExceptionHandler; +using google_breakpad::MachPortSender; +using google_breakpad::MachReceiveMessage; +using google_breakpad::MachSendMessage; +using google_breakpad::ReceivePort; +using testing::Test; + +class ExceptionHandlerTest : public Test { + public: + AutoTempDir tempDir; + string lastDumpName; +}; + +static void Crasher() { + int *a = (int*)0x42; + + fprintf(stdout, "Going to crash...\n"); + fprintf(stdout, "A = %d", *a); +} + +static void SoonToCrash() { + Crasher(); +} + +static bool MDCallback(const char *dump_dir, const char *file_name, + void *context, bool success) { + string path(dump_dir); + path.append("/"); + path.append(file_name); + path.append(".dmp"); + + int fd = *reinterpret_cast(context); + (void)write(fd, path.c_str(), path.length() + 1); + close(fd); + exit(0); + // not reached + return true; +} + +TEST_F(ExceptionHandlerTest, InProcess) { + AutoTempDir tempDir; + // Give the child process a pipe to report back on. + int fds[2]; + ASSERT_EQ(0, pipe(fds)); + // Fork off a child process so it can crash. + pid_t pid = fork(); + if (pid == 0) { + // In the child process. + close(fds[0]); + ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds[1], true, NULL); + // crash + SoonToCrash(); + // not reached + exit(1); + } + // In the parent process. + ASSERT_NE(-1, pid); + // Wait for the background process to return the minidump file. + close(fds[1]); + char minidump_file[PATH_MAX]; + ssize_t nbytes = read(fds[0], minidump_file, sizeof(minidump_file)); + ASSERT_NE(0, nbytes); + // Ensure that minidump file exists and is > 0 bytes. + struct stat st; + ASSERT_EQ(0, stat(minidump_file, &st)); + ASSERT_LT(0, st.st_size); + + // Child process should have exited with a zero status. + int ret; + ASSERT_EQ(pid, waitpid(pid, &ret, 0)); + EXPECT_NE(0, WIFEXITED(ret)); + EXPECT_EQ(0, WEXITSTATUS(ret)); +} + +static bool ChildMDCallback(const char *dump_dir, const char *file_name, + void *context, bool success) { + ExceptionHandlerTest *self = reinterpret_cast(context); + if (dump_dir && file_name) { + self->lastDumpName = dump_dir; + self->lastDumpName += "/"; + self->lastDumpName += file_name; + self->lastDumpName += ".dmp"; + } + return true; +} + +TEST_F(ExceptionHandlerTest, DumpChildProcess) { + const int kTimeoutMs = 2000; + // Create a mach port to receive the child task on. + char machPortName[128]; + sprintf(machPortName, "ExceptionHandlerTest.%d", getpid()); + ReceivePort parent_recv_port(machPortName); + + // Give the child process a pipe to block on. + int fds[2]; + ASSERT_EQ(0, pipe(fds)); + + // Fork off a child process to dump. + pid_t pid = fork(); + if (pid == 0) { + // In the child process + close(fds[0]); + + // Send parent process the task and thread ports. + MachSendMessage child_message(0); + child_message.AddDescriptor(mach_task_self()); + child_message.AddDescriptor(mach_thread_self()); + + MachPortSender child_sender(machPortName); + if (child_sender.SendMessage(child_message, kTimeoutMs) != KERN_SUCCESS) + exit(1); + + // Wait for the parent process. + uint8_t data; + read(fds[1], &data, 1); + exit(0); + } + // In the parent process. + ASSERT_NE(-1, pid); + close(fds[1]); + + // Read the child's task and thread ports. + MachReceiveMessage child_message; + ASSERT_EQ(KERN_SUCCESS, + parent_recv_port.WaitForMessage(&child_message, kTimeoutMs)); + mach_port_t child_task = child_message.GetTranslatedPort(0); + mach_port_t child_thread = child_message.GetTranslatedPort(1); + ASSERT_NE(MACH_PORT_NULL, child_task); + ASSERT_NE(MACH_PORT_NULL, child_thread); + + // Write a minidump of the child process. + bool result = ExceptionHandler::WriteMinidumpForChild(child_task, + child_thread, + tempDir.path, + ChildMDCallback, + this); + ASSERT_EQ(true, result); + + // Ensure that minidump file exists and is > 0 bytes. + ASSERT_FALSE(lastDumpName.empty()); + struct stat st; + ASSERT_EQ(0, stat(lastDumpName.c_str(), &st)); + ASSERT_LT(0, st.st_size); + + // Unblock child process + uint8_t data = 1; + (void)write(fds[0], &data, 1); + + // Child process should have exited with a zero status. + int ret; + ASSERT_EQ(pid, waitpid(pid, &ret, 0)); + EXPECT_NE(0, WIFEXITED(ret)); + EXPECT_EQ(0, WEXITSTATUS(ret)); +} + +} diff --git a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h index 7c556a27c957..0e12e00b69e6 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h +++ b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h @@ -61,27 +61,30 @@ inline bool TypedMDRVA::AllocateArray(size_t count) { } template -inline bool TypedMDRVA::AllocateObjectAndArray(unsigned int count, - size_t size) { - assert(count && size); +inline bool TypedMDRVA::AllocateObjectAndArray(size_t count, + size_t length) { + assert(count && length); allocation_state_ = SINGLE_OBJECT_WITH_ARRAY; - return UntypedMDRVA::Allocate(minidump_size::size() + count * size); + return UntypedMDRVA::Allocate(minidump_size::size() + count * length); } template inline bool TypedMDRVA::CopyIndex(unsigned int index, MDType *item) { assert(allocation_state_ == ARRAY); - return writer_->Copy(position_ + index * minidump_size::size(), item, - minidump_size::size()); + return writer_->Copy( + static_cast(position_ + index * minidump_size::size()), + item, minidump_size::size()); } template inline bool TypedMDRVA::CopyIndexAfterObject(unsigned int index, const void *src, - size_t size) { + size_t length) { assert(allocation_state_ == SINGLE_OBJECT_WITH_ARRAY); - return writer_->Copy(position_ + minidump_size::size() + index * size, - src, size); + return writer_->Copy( + static_cast(position_ + minidump_size::size() + + index * length), + src, length); } template diff --git a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc index 1be3f504664b..213e2be06b8a 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc @@ -92,22 +92,22 @@ bool MinidumpFileWriter::CopyStringToMDString(const wchar_t *str, } else { u_int16_t out[2]; int out_idx = 0; - + // Copy the string character by character while (length && result) { UTF32ToUTF16Char(*str, out); if (!out[0]) return false; - + // Process one character at a time --length; ++str; - + // Append the one or two UTF-16 characters. The first one will be non- // zero, but the second one may be zero, depending on the conversion from // UTF-32. int out_count = out[1] ? 2 : 1; - int out_size = sizeof(u_int16_t) * out_count; + size_t out_size = sizeof(u_int16_t) * out_count; result = mdstring->CopyIndexAfterObject(out_idx, out, out_size); out_idx += out_count; } @@ -127,14 +127,14 @@ bool MinidumpFileWriter::CopyStringToMDString(const char *str, int conversion_count = UTF8ToUTF16Char(str, length, out); if (!conversion_count) return false; - + // Move the pointer along based on the nubmer of converted characters length -= conversion_count; str += conversion_count; - + // Append the one or two UTF-16 characters int out_count = out[1] ? 2 : 1; - int out_size = sizeof(u_int16_t) * out_count; + size_t out_size = sizeof(u_int16_t) * out_count; result = mdstring->CopyIndexAfterObject(out_idx, out, out_size); out_idx += out_count; } @@ -161,7 +161,8 @@ bool MinidumpFileWriter::WriteStringCore(const CharType *str, return false; // Set length excluding the NULL and copy the string - mdstring.get()->length = mdstring_length * sizeof(u_int16_t); + mdstring.get()->length = + static_cast(mdstring_length * sizeof(u_int16_t)); bool result = CopyStringToMDString(str, mdstring_length, &mdstring); // NULL terminate @@ -235,7 +236,7 @@ bool MinidumpFileWriter::Copy(MDRVA position, const void *src, ssize_t size) { assert(file_ != -1); // Ensure that the data will fit in the allocated space - if (size + position > size_) + if (static_cast(size + position) > size_) return false; // Seek and write the data @@ -260,11 +261,11 @@ bool UntypedMDRVA::Allocate(size_t size) { return position_ != MinidumpFileWriter::kInvalidMDRVA; } -bool UntypedMDRVA::Copy(MDRVA position, const void *src, size_t size) { +bool UntypedMDRVA::Copy(MDRVA pos, const void *src, size_t size) { assert(src); assert(size); - assert(position + size <= position_ + size_); - return writer_->Copy(position, src, size); + assert(pos + size <= position_ + size_); + return writer_->Copy(pos, src, size); } } // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h index f569a553597f..cded35854ac1 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h +++ b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h @@ -151,7 +151,7 @@ class UntypedMDRVA { // Return size and position inline MDLocationDescriptor location() const { - MDLocationDescriptor location = { size_, position_ }; + MDLocationDescriptor location = { static_cast(size_), position_ }; return location; } @@ -218,7 +218,7 @@ class TypedMDRVA : public UntypedMDRVA { // Allocate an array of |count| elements of |size| after object of MDType // Must not call more than once. // Return true on success, or false on failure - bool AllocateObjectAndArray(unsigned int count, size_t size); + bool AllocateObjectAndArray(size_t count, size_t size); // Copy |item| to |index| // Must have been allocated using AllocateArray(). diff --git a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer_unittest.cc b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer_unittest.cc index a83307d9edbf..08522fb214e9 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer_unittest.cc @@ -144,22 +144,23 @@ static bool CompareFile(const char *path) { 0x0000000a, 0x000a1c09, 0x0000000b, 0x00000000, #endif }; - unsigned int expected_byte_count = sizeof(expected); + size_t expected_byte_count = sizeof(expected); int fd = open(path, O_RDONLY, 0600); void *buffer = malloc(expected_byte_count); ASSERT_NE(fd, -1); ASSERT_TRUE(buffer); - ASSERT_EQ(read(fd, buffer, expected_byte_count), expected_byte_count); + ASSERT_EQ(read(fd, buffer, expected_byte_count), + static_cast(expected_byte_count)); char *b1, *b2; - b1 = (char*)buffer; - b2 = (char*)expected; + b1 = reinterpret_cast(buffer); + b2 = reinterpret_cast(expected); while (*b1 == *b2) { b1++; b2++; } - printf("%d\n",b1 - (char*)buffer); + printf("%p\n", reinterpret_cast(b1 - (char*)buffer)); ASSERT_EQ(memcmp(buffer, expected, expected_byte_count), 0); return true; diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.cc b/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.cc index a9b0020f5981..8721b7a58230 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.cc @@ -125,7 +125,7 @@ uint64 ByteReader::ReadEncodedPointer(const char *buffer, // address. size_t skew = section_base_ & (AddressSize() - 1); // Now find the offset from that aligned address to buffer. - size_t offset = skew + (buffer - buffer_base_); + off_t offset = skew + (buffer - buffer_base_); // Round up to the next boundary. size_t aligned = (offset + AddressSize() - 1) & -AddressSize(); // Convert back to a pointer. diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.h b/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.h index aaa97c4f75dc..f01f319d928d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.h +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/bytereader.h @@ -301,7 +301,7 @@ class ByteReader { // Base addresses for Linux C++ exception handling data's encoded pointers. bool have_section_base_, have_text_base_, have_data_base_; bool have_function_base_; - uint64 section_base_, text_base_, data_base_, function_base_; + size_t section_base_, text_base_, data_base_, function_base_; const char *buffer_base_; }; diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.cc b/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.cc index a2915bad0fe0..23f7ffa842f8 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.cc @@ -34,6 +34,7 @@ #include "common/dwarf/dwarf2reader.h" #include +#include #include #include @@ -90,7 +91,7 @@ void CompilationUnit::ReadAbbrevs() { while (1) { CompilationUnit::Abbrev abbrev; size_t len; - const uint32 number = reader_->ReadUnsignedLEB128(abbrevptr, &len); + const uint64 number = reader_->ReadUnsignedLEB128(abbrevptr, &len); if (number == 0) break; @@ -98,7 +99,7 @@ void CompilationUnit::ReadAbbrevs() { abbrevptr += len; assert(abbrevptr < abbrev_start + abbrev_length); - const uint32 tag = reader_->ReadUnsignedLEB128(abbrevptr, &len); + const uint64 tag = reader_->ReadUnsignedLEB128(abbrevptr, &len); abbrevptr += len; abbrev.tag = static_cast(tag); @@ -109,11 +110,11 @@ void CompilationUnit::ReadAbbrevs() { assert(abbrevptr < abbrev_start + abbrev_length); while (1) { - const uint32 nametemp = reader_->ReadUnsignedLEB128(abbrevptr, &len); + const uint64 nametemp = reader_->ReadUnsignedLEB128(abbrevptr, &len); abbrevptr += len; assert(abbrevptr < abbrev_start + abbrev_length); - const uint32 formtemp = reader_->ReadUnsignedLEB128(abbrevptr, &len); + const uint64 formtemp = reader_->ReadUnsignedLEB128(abbrevptr, &len); abbrevptr += len; if (nametemp == 0 && formtemp == 0) break; @@ -515,7 +516,7 @@ void CompilationUnit::ProcessDIEs() { continue; } - const Abbrev& abbrev = abbrevs_->at(abbrev_num); + const Abbrev& abbrev = abbrevs_->at(static_cast(abbrev_num)); const enum DwarfTag tag = abbrev.tag; if (!handler_->StartDIE(absolute_offset, tag, abbrev.attributes)) { dieptr = SkipDIE(dieptr, abbrev); @@ -618,8 +619,8 @@ void LineInfo::ReadHeader() { uint64 filelength = reader_->ReadUnsignedLEB128(lineptr, &len); lineptr += len; - handler_->DefineFile(filename, fileindex, dirindex, mod_time, - filelength); + handler_->DefineFile(filename, fileindex, static_cast(dirindex), + mod_time, filelength); fileindex++; } } @@ -649,7 +650,7 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, opcode -= header.opcode_base; const int64 advance_address = (opcode / header.line_range) * header.min_insn_length; - const int64 advance_line = (opcode % header.line_range) + const int32 advance_line = (opcode % header.line_range) + header.line_base; // Check if the lsm passes "pc". If so, mark it as passed. @@ -689,7 +690,7 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, case DW_LNS_advance_line: { const int64 advance_line = reader->ReadSignedLEB128(start, &templen); oplen += templen; - lsm->line_num += advance_line; + lsm->line_num += static_cast(advance_line); // With gcc 4.2.1, we can get the line_no here for the first time // since DW_LNS_advance_line is called after DW_LNE_set_address is @@ -703,13 +704,13 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, case DW_LNS_set_file: { const uint64 fileno = reader->ReadUnsignedLEB128(start, &templen); oplen += templen; - lsm->file_num = fileno; + lsm->file_num = static_cast(fileno); } break; case DW_LNS_set_column: { const uint64 colno = reader->ReadUnsignedLEB128(start, &templen); oplen += templen; - lsm->column_num = colno; + lsm->column_num = static_cast(colno); } break; case DW_LNS_negate_stmt: { @@ -748,7 +749,7 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, } break; case DW_LNS_extended_op: { - const size_t extended_op_len = reader->ReadUnsignedLEB128(start, + const uint64 extended_op_len = reader->ReadUnsignedLEB128(start, &templen); start += templen; oplen += templen + extended_op_len; @@ -790,8 +791,8 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, oplen += templen; if (handler) { - handler->DefineFile(filename, -1, dirindex, mod_time, - filelength); + handler->DefineFile(filename, -1, static_cast(dirindex), + mod_time, filelength); } } break; @@ -803,7 +804,6 @@ bool LineInfo::ProcessOneOpcode(ByteReader* reader, // Ignore unknown opcode silently if (header.std_opcode_lengths) { for (int i = 0; i < (*header.std_opcode_lengths)[opcode]; i++) { - size_t templen; reader->ReadUnsignedLEB128(start, &templen); start += templen; oplen += templen; @@ -1940,7 +1940,7 @@ bool CallFrameInfo::ReadCIEFields(CIE *cie) { // If we have a 'z' augmentation string, find the augmentation data and // use the augmentation string to parse it. if (cie->has_z_augmentation) { - size_t data_size = reader_->ReadUnsignedLEB128(cursor, &len); + uint64_t data_size = reader_->ReadUnsignedLEB128(cursor, &len); if (size_t(cie->end - cursor) < len + data_size) return ReportIncomplete(cie); cursor += len; @@ -2060,7 +2060,7 @@ bool CallFrameInfo::ReadFDEFields(FDE *fde) { // If the CIE has a 'z' augmentation string, then augmentation data // appears here. if (fde->cie->has_z_augmentation) { - size_t data_size = reader_->ReadUnsignedLEB128(cursor, &size); + uint64_t data_size = reader_->ReadUnsignedLEB128(cursor, &size); if (size_t(fde->end - cursor) < size + data_size) return ReportIncomplete(fde); cursor += size; diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.h b/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.h index a7a13afba167..5a255238f115 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.h +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/dwarf2reader.h @@ -242,7 +242,7 @@ class CompilationUnit { // The abbreviation tells how to read a DWARF2/3 DIE, and consist of a // tag and a list of attributes, as well as the data form of each attribute. struct Abbrev { - uint32 number; + uint64 number; enum DwarfTag tag; bool has_children; AttributeList attributes; diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/line_state_machine.h b/toolkit/crashreporter/google-breakpad/src/common/dwarf/line_state_machine.h index 6f9fb72b85bf..0ff72abcfc28 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/line_state_machine.h +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/line_state_machine.h @@ -48,7 +48,7 @@ struct LineStateMachine { uint32 file_num; uint64 address; - uint64 line_num; + uint32 line_num; uint32 column_num; bool is_stmt; // stmt means statement. bool basic_block; diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.cc b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.cc index 611cecd5c33e..ed0b406dd603 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.cc @@ -117,7 +117,7 @@ bool DwarfCFIToModule::Entry(size_t offset, uint64 address, uint64 length, // address on entry to the function. So establish an initial .ra // rule citing the return address register. if (return_address_ < register_names_.size()) - entry_->initial_rules[".ra"] = register_names_[return_address_]; + entry_->initial_rules[ra_name_] = register_names_[return_address_]; return true; } @@ -126,11 +126,11 @@ string DwarfCFIToModule::RegisterName(int i) { assert(entry_); if (i < 0) { assert(i == kCFARegister); - return ".cfa"; + return cfa_name_; } unsigned reg = i; if (reg == return_address_) - return ".ra"; + return ra_name_; if (0 <= reg && reg < register_names_.size()) return register_names_[reg]; @@ -144,12 +144,21 @@ string DwarfCFIToModule::RegisterName(int i) { void DwarfCFIToModule::Record(Module::Address address, int reg, const string &rule) { assert(entry_); + + // Place the name in our global set of strings, and then use the string + // from the set. Even though the assignment looks like a copy, all the + // major std::string implementations use reference counting internally, + // so the effect is to have all our data structures share copies of rules + // whenever possible. Since register names are drawn from a + // vector, register names are already shared. + string shared_rule = *common_strings_.insert(rule).first; + // Is this one of this entry's initial rules? if (address == entry_->address) - entry_->initial_rules[RegisterName(reg)] = rule; + entry_->initial_rules[RegisterName(reg)] = shared_rule; // File it under the appropriate address. else - entry_->rule_changes[address][RegisterName(reg)] = rule; + entry_->rule_changes[address][RegisterName(reg)] = shared_rule; } bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) { diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.h b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.h index dc11ec53fceb..d29a796c04fb 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.h +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cfi_to_module.h @@ -40,7 +40,9 @@ #define COMMON_LINUX_DWARF_CFI_TO_MODULE_H #include +#include +#include #include #include @@ -51,6 +53,7 @@ namespace google_breakpad { using dwarf2reader::CallFrameInfo; using google_breakpad::Module; +using std::set; using std::string; using std::vector; @@ -124,7 +127,8 @@ class DwarfCFIToModule: public CallFrameInfo::Handler { DwarfCFIToModule(Module *module, const vector ®ister_names, Reporter *reporter) : module_(module), register_names_(register_names), reporter_(reporter), - entry_(NULL), return_address_(-1) { } + entry_(NULL), return_address_(-1), cfa_name_(".cfa"), ra_name_(".ra") { + } virtual ~DwarfCFIToModule() { delete entry_; } virtual bool Entry(size_t offset, uint64 address, uint64 length, @@ -168,6 +172,23 @@ class DwarfCFIToModule: public CallFrameInfo::Handler { // The return address column for that entry. unsigned return_address_; + + // The names of the return address and canonical frame address. Putting + // these here instead of using string literals allows us to share their + // texts in reference-counted std::string implementations (all the + // popular ones). Many, many rules cite these strings. + string cfa_name_, ra_name_; + + // A set of strings used by this CFI. Before storing a string in one of + // our data structures, insert it into this set, and then use the string + // from the set. + // + // Because std::string uses reference counting internally, simply using + // strings from this set, even if passed by value, assigned, or held + // directly in structures and containers (map, for example), + // causes those strings to share a single instance of each distinct piece + // of text. + set common_strings_; }; } // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cu_to_module.cc b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cu_to_module.cc index 85d1d8c485dd..9b5382839bcb 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf_cu_to_module.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf_cu_to_module.cc @@ -36,12 +36,16 @@ #include #include +#include +#include #include "common/dwarf_line_to_module.h" namespace google_breakpad { using std::map; +using std::pair; +using std::set; using std::vector; // Data provided by a DWARF specification DIE. @@ -83,6 +87,17 @@ typedef map AbstractOriginByOffset; // Data global to the DWARF-bearing file that is private to the // DWARF-to-Module process. struct DwarfCUToModule::FilePrivate { + // A set of strings used in this CU. Before storing a string in one of + // our data structures, insert it into this set, and then use the string + // from the set. + // + // Because std::string uses reference counting internally, simply using + // strings from this set, even if passed by value, assigned, or held + // directly in structures and containers (map, for example), + // causes those strings to share a single instance of each distinct piece + // of text. + set common_strings; + // A map from offsets of DIEs within the .debug_info section to // Specifications describing those DIEs. Specification references can // cross compilation unit boundaries. @@ -256,7 +271,17 @@ void DwarfCUToModule::GenericDIEHandler::ProcessAttributeString( enum DwarfForm form, const string &data) { switch (attr) { - case dwarf2reader::DW_AT_name: name_attribute_ = data; break; + case dwarf2reader::DW_AT_name: { + // Place the name in our global set of strings, and then use the + // string from the set. Even though the assignment looks like a copy, + // all the major std::string implementations use reference counting + // internally, so the effect is to have all our data structures share + // copies of strings whenever possible. + pair::iterator, bool> result = + cu_context_->file_context->file_private->common_strings.insert(data); + name_attribute_ = *result.first; + break; + } default: break; } } diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc index d8a78942f55f..65e577c81f3e 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc @@ -46,7 +46,10 @@ #include #include +#include #include +#include +#include #include "common/dwarf/bytereader-inl.h" #include "common/dwarf/dwarf2diehandler.h" @@ -67,6 +70,64 @@ using google_breakpad::DwarfLineToModule; using google_breakpad::Module; using google_breakpad::StabsToModule; +// +// FDWrapper +// +// Wrapper class to make sure opened file is closed. +// +class FDWrapper { + public: + explicit FDWrapper(int fd) : + fd_(fd) {} + ~FDWrapper() { + if (fd_ != -1) + close(fd_); + } + int get() { + return fd_; + } + int release() { + int fd = fd_; + fd_ = -1; + return fd; + } + private: + int fd_; +}; + +// +// MmapWrapper +// +// Wrapper class to make sure mapped regions are unmapped. +// +class MmapWrapper { + public: + MmapWrapper() : is_set_(false) {} + ~MmapWrapper() { + assert(is_set_); + if (base_ != NULL) { + assert(size_ > 0); + munmap(base_, size_); + } + } + void set(void *mapped_address, size_t mapped_size) { + is_set_ = true; + base_ = mapped_address; + size_ = mapped_size; + } + void release() { + assert(is_set_); + base_ = NULL; + size_ = 0; + } + + private: + bool is_set_; + void *base_; + size_t size_; +}; + + // Fix offset into virtual address by adding the mapped base into offsets. // Make life easier when want to find something by offset. static void FixAddress(void *obj_base) { @@ -111,15 +172,22 @@ static const ElfW(Shdr) *FindSectionByName(const char *name, // Find the end of the section name section, to make sure that // comparisons don't run off the end of the section. - const char *names_end = + const char *names_end = reinterpret_cast(section_names->sh_offset + section_names->sh_size); for (int i = 0; i < nsection; ++i) { const char *section_name = reinterpret_cast(section_names->sh_offset + sections[i].sh_name); if (names_end - section_name >= name_len + 1 && - strcmp(name, section_name) == 0) + strcmp(name, section_name) == 0) { + if (sections[i].sh_type == SHT_NOBITS) { + fprintf(stderr, + "Section %s found, but ignored because type=SHT_NOBITS.\n", + name); + return NULL; + } return sections + i; + } } return NULL; } @@ -127,18 +195,8 @@ static const ElfW(Shdr) *FindSectionByName(const char *name, static bool LoadStabs(const ElfW(Ehdr) *elf_header, const ElfW(Shdr) *stab_section, const ElfW(Shdr) *stabstr_section, + const bool big_endian, Module *module) { - // Figure out what endianness this file is. - bool big_endian; - if (elf_header->e_ident[EI_DATA] == ELFDATA2LSB) - big_endian = false; - else if (elf_header->e_ident[EI_DATA] == ELFDATA2MSB) - big_endian = true; - else { - fprintf(stderr, "bad data encoding in ELF header: %d\n", - elf_header->e_ident[EI_DATA]); - return false; - } // A callback object to handle data from the STABS reader. StabsToModule handler(module); // Find the addresses of the STABS data, and create a STABS reader object. @@ -163,7 +221,7 @@ static bool LoadStabs(const ElfW(Ehdr) *elf_header, class DumperLineToModule: public DwarfCUToModule::LineToModuleFunctor { public: // Create a line-to-module converter using BYTE_READER. - DumperLineToModule(dwarf2reader::ByteReader *byte_reader) + explicit DumperLineToModule(dwarf2reader::ByteReader *byte_reader) : byte_reader_(byte_reader) { } void operator()(const char *program, uint64 length, Module *module, vector *lines) { @@ -177,18 +235,10 @@ class DumperLineToModule: public DwarfCUToModule::LineToModuleFunctor { static bool LoadDwarf(const string &dwarf_filename, const ElfW(Ehdr) *elf_header, + const bool big_endian, Module *module) { - // Figure out what endianness this file is. - dwarf2reader::Endianness endianness; - if (elf_header->e_ident[EI_DATA] == ELFDATA2LSB) - endianness = dwarf2reader::ENDIANNESS_LITTLE; - else if (elf_header->e_ident[EI_DATA] == ELFDATA2MSB) - endianness = dwarf2reader::ENDIANNESS_BIG; - else { - fprintf(stderr, "%s: bad data encoding in ELF header: %d\n", - dwarf_filename.c_str(), elf_header->e_ident[EI_DATA]); - return false; - } + const dwarf2reader::Endianness endianness = big_endian ? + dwarf2reader::ENDIANNESS_BIG : dwarf2reader::ENDIANNESS_LITTLE; dwarf2reader::ByteReader byte_reader(endianness); // Construct a context for this file. @@ -260,9 +310,10 @@ static bool LoadDwarfCFI(const string &dwarf_filename, const ElfW(Ehdr) *elf_header, const char *section_name, const ElfW(Shdr) *section, - bool eh_frame, + const bool eh_frame, const ElfW(Shdr) *got_section, const ElfW(Shdr) *text_section, + const bool big_endian, Module *module) { // Find the appropriate set of register names for this file's // architecture. @@ -274,17 +325,8 @@ static bool LoadDwarfCFI(const string &dwarf_filename, return false; } - // Figure out what endianness this file is. - dwarf2reader::Endianness endianness; - if (elf_header->e_ident[EI_DATA] == ELFDATA2LSB) - endianness = dwarf2reader::ENDIANNESS_LITTLE; - else if (elf_header->e_ident[EI_DATA] == ELFDATA2MSB) - endianness = dwarf2reader::ENDIANNESS_BIG; - else { - fprintf(stderr, "%s: bad data encoding in ELF header: %d\n", - dwarf_filename.c_str(), elf_header->e_ident[EI_DATA]); - return false; - } + const dwarf2reader::Endianness endianness = big_endian ? + dwarf2reader::ENDIANNESS_BIG : dwarf2reader::ENDIANNESS_LITTLE; // Find the call frame information and its size. const char *cfi = reinterpret_cast(section->sh_offset); @@ -313,7 +355,7 @@ static bool LoadDwarfCFI(const string &dwarf_filename, byte_reader.SetDataBase(got_section->sh_addr); if (text_section) byte_reader.SetTextBase(text_section->sh_addr); - + dwarf2reader::CallFrameInfo::Reporter dwarf_reporter(dwarf_filename, section_name); dwarf2reader::CallFrameInfo parser(cfi, cfi_size, @@ -323,7 +365,159 @@ static bool LoadDwarfCFI(const string &dwarf_filename, return true; } -static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, +bool LoadELF(const std::string &obj_file, MmapWrapper* map_wrapper, + ElfW(Ehdr) **elf_header) { + int obj_fd = open(obj_file.c_str(), O_RDONLY); + if (obj_fd < 0) { + fprintf(stderr, "Failed to open ELF file '%s': %s\n", + obj_file.c_str(), strerror(errno)); + return false; + } + FDWrapper obj_fd_wrapper(obj_fd); + struct stat st; + if (fstat(obj_fd, &st) != 0 && st.st_size <= 0) { + fprintf(stderr, "Unable to fstat ELF file '%s': %s\n", + obj_file.c_str(), strerror(errno)); + return false; + } + void *obj_base = mmap(NULL, st.st_size, + PROT_READ | PROT_WRITE, MAP_PRIVATE, obj_fd, 0); + if (obj_base == MAP_FAILED) { + fprintf(stderr, "Failed to mmap ELF file '%s': %s\n", + obj_file.c_str(), strerror(errno)); + return false; + } + map_wrapper->set(obj_base, st.st_size); + *elf_header = reinterpret_cast(obj_base); + if (!IsValidElf(*elf_header)) { + fprintf(stderr, "Not a valid ELF file: %s\n", obj_file.c_str()); + return false; + } + return true; +} + +// Get the endianness of ELF_HEADER. If it's invalid, return false. +bool ElfEndianness(const ElfW(Ehdr) *elf_header, bool *big_endian) { + if (elf_header->e_ident[EI_DATA] == ELFDATA2LSB) { + *big_endian = false; + return true; + } + if (elf_header->e_ident[EI_DATA] == ELFDATA2MSB) { + *big_endian = true; + return true; + } + + fprintf(stderr, "bad data encoding in ELF header: %d\n", + elf_header->e_ident[EI_DATA]); + return false; +} + +// Read the .gnu_debuglink and get the debug file name. If anything goes +// wrong, return an empty string. +static std::string ReadDebugLink(const ElfW(Shdr) *debuglink_section, + const std::string &obj_file, + const std::string &debug_dir) { + char *debuglink = reinterpret_cast(debuglink_section->sh_offset); + size_t debuglink_len = strlen(debuglink) + 5; // '\0' + CRC32. + debuglink_len = 4 * ((debuglink_len + 3) / 4); // Round to nearest 4 bytes. + + // Sanity check. + if (debuglink_len != debuglink_section->sh_size) { + fprintf(stderr, "Mismatched .gnu_debuglink string / section size: " + "%zx %zx\n", debuglink_len, debuglink_section->sh_size); + return ""; + } + + std::string debuglink_path = debug_dir + "/" + debuglink; + int debuglink_fd = open(debuglink_path.c_str(), O_RDONLY); + if (debuglink_fd < 0) { + fprintf(stderr, "Failed to open debug ELF file '%s' for '%s': %s\n", + debuglink_path.c_str(), obj_file.c_str(), strerror(errno)); + return ""; + } + FDWrapper debuglink_fd_wrapper(debuglink_fd); + // TODO(thestig) check the CRC-32 at the end of the .gnu_debuglink + // section. + + return debuglink_path; +} + +// +// LoadSymbolsInfo +// +// Holds the state between the two calls to LoadSymbols() in case we have to +// follow the .gnu_debuglink section and load debug information from a +// different file. +// +class LoadSymbolsInfo { + public: + explicit LoadSymbolsInfo(const std::string &dbg_dir) : + debug_dir_(dbg_dir), + has_loading_addr_(false) {} + + // Keeps track of which sections have been loaded so we don't accidentally + // load it twice from two different files. + void LoadedSection(const std::string §ion) { + if (loaded_sections_.count(section) == 0) { + loaded_sections_.insert(section); + } else { + fprintf(stderr, "Section %s has already been loaded.\n", + section.c_str()); + } + } + + // We expect the ELF file and linked debug file to have the same prefered + // loading address. + void set_loading_addr(ElfW(Addr) addr, const std::string &filename) { + if (!has_loading_addr_) { + loading_addr_ = addr; + loaded_file_ = filename; + return; + } + + if (addr != loading_addr_) { + fprintf(stderr, + "ELF file '%s' and debug ELF file '%s' " + "have different load addresses.\n", + loaded_file_.c_str(), filename.c_str()); + assert(false); + } + } + + // Setters and getters + const std::string &debug_dir() const { + return debug_dir_; + } + + std::string debuglink_file() const { + return debuglink_file_; + } + void set_debuglink_file(std::string file) { + debuglink_file_ = file; + } + + private: + const std::string &debug_dir_; // Directory with the debug ELF file. + + std::string debuglink_file_; // Full path to the debug ELF file. + + bool has_loading_addr_; // Indicate if LOADING_ADDR_ is valid. + + ElfW(Addr) loading_addr_; // Saves the prefered loading address from the + // first call to LoadSymbols(). + + std::string loaded_file_; // Name of the file loaded from the first call to + // LoadSymbols(). + + std::set loaded_sections_; // Tracks the Loaded ELF sections + // between calls to LoadSymbols(). +}; + +static bool LoadSymbols(const std::string &obj_file, + const bool big_endian, + ElfW(Ehdr) *elf_header, + const bool read_gnu_debug_link, + LoadSymbolsInfo *info, Module *module) { // Translate all offsets in section headers into address. FixAddress(elf_header); @@ -331,6 +525,7 @@ static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, reinterpret_cast(elf_header->e_phoff), elf_header->e_phnum); module->SetLoadAddress(loading_addr); + info->set_loading_addr(loading_addr, obj_file); const ElfW(Shdr) *sections = reinterpret_cast(elf_header->e_shoff); @@ -345,9 +540,12 @@ static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, const ElfW(Shdr) *stabstr_section = stab_section->sh_link + sections; if (stabstr_section) { found_debug_info_section = true; - if (!LoadStabs(elf_header, stab_section, stabstr_section, module)) + info->LoadedSection(".stab"); + if (!LoadStabs(elf_header, stab_section, stabstr_section, big_endian, + module)) { fprintf(stderr, "%s: \".stab\" section found, but failed to load STABS" " debugging information\n", obj_file.c_str()); + } } } @@ -357,7 +555,8 @@ static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, elf_header->e_shnum); if (dwarf_section) { found_debug_info_section = true; - if (!LoadDwarf(obj_file, elf_header, module)) + info->LoadedSection(".debug_info"); + if (!LoadDwarf(obj_file, elf_header, big_endian, module)) fprintf(stderr, "%s: \".debug_info\" section found, but failed to load " "DWARF debugging information\n", obj_file.c_str()); } @@ -371,8 +570,9 @@ static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, // Ignore the return value of this function; even without call frame // information, the other debugging information could be perfectly // useful. + info->LoadedSection(".debug_frame"); LoadDwarfCFI(obj_file, elf_header, ".debug_frame", - dwarf_cfi_section, false, 0, 0, module); + dwarf_cfi_section, false, 0, 0, big_endian, module); } // Linux C++ exception handling information can also provide @@ -388,72 +588,42 @@ static bool LoadSymbols(const std::string &obj_file, ElfW(Ehdr) *elf_header, const ElfW(Shdr) *text_section = FindSectionByName(".text", sections, section_names, elf_header->e_shnum); + info->LoadedSection(".eh_frame"); // As above, ignore the return value of this function. - LoadDwarfCFI(obj_file, elf_header, ".eh_frame", - eh_frame_section, true, got_section, text_section, module); + LoadDwarfCFI(obj_file, elf_header, ".eh_frame", eh_frame_section, true, + got_section, text_section, big_endian, module); } if (!found_debug_info_section) { fprintf(stderr, "%s: file contains no debugging information" " (no \".stab\" or \".debug_info\" sections)\n", obj_file.c_str()); + + // Failed, but maybe we can find a .gnu_debuglink section? + if (read_gnu_debug_link) { + const ElfW(Shdr) *gnu_debuglink_section + = FindSectionByName(".gnu_debuglink", sections, section_names, + elf_header->e_shnum); + if (gnu_debuglink_section) { + if (!info->debug_dir().empty()) { + std::string debuglink_file = + ReadDebugLink(gnu_debuglink_section, obj_file, info->debug_dir()); + info->set_debuglink_file(debuglink_file); + } else { + fprintf(stderr, ".gnu_debuglink section found in '%s', " + "but no debug path specified.\n", obj_file.c_str()); + } + } else { + fprintf(stderr, "%s does not contain a .gnu_debuglink section.\n", + obj_file.c_str()); + } + } return false; } + return true; } -// -// FDWrapper -// -// Wrapper class to make sure opened file is closed. -// -class FDWrapper { - public: - explicit FDWrapper(int fd) : - fd_(fd) { - } - ~FDWrapper() { - if (fd_ != -1) - close(fd_); - } - int get() { - return fd_; - } - int release() { - int fd = fd_; - fd_ = -1; - return fd; - } - private: - int fd_; -}; - -// -// MmapWrapper -// -// Wrapper class to make sure mapped regions are unmapped. -// -class MmapWrapper { - public: - MmapWrapper(void *mapped_address, size_t mapped_size) : - base_(mapped_address), size_(mapped_size) { - } - ~MmapWrapper() { - if (base_ != NULL) { - assert(size_ > 0); - munmap(base_, size_); - } - } - void release() { - base_ = NULL; - size_ = 0; - } - - private: - void *base_; - size_t size_; -}; - // Return the breakpad symbol file identifier for the architecture of // ELF_HEADER. const char *ElfArchitecture(const ElfW(Ehdr) *elf_header) { @@ -506,37 +676,16 @@ std::string BaseFileName(const std::string &filename) { namespace google_breakpad { -bool WriteSymbolFile(const std::string &obj_file, FILE *sym_file) { - int obj_fd = open(obj_file.c_str(), O_RDONLY); - if (obj_fd < 0) { - fprintf(stderr, "Failed to open ELF file '%s': %s\n", - obj_file.c_str(), strerror(errno)); +bool WriteSymbolFile(const std::string &obj_file, + const std::string &debug_dir, FILE *sym_file) { + MmapWrapper map_wrapper; + ElfW(Ehdr) *elf_header = NULL; + if (!LoadELF(obj_file, &map_wrapper, &elf_header)) return false; - } - FDWrapper obj_fd_wrapper(obj_fd); - struct stat st; - if (fstat(obj_fd, &st) != 0 && st.st_size <= 0) { - fprintf(stderr, "Unable to fstat ELF file '%s': %s\n", - obj_file.c_str(), strerror(errno)); - return false; - } - void *obj_base = mmap(NULL, st.st_size, - PROT_READ | PROT_WRITE, MAP_PRIVATE, obj_fd, 0); - if (obj_base == MAP_FAILED) { - fprintf(stderr, "Failed to mmap ELF file '%s': %s\n", - obj_file.c_str(), strerror(errno)); - return false; - } - MmapWrapper map_wrapper(obj_base, st.st_size); - ElfW(Ehdr) *elf_header = reinterpret_cast(obj_base); - if (!IsValidElf(elf_header)) { - fprintf(stderr, "Not a valid ELF file: %s\n", obj_file.c_str()); - return false; - } unsigned char identifier[16]; google_breakpad::FileID file_id(obj_file.c_str()); - if (!file_id.ElfFileIdentifier(identifier)) { + if (!file_id.ElfFileIdentifierFromMappedFile(elf_header, identifier)) { fprintf(stderr, "%s: unable to generate file identifier\n", obj_file.c_str()); return false; @@ -549,13 +698,57 @@ bool WriteSymbolFile(const std::string &obj_file, FILE *sym_file) { return false; } + // Figure out what endianness this file is. + bool big_endian; + if (!ElfEndianness(elf_header, &big_endian)) + return false; + std::string name = BaseFileName(obj_file); std::string os = "Linux"; std::string id = FormatIdentifier(identifier); + LoadSymbolsInfo info(debug_dir); Module module(name, os, architecture, id); - if (!LoadSymbols(obj_file, elf_header, &module)) - return false; + if (!LoadSymbols(obj_file, big_endian, elf_header, true, &info, &module)) { + const std::string debuglink_file = info.debuglink_file(); + if (debuglink_file.empty()) + return false; + + // Load debuglink ELF file. + fprintf(stderr, "Found debugging info in %s\n", debuglink_file.c_str()); + MmapWrapper debug_map_wrapper; + ElfW(Ehdr) *debug_elf_header = NULL; + if (!LoadELF(debuglink_file, &debug_map_wrapper, &debug_elf_header)) + return false; + // Sanity checks to make sure everything matches up. + const char *debug_architecture = ElfArchitecture(debug_elf_header); + if (!debug_architecture) { + fprintf(stderr, "%s: unrecognized ELF machine architecture: %d\n", + debuglink_file.c_str(), debug_elf_header->e_machine); + return false; + } + if (strcmp(architecture, debug_architecture)) { + fprintf(stderr, "%s with ELF machine architecture %s does not match " + "%s with ELF architecture %s\n", + debuglink_file.c_str(), debug_architecture, + obj_file.c_str(), architecture); + return false; + } + + bool debug_big_endian; + if (!ElfEndianness(debug_elf_header, &debug_big_endian)) + return false; + if (debug_big_endian != big_endian) { + fprintf(stderr, "%s and %s does not match in endianness\n", + obj_file.c_str(), debuglink_file.c_str()); + return false; + } + + if (!LoadSymbols(debuglink_file, debug_big_endian, debug_elf_header, + false, &info, &module)) { + return false; + } + } if (!module.Write(sym_file)) return false; diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h index 5422b1c8f7cb..e1a930aca270 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.h @@ -44,7 +44,10 @@ namespace google_breakpad { // Find all the debugging information in OBJ_FILE, an ELF executable // or shared library, and write it to SYM_FILE in the Breakpad symbol // file format. -bool WriteSymbolFile(const std::string &obj_file, FILE *sym_file); +// If OBJ_FILE has been stripped but contains a .gnu_debuglink section, +// then look for the debug file in DEBUG_DIR. +bool WriteSymbolFile(const std::string &obj_file, + const std::string &debug_dir, FILE *sym_file); } // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/memory.h b/toolkit/crashreporter/google-breakpad/src/common/linux/memory.h index f10a194b47a0..725ed8b30c31 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/memory.h +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/memory.h @@ -148,6 +148,24 @@ class wasteful_vector { return used_; } + void resize(unsigned sz, T c = T()) { + // No need to test "sz >= 0", as "sz" is unsigned. + if (sz <= used_) { + used_ = sz; + } else { + unsigned a = allocated_; + if (sz > a) { + while (sz > a) { + a *= 2; + } + Realloc(a); + } + while (sz > used_) { + a_[used_++] = c; + } + } + } + T& operator[](size_t index) { return a_[index]; } diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Breakpad.xcconfig b/toolkit/crashreporter/google-breakpad/src/common/mac/Breakpad.xcconfig new file mode 100644 index 000000000000..3062bbacd2e6 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Breakpad.xcconfig @@ -0,0 +1,57 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. + +ARCHS = $(ARCHS_STANDARD_32_64_BIT) +SDKROOT = macosx10.5 +SDKROOT[arch=i386] = macosx10.4 +SDKROOT[arch=ppc] = macosx10.4 + +GCC_VERSION = 4.2 +GCC_VERSION[sdk=macosx10.4][arch=*] = 4.0 + +GCC_C_LANGUAGE_STANDARD = c99 + +GCC_WARN_CHECK_SWITCH_STATEMENTS = YES +// TODO(nealsid): Get the code so we can turn on the 64_TO_32 warning. +GCC_WARN_64_TO_32_BIT_CONVERSION = NO +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_MISSING_PARENTHESES = YES +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES +GCC_WARN_SIGN_COMPARE = YES +GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNKNOWN_PRAGMAS = YES +GCC_WARN_UNUSED_VARIABLE = YES +GCC_TREAT_WARNINGS_AS_ERRORS = YES + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym + +ALWAYS_SEARCH_USER_PATHS = NO diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadDebug.xcconfig b/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadDebug.xcconfig new file mode 100644 index 000000000000..94cdd8cfca8b --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadDebug.xcconfig @@ -0,0 +1,32 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. + +#include "Breakpad.xcconfig" + +GCC_OPTIMIZATION_LEVEL = 0 diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadRelease.xcconfig b/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadRelease.xcconfig new file mode 100644 index 000000000000..af209a423cec --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/BreakpadRelease.xcconfig @@ -0,0 +1,33 @@ +// Copyright (c) 2010, Google Inc. +// 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 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. + +#include "Breakpad.xcconfig" + +GCC_OPTIMIZATION_LEVEL = s +GCC_WARN_UNINITIALIZED_AUTOS = YES diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/HTTPMultipartUpload.m b/toolkit/crashreporter/google-breakpad/src/common/mac/HTTPMultipartUpload.m index dd3612d86fc0..eee66a9c9402 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/HTTPMultipartUpload.m +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/HTTPMultipartUpload.m @@ -28,6 +28,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #import "HTTPMultipartUpload.h" +#import "GTMDefines.h" @interface HTTPMultipartUpload(PrivateMethods) - (NSString *)multipartBoundary; @@ -148,7 +149,6 @@ timeoutInterval:10.0 ]; NSMutableData *postBody = [NSMutableData data]; - int i, count; [req setValue:[NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary_] forHTTPHeaderField:@"Content-type"]; @@ -157,8 +157,8 @@ NSArray *parameterKeys = [parameters_ allKeys]; NSString *key; - count = [parameterKeys count]; - for (i = 0; i < count; ++i) { + NSInteger count = [parameterKeys count]; + for (NSInteger i = 0; i < count; ++i) { key = [parameterKeys objectAtIndex:i]; [postBody appendData:[self formDataForKey:key value:[parameters_ objectForKey:key]]]; @@ -167,7 +167,7 @@ // Add any files to the message NSArray *fileNames = [files_ allKeys]; count = [fileNames count]; - for (i = 0; i < count; ++i) { + for (NSInteger i = 0; i < count; ++i) { NSString *name = [fileNames objectAtIndex:i]; id fileOrData = [files_ objectForKey:name]; NSData *fileData; diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h b/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h index 89924123f627..2213fc6bf541 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.h @@ -94,6 +94,7 @@ // kern_return_t result = sender.SendMessage(message, 1000); // timeout 1000ms // +namespace google_breakpad { #define PRINT_MACH_RESULT(result_, message_) \ printf(message_" %s (%d)\n", mach_error_string(result_), result_ ); @@ -224,7 +225,7 @@ class MachMessage { void SetDescriptor(int n, const MachMsgPortDescriptor &desc); // Returns total message size setting msgh_size in the header to this value - int CalculateSize(); + mach_msg_size_t CalculateSize(); mach_msg_header_t head; mach_msg_body_t body; @@ -255,11 +256,11 @@ class MachSendMessage : public MachMessage { class ReceivePort { public: // Creates a new mach port for receiving messages and registers a name for it - ReceivePort(const char *receive_port_name); + explicit ReceivePort(const char *receive_port_name); // Given an already existing mach port, use it. We take ownership of the // port and deallocate it in our destructor. - ReceivePort(mach_port_t receive_port); + explicit ReceivePort(mach_port_t receive_port); // Create a new mach port for receiving messages ReceivePort(); @@ -285,11 +286,11 @@ class ReceivePort { class MachPortSender { public: // get a port with send rights corresponding to a named registered service - MachPortSender(const char *receive_port_name); + explicit MachPortSender(const char *receive_port_name); // Given an already existing mach port, use it. - MachPortSender(mach_port_t send_port); + explicit MachPortSender(mach_port_t send_port); kern_return_t SendMessage(MachSendMessage &message, mach_msg_timeout_t timeout); @@ -301,4 +302,6 @@ class MachPortSender { kern_return_t init_result_; }; +} // namespace google_breakpad + #endif // MACH_IPC_H__ diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.mm b/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.mm index 9e521e48ec01..4f58c02d6864 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.mm +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/MachIPC.mm @@ -33,6 +33,7 @@ #import #import "MachIPC.h" +namespace google_breakpad { //============================================================================== MachSendMessage::MachSendMessage(int32_t message_id) : MachMessage() { head.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0); @@ -53,10 +54,10 @@ MachSendMessage::MachSendMessage(int32_t message_id) : MachMessage() { bool MachMessage::SetData(void *data, int32_t data_length) { // first check to make sure we have enough space - int size = CalculateSize(); - int new_size = size + data_length; + size_t size = CalculateSize(); + size_t new_size = size + data_length; - if ((unsigned)new_size > sizeof(MachMessage)) { + if (new_size > sizeof(MachMessage)) { return false; // not enough space } @@ -72,8 +73,8 @@ bool MachMessage::SetData(void *data, // calculates and returns the total size of the message // Currently, the entire message MUST fit inside of the MachMessage // messsage size <= sizeof(MachMessage) -int MachMessage::CalculateSize() { - int size = sizeof(mach_msg_header_t) + sizeof(mach_msg_body_t); +mach_msg_size_t MachMessage::CalculateSize() { + size_t size = sizeof(mach_msg_header_t) + sizeof(mach_msg_body_t); // add space for MessageDataPacket int32_t alignedDataLength = (GetDataLength() + 3) & ~0x3; @@ -82,14 +83,14 @@ int MachMessage::CalculateSize() { // add space for descriptors size += GetDescriptorCount() * sizeof(MachMsgPortDescriptor); - head.msgh_size = size; + head.msgh_size = static_cast(size); - return size; + return head.msgh_size; } //============================================================================== MachMessage::MessageDataPacket *MachMessage::GetDataPacket() { - int desc_size = sizeof(MachMsgPortDescriptor)*GetDescriptorCount(); + size_t desc_size = sizeof(MachMsgPortDescriptor)*GetDescriptorCount(); MessageDataPacket *packet = reinterpret_cast(padding + desc_size); @@ -109,9 +110,9 @@ void MachMessage::SetDescriptor(int n, bool MachMessage::AddDescriptor(const MachMsgPortDescriptor &desc) { // first check to make sure we have enough space int size = CalculateSize(); - int new_size = size + sizeof(MachMsgPortDescriptor); + size_t new_size = size + sizeof(MachMsgPortDescriptor); - if ((unsigned)new_size > sizeof(MachMessage)) { + if (new_size > sizeof(MachMessage)) { return false; // not enough space } @@ -180,8 +181,8 @@ ReceivePort::ReceivePort(const char *receive_port_name) { if (init_result_ != KERN_SUCCESS) return; - mach_port_t bootstrap_port = 0; - init_result_ = task_get_bootstrap_port(current_task, &bootstrap_port); + mach_port_t task_bootstrap_port = 0; + init_result_ = task_get_bootstrap_port(current_task, &task_bootstrap_port); if (init_result_ != KERN_SUCCESS) return; @@ -240,8 +241,11 @@ kern_return_t ReceivePort::WaitForMessage(MachReceiveMessage *out_message, out_message->head.msgh_reserved = 0; out_message->head.msgh_id = 0; + mach_msg_option_t options = MACH_RCV_MSG; + if (timeout != MACH_MSG_TIMEOUT_NONE) + options |= MACH_RCV_TIMEOUT; kern_return_t result = mach_msg(&out_message->head, - MACH_RCV_MSG | MACH_RCV_TIMEOUT, + options, 0, sizeof(MachMessage), port_, @@ -256,13 +260,14 @@ kern_return_t ReceivePort::WaitForMessage(MachReceiveMessage *out_message, //============================================================================== // get a port with send rights corresponding to a named registered service MachPortSender::MachPortSender(const char *receive_port_name) { - mach_port_t bootstrap_port = 0; - init_result_ = task_get_bootstrap_port(mach_task_self(), &bootstrap_port); + mach_port_t task_bootstrap_port = 0; + init_result_ = task_get_bootstrap_port(mach_task_self(), + &task_bootstrap_port); if (init_result_ != KERN_SUCCESS) return; - init_result_ = bootstrap_look_up(bootstrap_port, + init_result_ = bootstrap_look_up(task_bootstrap_port, const_cast(receive_port_name), &send_port_); } @@ -295,3 +300,5 @@ kern_return_t MachPortSender::SendMessage(MachSendMessage &message, return result; } + +} // namespace google_breakpad diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.h b/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.h index f2bee65745b2..fbf11c783fec 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.h +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.h @@ -83,7 +83,17 @@ class DumpSymbols { // object file, then the dumper will dump the object file whose // architecture matches that of this dumper program. bool SetArchitecture(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype); - + + // If this dumper's file includes an object file for |arch_name|, then select + // that object file for dumping, and return true. Otherwise, return false, + // and leave this dumper's selected architecture unchanged. + // + // By default, if this dumper's file contains only one object file, then + // the dumper will dump those symbols; and if it contains more than one + // object file, then the dumper will dump the object file whose + // architecture matches that of this dumper program. + bool SetArchitecture(const std::string &arch_name); + // Return a pointer to an array of 'struct fat_arch' structures, // describing the object files contained in this dumper's file. Set // *|count| to the number of elements in the array. The returned array is diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.mm b/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.mm index ab2f2b9e7725..cc2efe17378a 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.mm +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/dump_syms.mm @@ -54,6 +54,10 @@ #include "common/stabs_reader.h" #include "common/stabs_to_module.h" +#ifndef CPU_TYPE_ARM +#define CPU_TYPE_ARM (static_cast(12)) +#endif // CPU_TYPE_ARM + using dwarf2reader::ByteReader; using google_breakpad::DwarfCUToModule; using google_breakpad::DwarfLineToModule; @@ -176,7 +180,7 @@ bool DumpSymbols::SetArchitecture(cpu_type_t cpu_type, // Find the best match for the architecture the user requested. const struct fat_arch *best_match = NXFindBestFatArch(cpu_type, cpu_subtype, &object_files_[0], - object_files_.size()); + static_cast(object_files_.size())); if (!best_match) return false; // Record the selected object file. @@ -184,6 +188,15 @@ bool DumpSymbols::SetArchitecture(cpu_type_t cpu_type, return true; } +bool DumpSymbols::SetArchitecture(const std::string &arch_name) { + bool arch_set = false; + const NXArchInfo *arch_info = NXGetArchInfoFromName(arch_name.c_str()); + if (arch_info) { + arch_set = SetArchitecture(arch_info->cputype, arch_info->cpusubtype); + } + return arch_set; +} + string DumpSymbols::Identifier() { FileID file_id([object_filename_ fileSystemRepresentation]); unsigned char identifier_bytes[16]; @@ -436,12 +449,16 @@ bool DumpSymbols::WriteSymbolFile(FILE *stream) { = NXGetArchInfoFromCpuType(selected_object_file_->cputype, selected_object_file_->cpusubtype); + const char *selected_arch_name = selected_arch_info->name; + if (strcmp(selected_arch_name, "i386") == 0) + selected_arch_name = "x86"; + // Produce a name to use in error messages that includes the // filename, and the architecture, if there is more than one. selected_object_name_ = [object_filename_ UTF8String]; if (object_files_.size() > 1) { selected_object_name_ += ", architecture "; - selected_object_name_ + selected_arch_info->name; + selected_object_name_ + selected_arch_name; } // Compute a module name, to appear in the MODULE record. @@ -454,7 +471,7 @@ bool DumpSymbols::WriteSymbolFile(FILE *stream) { identifier += "0"; // Create a module to hold the debugging information. - Module module([module_name UTF8String], "mac", selected_arch_info->name, + Module module([module_name UTF8String], "mac", selected_arch_name, identifier); // Parse the selected object file. diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc index 160f6ed75107..486cf53625a1 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.cc @@ -53,7 +53,12 @@ extern "C" { // necessary for Leopard namespace MacFileUtilities { -MachoID::MachoID(const char *path) { +MachoID::MachoID(const char *path) + : file_(0), + crc_(0), + md5_context_(), + sha1_context_(), + update_function_(NULL) { strlcpy(path_, path, sizeof(path_)); file_ = open(path, O_RDONLY); } @@ -119,7 +124,7 @@ void MachoID::UpdateSHA1(unsigned char *bytes, size_t size) { SHA_Update(&sha1_context_, bytes, size); } -void MachoID::Update(MachoWalker *walker, unsigned long offset, size_t size) { +void MachoID::Update(MachoWalker *walker, off_t offset, size_t size) { if (!update_function_ || !size) return; @@ -182,7 +187,7 @@ bool MachoID::IDCommand(int cpu_type, unsigned char identifier[16]) { identifier[2] = 0; identifier[3] = 0; - for (int j = 0, i = strlen(path_)-1; i >= 0 && path_[i]!='/'; ++j, --i) { + for (int j = 0, i = (int)strlen(path_)-1; i>=0 && path_[i]!='/'; ++j, --i) { identifier[j%4] += path_[i]; } @@ -313,7 +318,9 @@ bool MachoID::WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset, // sections of type S_ZEROFILL are "virtual" and contain no data // in the file itself if ((sec64.flags & SECTION_TYPE) != S_ZEROFILL && sec64.offset != 0) - macho_id->Update(walker, header_offset + sec64.offset, sec64.size); + macho_id->Update(walker, + header_offset + sec64.offset, + (size_t)sec64.size); offset += sizeof(struct section_64); } diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h index 039bba3889aa..ea01a6d7a97d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_id.h @@ -86,7 +86,7 @@ class MachoID { void UpdateSHA1(unsigned char *bytes, size_t size); // Bottleneck for update routines - void Update(MachoWalker *walker, unsigned long offset, size_t size); + void Update(MachoWalker *walker, off_t offset, size_t size); // The callback from the MachoWalker for CRC, MD5, and SHA1 static bool WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset, diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader.cc index 53da18073664..ff16bc61743b 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader.cc @@ -130,7 +130,7 @@ bool FatReader::Read(const uint8_t *buffer, size_t size) { } object_files_[0].offset = 0; - object_files_[0].size = buffer_.Size(); + object_files_[0].size = static_cast(buffer_.Size()); // This alignment is correct for 32 and 64-bit x86 and ppc. // See get_align in the lipo source for other architectures: // http://www.opensource.apple.com/source/cctools/cctools-773/misc/lipo.c diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader_unittest.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader_unittest.cc index 4e478d79c0b0..9bc6d25a5c4d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_reader_unittest.cc @@ -992,7 +992,7 @@ TEST_F(LoadCommand, None) { EXPECT_FALSE(reader.big_endian()); EXPECT_EQ(CPU_TYPE_X86, reader.cpu_type()); EXPECT_EQ(CPU_SUBTYPE_I386_ALL, reader.cpu_subtype()); - EXPECT_EQ(MH_EXECUTE, reader.file_type()); + EXPECT_EQ(static_cast(MH_EXECUTE), reader.file_type()); EXPECT_EQ(FileFlags(MH_TWOLEVEL | MH_DYLDLINK | MH_NOUNDEFS), @@ -1018,7 +1018,7 @@ TEST_F(LoadCommand, Unknown) { EXPECT_TRUE(reader.big_endian()); EXPECT_EQ(CPU_TYPE_X86, reader.cpu_type()); EXPECT_EQ(CPU_SUBTYPE_I386_ALL, reader.cpu_subtype()); - EXPECT_EQ(MH_EXECUTE, reader.file_type()); + EXPECT_EQ(static_cast(MH_EXECUTE), reader.file_type()); EXPECT_EQ(FileFlags(MH_TWOLEVEL | MH_DYLDLINK | MH_NOUNDEFS), diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.cc index ecea899774c8..3e8fe211dd3b 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.cc @@ -51,8 +51,12 @@ namespace MacFileUtilities { MachoWalker::MachoWalker(const char *path, LoadCommandCallback callback, void *context) - : callback_(callback), - callback_context_(context) { + : file_(0), + callback_(callback), + callback_context_(context), + current_header_(NULL), + current_header_size_(0), + current_header_offset_(0) { file_ = open(path, O_RDONLY); } @@ -95,7 +99,7 @@ bool MachoWalker::CurrentHeader(struct mach_header_64 *header, off_t *offset) { *offset = current_header_offset_; return true; } - + return false; } @@ -111,7 +115,7 @@ bool MachoWalker::FindHeader(int cpu_type, off_t &offset) { // Figure out what type of file we've got bool is_fat = false; if (magic == FAT_MAGIC || magic == FAT_CIGAM) { - is_fat = true; + is_fat = true; } else if (magic != MH_MAGIC && magic != MH_CIGAM && magic != MH_MAGIC_64 && magic != MH_CIGAM_64) { @@ -174,13 +178,13 @@ bool MachoWalker::WalkHeaderAtOffset(off_t offset) { bool swap = (header.magic == MH_CIGAM); if (swap) swap_mach_header(&header, NXHostByteOrder()); - + // Copy the data into the mach_header_64 structure. Since the 32-bit and // 64-bit only differ in the last field (reserved), this is safe to do. struct mach_header_64 header64; memcpy((void *)&header64, (const void *)&header, sizeof(header)); header64.reserved = 0; - + current_header_ = &header64; current_header_size_ = sizeof(header); // 32-bit, not 64-bit current_header_offset_ = offset; diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.h b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.h index 6445a4f4010a..0d30b5c05fda 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.h +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/macho_walker.h @@ -99,6 +99,10 @@ class MachoWalker { struct mach_header_64 *current_header_; unsigned long current_header_size_; off_t current_header_offset_; + + private: + MachoWalker(const MachoWalker &); + MachoWalker &operator=(const MachoWalker &); }; } // namespace MacFileUtilities diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/scoped_task_suspend-inl.h b/toolkit/crashreporter/google-breakpad/src/common/mac/scoped_task_suspend-inl.h new file mode 100644 index 000000000000..d6d1bef97174 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/scoped_task_suspend-inl.h @@ -0,0 +1,56 @@ +// Copyright (c) 2010 Google Inc. +// 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 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. + +// Inline implementation of ScopedTaskSuspend, which suspends a Mach +// task for the duration of its scope. + +#ifndef GOOGLE_BREAKPAD_COMMON_MAC_SCOPED_TASK_SUSPEND_H_ +#define GOOGLE_BREAKPAD_COMMON_MAC_SCOPED_TASK_SUSPEND_H_ + +#include + +namespace google_breakpad { + +class ScopedTaskSuspend { + public: + explicit ScopedTaskSuspend(mach_port_t target) : target_(target) { + task_suspend(target_); + } + + ~ScopedTaskSuspend() { + task_resume(target_); + } + + private: + mach_port_t target_; +}; + +} // namespace google_breakpad + +#endif // GOOGLE_BREAKPAD_COMMON_MAC_SCOPED_TASK_SUSPEND_H_ diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/string_utilities.cc b/toolkit/crashreporter/google-breakpad/src/common/mac/string_utilities.cc index 5a89be38cbfd..e1f63a98ccde 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/string_utilities.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/string_utilities.cc @@ -58,7 +58,7 @@ unsigned int IntegerValueAtIndex(string &str, unsigned int idx) { size_t start = 0; size_t end; size_t found = 0; - size_t result = 0; + unsigned int result = 0; for (; found <= idx; ++found) { end = str.find_first_not_of(digits, start); diff --git a/toolkit/crashreporter/google-breakpad/src/common/module.cc b/toolkit/crashreporter/google-breakpad/src/common/module.cc index f7f5788e37d3..c980b96fe755 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/module.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/module.cc @@ -49,7 +49,7 @@ Module::Module(const string &name, const string &os, Module::~Module() { for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); it++) delete it->second; - for (vector::iterator it = functions_.begin(); + for (FunctionSet::iterator it = functions_.begin(); it != functions_.end(); it++) delete *it; for (vector::iterator it = stack_frame_entries_.begin(); @@ -62,12 +62,17 @@ void Module::SetLoadAddress(Address address) { } void Module::AddFunction(Function *function) { - functions_.push_back(function); + std::pair ret = functions_.insert(function); + if (!ret.second) { + // Free the duplicate we failed to insert because we own it. + delete function; + } } void Module::AddFunctions(vector::iterator begin, vector::iterator end) { - functions_.insert(functions_.end(), begin, end); + for (vector::iterator it = begin; it != end; it++) + AddFunction(*it); } void Module::AddStackFrameEntry(StackFrameEntry *stack_frame_entry) { @@ -130,7 +135,7 @@ void Module::AssignSourceIds() { // Next, mark all files actually cited by our functions' line number // info, by setting each one's source id to zero. - for (vector::const_iterator func_it = functions_.begin(); + for (FunctionSet::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) { Function *func = *func_it; for (vector::iterator line_it = func->lines.begin(); @@ -145,13 +150,13 @@ void Module::AssignSourceIds() { int next_source_id = 0; for (FileByNameMap::iterator file_it = files_.begin(); file_it != files_.end(); file_it++) - if (! file_it->second->source_id) + if (!file_it->second->source_id) file_it->second->source_id = next_source_id++; } bool Module::ReportError() { fprintf(stderr, "error writing symbol file: %s\n", - strerror (errno)); + strerror(errno)); return false; } @@ -187,7 +192,7 @@ bool Module::Write(FILE *stream) { } // Write out functions and their lines. - for (vector::const_iterator func_it = functions_.begin(); + for (FunctionSet::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) { Function *func = *func_it; if (0 > fprintf(stream, "FUNC %llx %llx %llx %s\n", @@ -217,7 +222,7 @@ bool Module::Write(FILE *stream) { || !WriteRuleMap(entry->initial_rules, stream) || 0 > putc('\n', stream)) return ReportError(); - + // Write out this entry's delta rules as 'STACK CFI' records. for (RuleChangeMap::const_iterator delta_it = entry->rule_changes.begin(); delta_it != entry->rule_changes.end(); delta_it++) { diff --git a/toolkit/crashreporter/google-breakpad/src/common/module.h b/toolkit/crashreporter/google-breakpad/src/common/module.h index 64707f3fd6de..8c20cea01814 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/module.h +++ b/toolkit/crashreporter/google-breakpad/src/common/module.h @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -48,6 +49,7 @@ namespace google_breakpad { +using std::set; using std::string; using std::vector; using std::map; @@ -90,7 +92,7 @@ class Module { // The function's name. string name; - + // The start address and length of the function's code. Address address, size; @@ -124,7 +126,7 @@ class Module { // A map from addresses to RuleMaps, representing changes that take // effect at given addresses. typedef map RuleChangeMap; - + // A range of 'STACK CFI' stack walking information. An instance of // this structure corresponds to a 'STACK CFI INIT' record and the // subsequent 'STACK CFI' records that fall within its range. @@ -143,10 +145,19 @@ class Module { // including the address you're interested in. RuleChangeMap rule_changes; }; - + + struct FunctionCompare { + bool operator() (const Function *lhs, + const Function *rhs) const { + if (lhs->address == rhs->address) + return lhs->name < rhs->name; + return lhs->address < rhs->address; + } + }; + // Create a new module with the given name, operating system, // architecture, and ID string. - Module(const string &name, const string &os, const string &architecture, + Module(const string &name, const string &os, const string &architecture, const string &id); ~Module(); @@ -176,7 +187,7 @@ class Module { vector::iterator end); // Add STACK_FRAME_ENTRY to the module. - // + // // This module owns all StackFrameEntry objects added with this // function: destroying the module destroys them as well. void AddStackFrameEntry(StackFrameEntry *stack_frame_entry); @@ -258,12 +269,13 @@ class Module { // A map from filenames to File structures. The map's keys are // pointers to the Files' names. typedef map FileByNameMap; + typedef set FunctionSet; // The module owns all the files and functions that have been added // to it; destroying the module frees the Files and Functions these // point to. - FileByNameMap files_; // This module's source files. - vector functions_; // This module's functions. + FileByNameMap files_; // This module's source files. + FunctionSet functions_; // This module's functions. // The module owns all the call frame info entries that have been // added to it. diff --git a/toolkit/crashreporter/google-breakpad/src/common/module_unittest.cc b/toolkit/crashreporter/google-breakpad/src/common/module_unittest.cc index 18c8ad61aada..24189944ee2c 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/module_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/module_unittest.cc @@ -49,7 +49,7 @@ using testing::ContainerEq; // Return a FILE * referring to a temporary file that will be deleted // automatically when the stream is closed or the program exits. -FILE *checked_tmpfile() { +static FILE *checked_tmpfile() { FILE *f = tmpfile(); if (!f) { fprintf(stderr, "error creating temporary file: %s\n", strerror(errno)); @@ -60,7 +60,7 @@ FILE *checked_tmpfile() { // Read from STREAM until end of file, and return the contents as a // string. -string checked_read(FILE *stream) { +static string checked_read(FILE *stream) { string contents; int c; while ((c = getc(stream)) != EOF) @@ -74,7 +74,7 @@ string checked_read(FILE *stream) { } // Apply 'fflush' to STREAM, and check for errors. -void checked_fflush(FILE *stream) { +static void checked_fflush(FILE *stream) { if (fflush(stream) == EOF) { fprintf(stderr, "error flushing temporary file stream: %s\n", strerror(errno)); @@ -83,7 +83,7 @@ void checked_fflush(FILE *stream) { } // Apply 'fclose' to STREAM, and check for errors. -void checked_fclose(FILE *stream) { +static void checked_fclose(FILE *stream) { if (fclose(stream) == EOF) { fprintf(stderr, "error closing temporary file stream: %s\n", strerror(errno)); @@ -91,6 +91,19 @@ void checked_fclose(FILE *stream) { } } +static Module::Function *generate_duplicate_function(const string &name) { + const Module::Address DUP_ADDRESS = 0xd35402aac7a7ad5cLL; + const Module::Address DUP_SIZE = 0x200b26e605f99071LL; + const Module::Address DUP_PARAMETER_SIZE = 0xf14ac4fed48c4a99LL; + + Module::Function *function = new(Module::Function); + function->name = name; + function->address = DUP_ADDRESS; + function->size = DUP_SIZE; + function->parameter_size = DUP_PARAMETER_SIZE; + return function; +} + #define MODULE_NAME "name with spaces" #define MODULE_OS "os-name" #define MODULE_ARCH "architecture" @@ -222,7 +235,7 @@ TEST(Write, OmitUnusedFiles) { m.AddFunction(function); m.AssignSourceIds(); - + vector vec; m.GetFiles(&vec); EXPECT_EQ((size_t) 3, vec.size()); @@ -280,10 +293,10 @@ TEST(Construct, AddFunctions) { string contents = checked_read(f); checked_fclose(f); EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n" - "FUNC d35024aa7ca7da5c 200b26e605f99071 f14ac4fed48c4a99" - " _without_form\n" "FUNC 2987743d0b35b13f b369db048deb3010 938e556cb5a79988" - " _and_void\n", + " _and_void\n" + "FUNC d35024aa7ca7da5c 200b26e605f99071 f14ac4fed48c4a99" + " _without_form\n", contents.c_str()); // Check that m.GetFunctions returns the functions we expect. @@ -303,7 +316,7 @@ TEST(Construct, AddFrames) { entry1->address = 0xddb5f41285aa7757ULL; entry1->size = 0x1486493370dc5073ULL; m.AddStackFrameEntry(entry1); - + // Second STACK CFI entry, with initial rules but no deltas. Module::StackFrameEntry *entry2 = new Module::StackFrameEntry(); entry2->address = 0x8064f3af5e067e38ULL; @@ -396,3 +409,49 @@ TEST(Construct, UniqueFiles) { EXPECT_EQ(file1, m.FindExistingFile("foo")); EXPECT_TRUE(m.FindExistingFile("baz") == NULL); } + +TEST(Construct, DuplicateFunctions) { + FILE *f = checked_tmpfile(); + Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID); + + // Two functions. + Module::Function *function1 = generate_duplicate_function("_without_form"); + Module::Function *function2 = generate_duplicate_function("_without_form"); + + m.AddFunction(function1); + m.AddFunction(function2); + + m.Write(f); + checked_fflush(f); + rewind(f); + string contents = checked_read(f); + checked_fclose(f); + EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n" + "FUNC d35402aac7a7ad5c 200b26e605f99071 f14ac4fed48c4a99" + " _without_form\n", + contents.c_str()); +} + +TEST(Construct, FunctionsWithSameAddress) { + FILE *f = checked_tmpfile(); + Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID); + + // Two functions. + Module::Function *function1 = generate_duplicate_function("_without_form"); + Module::Function *function2 = generate_duplicate_function("_and_void"); + + m.AddFunction(function1); + m.AddFunction(function2); + + m.Write(f); + checked_fflush(f); + rewind(f); + string contents = checked_read(f); + checked_fclose(f); + EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n" + "FUNC d35402aac7a7ad5c 200b26e605f99071 f14ac4fed48c4a99" + " _and_void\n" + "FUNC d35402aac7a7ad5c 200b26e605f99071 f14ac4fed48c4a99" + " _without_form\n", + contents.c_str()); +} diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module.cc index fbe4c02f1384..62fcd39e083f 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module.cc @@ -58,7 +58,7 @@ static string Demangle(const string &mangled) { StabsToModule::~StabsToModule() { // Free any functions we've accumulated but not added to the module. - for (vector::iterator func_it = functions_.begin(); + for (vector::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) delete *func_it; // Free any function that we're currently within. @@ -104,16 +104,8 @@ bool StabsToModule::EndFunction(uint64_t address) { assert(current_function_); // Functions in this compilation unit should have address bigger // than the compilation unit's starting address. There may be a lot - // of duplicated entries for functions in the STABS data; only one - // entry can meet this requirement. - // - // (I don't really understand the above comment; just bringing it along - // from the previous code, and leaving the behavior unchanged. GCC marks - // the end of each function with an N_FUN entry with no name, whose value - // is the size of the function; perhaps this test was concerned with - // skipping those. Now StabsReader interprets them properly. If you know - // the whole story, please patch this comment. --jimb) - // + // of duplicated entries for functions in the STABS data. We will + // count on the Module to remove the duplicates. if (current_function_->address >= comp_unit_base_address_) functions_.push_back(current_function_); else @@ -153,12 +145,13 @@ void StabsToModule::Finalize() { // Sort all functions by address, just for neatness. sort(functions_.begin(), functions_.end(), Module::Function::CompareByAddress); - for (vector::iterator func_it = functions_.begin(); + + for (vector::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) { Module::Function *f = *func_it; // Compute the function f's size. - vector::iterator boundary + vector::const_iterator boundary = std::upper_bound(boundaries_.begin(), boundaries_.end(), f->address); if (boundary != boundaries_.end()) f->size = *boundary - f->address; diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module_unittest.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module_unittest.cc index 4248b3c0551b..2c432a3e237d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_to_module_unittest.cc @@ -74,6 +74,38 @@ TEST(StabsToModule, SimpleCU) { EXPECT_EQ(174823314, line->number); } +TEST(StabsToModule, DuplicateFunctionNames) { + Module m("name", "os", "arch", "id"); + StabsToModule h(&m); + + // Compilation unit with one function, mangled name. + EXPECT_TRUE(h.StartCompilationUnit("compilation-unit", 0xf2cfda36ecf7f46cLL, + "build-directory")); + EXPECT_TRUE(h.StartFunction("funcfoo", + 0xf2cfda36ecf7f46dLL)); + EXPECT_TRUE(h.EndFunction(0)); + EXPECT_TRUE(h.StartFunction("funcfoo", + 0xf2cfda36ecf7f46dLL)); + EXPECT_TRUE(h.EndFunction(0)); + EXPECT_TRUE(h.EndCompilationUnit(0)); + + h.Finalize(); + + // Now check to see what has been added to the Module. + Module::File *file = m.FindExistingFile("compilation-unit"); + ASSERT_TRUE(file != NULL); + + vector functions; + m.GetFunctions(&functions, functions.end()); + ASSERT_EQ(1U, functions.size()); + + Module::Function *function = functions[0]; + EXPECT_EQ(0xf2cfda36ecf7f46dLL, function->address); + EXPECT_LT(0U, function->size); // should have used dummy size + EXPECT_EQ(0U, function->parameter_size); + ASSERT_EQ(0U, function->lines.size()); +} + TEST(InferSizes, LineSize) { Module m("name", "os", "arch", "id"); StabsToModule h(&m); @@ -88,7 +120,7 @@ TEST(InferSizes, LineSize) { EXPECT_TRUE(h.EndFunction(0)); // unknown function end address EXPECT_TRUE(h.EndCompilationUnit(0)); // unknown CU end address EXPECT_TRUE(h.StartCompilationUnit("compilation-unit-2", 0xb4523963eff94e92LL, - "build-directory-2")); // next boundary + "build-directory-2")); // next boundary EXPECT_TRUE(h.EndCompilationUnit(0)); h.Finalize(); diff --git a/toolkit/crashreporter/google-breakpad/src/common/string_conversion.cc b/toolkit/crashreporter/google-breakpad/src/common/string_conversion.cc index 50054ebc3b13..5af12f5ac810 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/string_conversion.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/string_conversion.cc @@ -68,7 +68,7 @@ int UTF8ToUTF16Char(const char *in, int in_length, u_int16_t out[2]) { strictConversion); if (result == conversionOK) - return source_ptr - reinterpret_cast(in); + return static_cast(source_ptr - reinterpret_cast(in)); // Add another character to the input stream and try again source_ptr = reinterpret_cast(in); @@ -135,7 +135,7 @@ string UTF16ToUTF8(const vector &in, bool swap) { // The maximum expansion would be 4x the size of the input string. const UTF16 *source_end_ptr = source_ptr + in.size(); - int target_capacity = in.size() * 4; + size_t target_capacity = in.size() * 4; scoped_array target_buffer(new UTF8[target_capacity]); UTF8 *target_ptr = target_buffer.get(); UTF8 *target_end_ptr = target_ptr + target_capacity; @@ -145,8 +145,7 @@ string UTF16ToUTF8(const vector &in, bool swap) { if (result == conversionOK) { const char *targetPtr = reinterpret_cast(target_buffer.get()); - string result(targetPtr); - return result; + return targetPtr; } return ""; diff --git a/toolkit/crashreporter/google-breakpad/src/common/test_assembler.cc b/toolkit/crashreporter/google-breakpad/src/common/test_assembler.cc index 3271176cfa08..7f5dd384a0b3 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/test_assembler.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/test_assembler.cc @@ -96,7 +96,7 @@ u_int64_t Label::operator-(const Label &label) const { } u_int64_t Label::Value() const { - u_int64_t v; + u_int64_t v = 0; ALWAYS_EVALUATE_AND_ASSERT(IsKnownConstant(&v)); return v; }; diff --git a/toolkit/crashreporter/google-breakpad/src/common/test_assembler_unittest.cc b/toolkit/crashreporter/google-breakpad/src/common/test_assembler_unittest.cc index c26a93830fc0..5db1326783a9 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/test_assembler_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/test_assembler_unittest.cc @@ -37,10 +37,10 @@ #include "breakpad_googletest_includes.h" #include "common/test_assembler.h" -using google_breakpad::TestAssembler::Label; -using google_breakpad::TestAssembler::Section; -using google_breakpad::TestAssembler::kBigEndian; -using google_breakpad::TestAssembler::kLittleEndian; +using google_breakpad::test_assembler::Label; +using google_breakpad::test_assembler::Section; +using google_breakpad::test_assembler::kBigEndian; +using google_breakpad::test_assembler::kLittleEndian; using std::string; using testing::Test; diff --git a/toolkit/crashreporter/google-breakpad/src/processor/minidump_unittest.cc b/toolkit/crashreporter/google-breakpad/src/processor/minidump_unittest.cc index afbc4879c1bf..9b459ccc76c9 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/minidump_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/minidump_unittest.cc @@ -61,8 +61,8 @@ using google_breakpad::SynthMinidump::Stream; using google_breakpad::SynthMinidump::String; using google_breakpad::SynthMinidump::SystemInfo; using google_breakpad::SynthMinidump::Thread; -using google_breakpad::TestAssembler::kBigEndian; -using google_breakpad::TestAssembler::kLittleEndian; +using google_breakpad::test_assembler::kBigEndian; +using google_breakpad::test_assembler::kLittleEndian; using std::ifstream; using std::istringstream; using std::string; diff --git a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_amd64_unittest.cc b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_amd64_unittest.cc index 6db04ffc3347..404486405861 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_amd64_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_amd64_unittest.cc @@ -51,9 +51,9 @@ using google_breakpad::StackFrame; using google_breakpad::StackFrameAMD64; using google_breakpad::StackwalkerAMD64; using google_breakpad::SystemInfo; -using google_breakpad::TestAssembler::kLittleEndian; -using google_breakpad::TestAssembler::Label; -using google_breakpad::TestAssembler::Section; +using google_breakpad::test_assembler::kLittleEndian; +using google_breakpad::test_assembler::Label; +using google_breakpad::test_assembler::Section; using std::string; using std::vector; using testing::_; diff --git a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_arm_unittest.cc b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_arm_unittest.cc index 036b322cbf40..a12d4eb9db7c 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_arm_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_arm_unittest.cc @@ -53,9 +53,9 @@ using google_breakpad::StackFrameARM; using google_breakpad::StackwalkerARM; using google_breakpad::SystemInfo; using google_breakpad::WindowsFrameInfo; -using google_breakpad::TestAssembler::kLittleEndian; -using google_breakpad::TestAssembler::Label; -using google_breakpad::TestAssembler::Section; +using google_breakpad::test_assembler::kLittleEndian; +using google_breakpad::test_assembler::Label; +using google_breakpad::test_assembler::Section; using std::string; using std::vector; using testing::_; diff --git a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_sparc.cc b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_sparc.cc index f1eac7c28956..7363abd56903 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_sparc.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_sparc.cc @@ -93,7 +93,7 @@ StackFrame* StackwalkerSPARC::GetCallerFrame(const CallStack *stack) { // A caller frame must reside higher in memory than its callee frames. // Anything else is an error, or an indication that we've reached the // end of the stack. - u_int32_t stack_pointer = last_frame->context.g_r[30]; + u_int64_t stack_pointer = last_frame->context.g_r[30]; if (stack_pointer <= last_frame->context.g_r[14]) { return NULL; } diff --git a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_x86_unittest.cc b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_x86_unittest.cc index 5af516d413be..36c84d023ba6 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_x86_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/stackwalker_x86_unittest.cc @@ -52,9 +52,9 @@ using google_breakpad::StackFrameX86; using google_breakpad::StackwalkerX86; using google_breakpad::SystemInfo; using google_breakpad::WindowsFrameInfo; -using google_breakpad::TestAssembler::kLittleEndian; -using google_breakpad::TestAssembler::Label; -using google_breakpad::TestAssembler::Section; +using google_breakpad::test_assembler::kLittleEndian; +using google_breakpad::test_assembler::Label; +using google_breakpad::test_assembler::Section; using std::string; using std::vector; using testing::_; diff --git a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.cc b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.cc index c25d421fe7eb..cebc0a6a2385 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.cc @@ -38,16 +38,16 @@ namespace google_breakpad { namespace SynthMinidump { Section::Section(const Dump &dump) - : TestAssembler::Section(dump.endianness()) { } + : test_assembler::Section(dump.endianness()) { } -void Section::CiteLocationIn(TestAssembler::Section *section) const { +void Section::CiteLocationIn(test_assembler::Section *section) const { if (this) (*section).D32(size_).D32(file_offset_); else (*section).D32(0).D32(0); } -void Stream::CiteStreamIn(TestAssembler::Section *section) const { +void Stream::CiteStreamIn(test_assembler::Section *section) const { section->D32(type_); CiteLocationIn(section); } @@ -114,11 +114,11 @@ String::String(const Dump &dump, const string &contents) : Section(dump) { D16(*i); } -void String::CiteStringIn(TestAssembler::Section *section) const { +void String::CiteStringIn(test_assembler::Section *section) const { section->D32(file_offset_); } -void Memory::CiteMemoryIn(TestAssembler::Section *section) const { +void Memory::CiteMemoryIn(test_assembler::Section *section) const { section->D64(address_); CiteLocationIn(section); } @@ -237,7 +237,7 @@ Dump::Dump(u_int64_t flags, Endianness endianness, u_int32_t version, u_int32_t date_time_stamp) - : TestAssembler::Section(endianness), + : test_assembler::Section(endianness), file_start_(0), stream_directory_(*this), stream_count_(0), @@ -301,7 +301,7 @@ void Dump::Finish() { // has the stream count and MDRVA. stream_count_label_ = stream_count_; stream_directory_rva_ = file_start_ + Size(); - Append(static_cast(stream_directory_)); + Append(static_cast(stream_directory_)); } } // namespace SynthMinidump diff --git a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.h b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.h index 6219272d4135..f09a68fc5fb2 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.h +++ b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump.h @@ -34,13 +34,13 @@ // synth_minidump.h: Interface to SynthMinidump: fake minidump generator. // // We treat a minidump file as the concatenation of a bunch of -// TestAssembler::Sections. The file header, stream directory, +// test_assembler::Sections. The file header, stream directory, // streams, memory regions, strings, and so on --- each is a Section // that eventually gets appended to the minidump. Dump, Memory, -// Context, Thread, and so on all inherit from TestAssembler::Section. +// Context, Thread, and so on all inherit from test_assembler::Section. // For example: // -// using google_breakpad::TestAssembler::kLittleEndian; +// using google_breakpad::test_assembler::kLittleEndian; // using google_breakpad::SynthMinidump::Context; // using google_breakpad::SynthMinidump::Dump; // using google_breakpad::SynthMinidump::Memory; @@ -49,7 +49,7 @@ // Dump minidump(MD_NORMAL, kLittleEndian); // // Memory stack1(minidump, 0x569eb0a9); -// ... build contents of stack1 with TestAssembler::Section functions ... +// ... build contents of stack1 with test_assembler::Section functions ... // // MDRawContextX86 x86_context1; // x86_context1.context_flags = MD_CONTEXT_X86; @@ -69,7 +69,7 @@ // EXPECT_TRUE(minidump.GetContents(&contents)); // // contents now holds the bytes of a minidump file // -// Because the TestAssembler classes let us write Label references to +// Because the test_assembler classes let us write Label references to // sections before the Labels' values are known, this gives us // flexibility in how we put the dump together: minidump pieces can // hold the file offsets of other minidump pieces before the @@ -103,7 +103,7 @@ // memory list stream. // // If you forget to Add some Section, the Dump::GetContents call will -// fail, as the TestAssembler::Labels used to cite the Section's +// fail, as the test_assembler::Labels used to cite the Section's // contents from elsewhere will still be undefined. #ifndef PROCESSOR_SYNTH_MINIDUMP_H_ #define PROCESSOR_SYNTH_MINIDUMP_H_ @@ -122,18 +122,18 @@ namespace google_breakpad { namespace SynthMinidump { using std::string; -using TestAssembler::Endianness; -using TestAssembler::kBigEndian; -using TestAssembler::kLittleEndian; -using TestAssembler::kUnsetEndian; -using TestAssembler::Label; +using test_assembler::Endianness; +using test_assembler::kBigEndian; +using test_assembler::kLittleEndian; +using test_assembler::kUnsetEndian; +using test_assembler::Label; class Dump; class Memory; class String; -// A TestAssembler::Section which will be appended to a minidump. -class Section: public TestAssembler::Section { +// A test_assembler::Section which will be appended to a minidump. +class Section: public test_assembler::Section { public: explicit Section(const Dump &dump); @@ -145,7 +145,7 @@ class Section: public TestAssembler::Section { // bad, if such language exists. Having this function handle NULL // 'this' is convenient, but if it causes trouble, it's not hard to // do differently.) - void CiteLocationIn(TestAssembler::Section *section) const; + void CiteLocationIn(test_assembler::Section *section) const; // Note that this section's contents are complete, and that it has // been placed in the minidump file at OFFSET. The 'Add' member @@ -165,11 +165,11 @@ class Section: public TestAssembler::Section { class Stream: public Section { public: // Create a stream of type TYPE. You can append whatever contents - // you like to this stream using the TestAssembler::Section methods. + // you like to this stream using the test_assembler::Section methods. Stream(const Dump &dump, u_int32_t type) : Section(dump), type_(type) { } // Append an MDRawDirectory referring to this stream to SECTION. - void CiteStreamIn(TestAssembler::Section *section) const; + void CiteStreamIn(test_assembler::Section *section) const; private: // The type of this stream. @@ -202,7 +202,7 @@ class String: public Section { String(const Dump &dump, const string &value); // Append an MDRVA referring to this string to SECTION. - void CiteStringIn(TestAssembler::Section *section) const; + void CiteStringIn(test_assembler::Section *section) const; }; // A range of memory contents. 'Add'ing a memory range to a minidump @@ -215,7 +215,7 @@ class Memory: public Section { : Section(dump), address_(address) { start() = address; } // Append an MDMemoryDescriptor referring to this memory range to SECTION. - void CiteMemoryIn(TestAssembler::Section *section) const; + void CiteMemoryIn(test_assembler::Section *section) const; private: // The process address from which these memory contents were taken. @@ -297,10 +297,10 @@ class List: public Stream { Label count_label_; }; -class Dump: public TestAssembler::Section { +class Dump: public test_assembler::Section { public: - // Create a TestAssembler::Section containing a minidump file whose + // Create a test_assembler::Section containing a minidump file whose // header uses the given values. ENDIANNESS determines the // endianness of the signature; we set this section's default // endianness by this. diff --git a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump_unittest.cc b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump_unittest.cc index 888053bdb277..adad4ae8a9ad 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump_unittest.cc +++ b/toolkit/crashreporter/google-breakpad/src/processor/synth_minidump_unittest.cc @@ -50,9 +50,9 @@ using google_breakpad::SynthMinidump::Stream; using google_breakpad::SynthMinidump::String; using google_breakpad::SynthMinidump::SystemInfo; using google_breakpad::SynthMinidump::Thread; -using google_breakpad::TestAssembler::kBigEndian; -using google_breakpad::TestAssembler::kLittleEndian; -using google_breakpad::TestAssembler::Label; +using google_breakpad::test_assembler::kBigEndian; +using google_breakpad::test_assembler::kLittleEndian; +using google_breakpad::test_assembler::Label; using std::string; TEST(Section, Simple) { diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/dump_syms.cc b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/dump_syms.cc index 67f5ad53bf31..7d721a8c6c4d 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/dump_syms.cc +++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/dump_syms.cc @@ -32,17 +32,21 @@ #include "common/linux/dump_symbols.h" -using namespace google_breakpad; +using google_breakpad::WriteSymbolFile; int main(int argc, char **argv) { - if (argc != 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); + if (argc < 2 || argc > 3) { + fprintf(stderr, "Usage: %s " + "[directory-for-debug-file]\n", argv[0]); return 1; } const char *binary = argv[1]; + std::string debug_dir; + if (argc == 3) + debug_dir = argv[2]; - if (!WriteSymbolFile(binary, stdout)) { + if (!WriteSymbolFile(binary, debug_dir, stdout)) { fprintf(stderr, "Failed to write symbol file.\n"); return 1; } diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/md2core/minidump-2-core.cc b/toolkit/crashreporter/google-breakpad/src/tools/linux/md2core/minidump-2-core.cc index 29ae3280571e..9462376d76f8 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/linux/md2core/minidump-2-core.cc +++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/md2core/minidump-2-core.cc @@ -31,40 +31,39 @@ // Large parts lifted from the userspace core dumper: // http://code.google.com/p/google-coredumper/ // -// Usage: minidump-2-core 1234.dmp > core - -#include - -#include -#include +// Usage: minidump-2-core [-v] 1234.dmp > core #include #include -#include #include -#include +#include +#include +#include +#include #include +#include +#include + +#include +#include +#include #include "google_breakpad/common/minidump_format.h" #include "google_breakpad/common/minidump_cpu_x86.h" +#include "client/linux/minidump_writer/minidump_extension_linux.h" #include "common/linux/linux_syscall_support.h" -#include "common/linux/minidump_format_linux.h" + #if __WORDSIZE == 64 #define ELF_CLASS ELFCLASS64 - #define Ehdr Elf64_Ehdr - #define Phdr Elf64_Phdr - #define Shdr Elf64_Shdr - #define Nhdr Elf64_Nhdr - #define auxv_t Elf64_auxv_t #else #define ELF_CLASS ELFCLASS32 - #define Ehdr Elf32_Ehdr - #define Phdr Elf32_Phdr - #define Shdr Elf32_Shdr - #define Nhdr Elf32_Nhdr - #define auxv_t Elf32_auxv_t #endif +#define Ehdr ElfW(Ehdr) +#define Phdr ElfW(Phdr) +#define Shdr ElfW(Shdr) +#define Nhdr ElfW(Nhdr) +#define auxv_t ElfW(auxv_t) #if defined(__x86_64__) @@ -77,8 +76,11 @@ #define ELF_ARCH EM_MIPS #endif +static const MDRVA kInvalidMDRVA = static_cast(-1); +static bool verbose; + static int usage(const char* argv0) { - fprintf(stderr, "Usage: %s \n", argv0); + fprintf(stderr, "Usage: %s [-v] \n", argv0); return 1; } @@ -113,7 +115,7 @@ class MMappedRange { // Get an object of |length| bytes at |offset| and return a pointer to it // unless it's out of bounds. - const void* GetObject(size_t offset, size_t length) { + const void* GetObject(size_t offset, size_t length) const { if (offset + length < offset) return NULL; if (offset + length > length_) @@ -123,11 +125,24 @@ class MMappedRange { // Get element |index| of an array of objects of length |length| starting at // |offset| bytes. Return NULL if out of bounds. - const void* GetArrayElement(size_t offset, size_t length, unsigned index) { + const void* GetArrayElement(size_t offset, size_t length, + unsigned index) const { const size_t element_offset = offset + index * length; return GetObject(element_offset, length); } + // Get a zero-terminated string. This method only works correctly for ASCII + // characters and does not convert between UTF-16 and UTF-8. + const std::string GetString(size_t offset) const { + const MDString* s = (const MDString*) GetObject(offset, sizeof(MDString)); + const u_int16_t* buf = &s->buffer[0]; + std::string str; + for (unsigned i = 0; i < s->length && buf[i]; ++i) { + str.push_back(buf[i]); + } + return str; + } + // Return a new range which is a subset of this range. MMappedRange Subrange(const MDLocationDescriptor& location) const { if (location.rva > length_ || @@ -204,7 +219,7 @@ typedef struct prpsinfo { /* Information about process */ char pr_psargs[80]; /* Initial part of arg list */ } prpsinfo; -// We parse the minidump file and keep the parsed information in this structure. +// We parse the minidump file and keep the parsed information in this structure struct CrashedProcess { CrashedProcess() : crashing_tid(-1), @@ -212,12 +227,23 @@ struct CrashedProcess { auxv_length(0) { memset(&prps, 0, sizeof(prps)); prps.pr_sname = 'R'; + memset(&debug, 0, sizeof(debug)); } struct Mapping { - uint64_t start_address, end_address; + Mapping() + : permissions(0xFFFFFFFF), + start_address(0), + end_address(0), + offset(0) { + } + + uint32_t permissions; + uint64_t start_address, end_address, offset; + std::string filename; + std::string data; }; - std::vector mappings; + std::map mappings; pid_t crashing_tid; int fatal_signal; @@ -226,7 +252,9 @@ struct CrashedProcess { pid_t tid; user_regs_struct regs; user_fpregs_struct fpregs; +#if defined(__i386__) user_fpxregs_struct fpxregs; +#endif uintptr_t stack_addr; const uint8_t* stack; size_t stack_length; @@ -237,8 +265,15 @@ struct CrashedProcess { size_t auxv_length; prpsinfo prps; + + std::map signatures; + + std::string dynamic_data; + MDRawDebug debug; + std::vector link_map; }; +#if defined(__i386__) static uint32_t U32(const uint8_t* data) { uint32_t v; @@ -253,7 +288,6 @@ U16(const uint8_t* data) { return v; } -#if defined(__i386__) static void ParseThreadRegisters(CrashedProcess::Thread* thread, MMappedRange range) { const MDRawContextX86* rawregs = @@ -299,6 +333,51 @@ ParseThreadRegisters(CrashedProcess::Thread* thread, MMappedRange range) { memcpy(thread->fpxregs.st_space, rawregs->extended_registers + 32, 128); memcpy(thread->fpxregs.xmm_space, rawregs->extended_registers + 160, 128); } +#elif defined(__x86_64__) +static void +ParseThreadRegisters(CrashedProcess::Thread* thread, MMappedRange range) { + const MDRawContextAMD64* rawregs = + (const MDRawContextAMD64*) range.GetObject(0, sizeof(MDRawContextAMD64)); + + thread->regs.r15 = rawregs->r15; + thread->regs.r14 = rawregs->r14; + thread->regs.r13 = rawregs->r13; + thread->regs.r12 = rawregs->r12; + thread->regs.rbp = rawregs->rbp; + thread->regs.rbx = rawregs->rbx; + thread->regs.r11 = rawregs->r11; + thread->regs.r10 = rawregs->r10; + thread->regs.r9 = rawregs->r9; + thread->regs.r8 = rawregs->r8; + thread->regs.rax = rawregs->rax; + thread->regs.rcx = rawregs->rcx; + thread->regs.rdx = rawregs->rdx; + thread->regs.rsi = rawregs->rsi; + thread->regs.rdi = rawregs->rdi; + thread->regs.orig_rax = rawregs->rax; + thread->regs.rip = rawregs->rip; + thread->regs.cs = rawregs->cs; + thread->regs.eflags = rawregs->eflags; + thread->regs.rsp = rawregs->rsp; + thread->regs.ss = rawregs->ss; + thread->regs.fs_base = 0; + thread->regs.gs_base = 0; + thread->regs.ds = rawregs->ds; + thread->regs.es = rawregs->es; + thread->regs.fs = rawregs->fs; + thread->regs.gs = rawregs->gs; + + thread->fpregs.cwd = rawregs->flt_save.control_word; + thread->fpregs.swd = rawregs->flt_save.status_word; + thread->fpregs.ftw = rawregs->flt_save.tag_word; + thread->fpregs.fop = rawregs->flt_save.error_opcode; + thread->fpregs.rip = rawregs->flt_save.error_offset; + thread->fpregs.rdp = rawregs->flt_save.data_offset; + thread->fpregs.mxcsr = rawregs->flt_save.mx_csr; + thread->fpregs.mxcr_mask = rawregs->flt_save.mx_csr_mask; + memcpy(thread->fpregs.st_space, rawregs->flt_save.float_registers, 8 * 16); + memcpy(thread->fpregs.xmm_space, rawregs->flt_save.xmm_registers, 16 * 16); +} #else #error "This code has not been ported to your platform yet" #endif @@ -308,6 +387,13 @@ ParseThreadList(CrashedProcess* crashinfo, MMappedRange range, const MMappedRange& full_file) { const uint32_t num_threads = *(const uint32_t*) range.GetObject(0, sizeof(uint32_t)); + if (verbose) { + fprintf(stderr, + "MD_THREAD_LIST_STREAM:\n" + "Found %d threads\n" + "\n\n", + num_threads); + } for (unsigned i = 0; i < num_threads; ++i) { CrashedProcess::Thread thread; memset(&thread, 0, sizeof(thread)); @@ -327,43 +413,304 @@ ParseThreadList(CrashedProcess* crashinfo, MMappedRange range, } } +static void +ParseSystemInfo(CrashedProcess* crashinfo, MMappedRange range, + const MMappedRange &full_file) { + const MDRawSystemInfo* sysinfo = + (MDRawSystemInfo*) range.GetObject(0, sizeof(MDRawSystemInfo)); + if (!sysinfo) { + fprintf(stderr, "Failed to access MD_SYSTEM_INFO_STREAM\n"); + _exit(1); + } +#if defined(__i386__) + if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_X86) { + fprintf(stderr, + "This version of minidump-2-core only supports x86 (32bit)%s.\n", + sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_AMD64 ? + ",\nbut the minidump file is from a 64bit machine" : ""); + _exit(1); + } +#elif defined(__x86_64__) + if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_AMD64) { + fprintf(stderr, + "This version of minidump-2-core only supports x86 (64bit)%s.\n", + sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_X86 ? + ",\nbut the minidump file is from a 32bit machine" : ""); + _exit(1); + } +#else +#error "This code has not been ported to your platform yet" +#endif + if (!strstr(full_file.GetString(sysinfo->csd_version_rva).c_str(), "Linux")){ + fprintf(stderr, "This minidump was not generated by Linux.\n"); + _exit(1); + } + + if (verbose) { + fprintf(stderr, + "MD_SYSTEM_INFO_STREAM:\n" + "Architecture: %s\n" + "Number of processors: %d\n" + "Processor level: %d\n" + "Processor model: %d\n" + "Processor stepping: %d\n", + sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_X86 + ? "i386" + : sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_AMD64 + ? "x86-64" + : sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_ARM + ? "ARM" + : "???", + sysinfo->number_of_processors, + sysinfo->processor_level, + sysinfo->processor_revision >> 8, + sysinfo->processor_revision & 0xFF); + if (sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_X86 || + sysinfo->processor_architecture == MD_CPU_ARCHITECTURE_AMD64) { + fputs("Vendor id: ", stderr); + const char *nul = + (const char *)memchr(sysinfo->cpu.x86_cpu_info.vendor_id, 0, + sizeof(sysinfo->cpu.x86_cpu_info.vendor_id)); + fwrite(sysinfo->cpu.x86_cpu_info.vendor_id, + nul ? nul - (const char *)&sysinfo->cpu.x86_cpu_info.vendor_id[0] + : sizeof(sysinfo->cpu.x86_cpu_info.vendor_id), 1, stderr); + fputs("\n", stderr); + } + fprintf(stderr, "OS: %s\n", + full_file.GetString(sysinfo->csd_version_rva).c_str()); + fputs("\n\n", stderr); + } +} + +static void +ParseCPUInfo(CrashedProcess* crashinfo, MMappedRange range) { + if (verbose) { + fputs("MD_LINUX_CPU_INFO:\n", stderr); + fwrite(range.data(), range.length(), 1, stderr); + fputs("\n\n\n", stderr); + } +} + +static void +ParseProcessStatus(CrashedProcess* crashinfo, MMappedRange range) { + if (verbose) { + fputs("MD_LINUX_PROC_STATUS:\n", stderr); + fwrite(range.data(), range.length(), 1, stderr); + fputs("\n\n", stderr); + } +} + +static void +ParseLSBRelease(CrashedProcess* crashinfo, MMappedRange range) { + if (verbose) { + fputs("MD_LINUX_LSB_RELEASE:\n", stderr); + fwrite(range.data(), range.length(), 1, stderr); + fputs("\n\n", stderr); + } +} + +static void +ParseMaps(CrashedProcess* crashinfo, MMappedRange range) { + if (verbose) { + fputs("MD_LINUX_MAPS:\n", stderr); + fwrite(range.data(), range.length(), 1, stderr); + } + for (const u_int8_t* ptr = range.data(); + ptr < range.data() + range.length();) { + const u_int8_t* eol = (u_int8_t*)memchr(ptr, '\n', + range.data() + range.length() - ptr); + std::string line((const char*)ptr, + eol ? eol - ptr : range.data() + range.length() - ptr); + ptr = eol ? eol + 1 : range.data() + range.length(); + unsigned long long start, stop, offset; + char* permissions = NULL; + char* filename = NULL; + sscanf(line.c_str(), "%llx-%llx %m[-rwxp] %llx %*[:0-9a-f] %*d %ms", + &start, &stop, &permissions, &offset, &filename); + if (filename && *filename == '/') { + CrashedProcess::Mapping mapping; + mapping.permissions = 0; + if (strchr(permissions, 'r')) { + mapping.permissions |= PF_R; + } + if (strchr(permissions, 'w')) { + mapping.permissions |= PF_W; + } + if (strchr(permissions, 'x')) { + mapping.permissions |= PF_X; + } + mapping.start_address = start; + mapping.end_address = stop; + mapping.offset = offset; + if (filename) { + mapping.filename = filename; + } + crashinfo->mappings[mapping.start_address] = mapping; + } + free(permissions); + free(filename); + } + if (verbose) { + fputs("\n\n\n", stderr); + } +} + +static void +ParseEnvironment(CrashedProcess* crashinfo, MMappedRange range) { + if (verbose) { + fputs("MD_LINUX_ENVIRON:\n", stderr); + char *env = new char[range.length()]; + memcpy(env, range.data(), range.length()); + int nul_count = 0; + for (char *ptr = env;;) { + ptr = (char *)memchr(ptr, '\000', range.length() - (ptr - env)); + if (!ptr) { + break; + } + if (ptr > env && ptr[-1] == '\n') { + if (++nul_count > 5) { + // Some versions of Chrome try to rewrite the process' command line + // in a way that causes the environment to be corrupted. Afterwards, + // part of the environment will contain the trailing bit of the + // command line. The rest of the environment will be filled with + // NUL bytes. + // We detect this corruption by counting the number of consecutive + // NUL bytes. Normally, we would not expect any consecutive NUL + // bytes. But we are conservative and only suppress printing of + // the environment if we see at least five consecutive NULs. + fputs("Environment has been corrupted; no data available", stderr); + goto env_corrupted; + } + } else { + nul_count = 0; + } + *ptr = '\n'; + } + fwrite(env, range.length(), 1, stderr); + env_corrupted: + delete[] env; + fputs("\n\n\n", stderr); + } +} + static void ParseAuxVector(CrashedProcess* crashinfo, MMappedRange range) { + // Some versions of Chrome erroneously used the MD_LINUX_AUXV stream value + // when dumping /proc/$x/maps + if (range.length() > 17) { + // The AUXV vector contains binary data, whereas the maps always begin + // with an 8+ digit hex address followed by a hyphen and another 8+ digit + // address. + char addresses[18]; + memcpy(addresses, range.data(), 17); + addresses[17] = '\000'; + if (strspn(addresses, "0123456789abcdef-") == 17) { + ParseMaps(crashinfo, range); + return; + } + } + crashinfo->auxv = range.data(); crashinfo->auxv_length = range.length(); } static void ParseCmdLine(CrashedProcess* crashinfo, MMappedRange range) { + // The command line is supposed to use NUL bytes to separate arguments. + // As Chrome rewrites its own command line and (incorrectly) substitutes + // spaces, this is often not the case in our minidump files. const char* cmdline = (const char*) range.data(); + if (verbose) { + fputs("MD_LINUX_CMD_LINE:\n", stderr); + unsigned i = 0; + for (; i < range.length() && cmdline[i] && cmdline[i] != ' '; ++i) { } + fputs("argv[0] = \"", stderr); + fwrite(cmdline, i, 1, stderr); + fputs("\"\n", stderr); + for (unsigned j = ++i, argc = 1; j < range.length(); ++j) { + if (!cmdline[j] || cmdline[j] == ' ') { + fprintf(stderr, "argv[%d] = \"", argc++); + fwrite(cmdline + i, j - i, 1, stderr); + fputs("\"\n", stderr); + i = j + 1; + } + } + fputs("\n\n", stderr); + } + + const char *binary_name = cmdline; for (size_t i = 0; i < range.length(); ++i) { - if (cmdline[i] == 0) { + if (cmdline[i] == '/') { + binary_name = cmdline + i + 1; + } else if (cmdline[i] == 0 || cmdline[i] == ' ') { static const size_t fname_len = sizeof(crashinfo->prps.pr_fname) - 1; static const size_t args_len = sizeof(crashinfo->prps.pr_psargs) - 1; memset(crashinfo->prps.pr_fname, 0, fname_len + 1); memset(crashinfo->prps.pr_psargs, 0, args_len + 1); - const char* binary_name = strrchr(cmdline, '/'); - if (binary_name) { - binary_name++; - const unsigned len = strlen(binary_name); - memcpy(crashinfo->prps.pr_fname, binary_name, + unsigned len = cmdline + i - binary_name; + memcpy(crashinfo->prps.pr_fname, binary_name, len > fname_len ? fname_len : len); - } else { - memcpy(crashinfo->prps.pr_fname, cmdline, - i > fname_len ? fname_len : i); - } - const unsigned len = range.length() > args_len ? - args_len : range.length(); + len = range.length() > args_len ? args_len : range.length(); memcpy(crashinfo->prps.pr_psargs, cmdline, len); for (unsigned i = 0; i < len; ++i) { if (crashinfo->prps.pr_psargs[i] == 0) crashinfo->prps.pr_psargs[i] = ' '; } + break; } } } +static void +ParseDSODebugInfo(CrashedProcess* crashinfo, MMappedRange range, + const MMappedRange &full_file) { + const MDRawDebug* debug = + (MDRawDebug*) range.GetObject(0, sizeof(MDRawDebug)); + if (!debug) { + return; + } + if (verbose) { + fprintf(stderr, + "MD_LINUX_DSO_DEBUG:\n" + "Version: %d\n" + "Number of DSOs: %d\n" + "Brk handler: %p\n" + "Dynamic loader at: %p\n" + "_DYNAMIC: %p\n", + debug->version, + debug->dso_count, + debug->brk, + debug->ldbase, + debug->dynamic); + } + crashinfo->debug = *debug; + if (range.length() > sizeof(MDRawDebug)) { + char* dynamic_data = (char*)range.data() + sizeof(MDRawDebug); + crashinfo->dynamic_data.assign(dynamic_data, + range.length() - sizeof(MDRawDebug)); + } + if (debug->map != kInvalidMDRVA) { + for (int i = 0; i < debug->dso_count; ++i) { + const MDRawLinkMap* link_map = + (MDRawLinkMap*) full_file.GetArrayElement(debug->map, + sizeof(MDRawLinkMap), i); + if (link_map) { + if (verbose) { + fprintf(stderr, + "#%03d: %p, %p, \"%s\"\n", + i, link_map->addr, link_map->ld, + full_file.GetString(link_map->name).c_str()); + } + crashinfo->link_map.push_back(*link_map); + } + } + } + if (verbose) { + fputs("\n\n", stderr); + } +} + static void ParseExceptionStream(CrashedProcess* crashinfo, MMappedRange range) { const MDRawExceptionStream* exp = @@ -401,6 +748,7 @@ WriteThread(const CrashedProcess::Thread& thread, int fatal_signal) { return false; } +#if defined(__i386__) nhdr.n_descsz = sizeof(user_fpxregs_struct); nhdr.n_type = NT_PRXFPREG; if (!writea(1, &nhdr, sizeof(nhdr)) || @@ -408,12 +756,17 @@ WriteThread(const CrashedProcess::Thread& thread, int fatal_signal) { !writea(1, &thread.fpxregs, sizeof(user_fpxregs_struct))) { return false; } +#endif return true; } static void -ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range) { +ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range, + const MMappedRange &full_file) { + if (verbose) { + fputs("MD_MODULE_LIST_STREAM:\n", stderr); + } const uint32_t num_mappings = *(const uint32_t*) range.GetObject(0, sizeof(uint32_t)); for (unsigned i = 0; i < num_mappings; ++i) { @@ -424,16 +777,199 @@ ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range) { mapping.start_address = rawmodule->base_of_image; mapping.end_address = rawmodule->size_of_image + rawmodule->base_of_image; - crashinfo->mappings.push_back(mapping); + if (crashinfo->mappings.find(mapping.start_address) == + crashinfo->mappings.end()) { + // We prefer data from MD_LINUX_MAPS over MD_MODULE_LIST_STREAM, as + // the former is a strict superset of the latter. + crashinfo->mappings[mapping.start_address] = mapping; + } + + const MDCVInfoPDB70* record = + (const MDCVInfoPDB70*)full_file.GetObject(rawmodule->cv_record.rva, + MDCVInfoPDB70_minsize); + char guid[40]; + sprintf(guid, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", + record->signature.data1, record->signature.data2, + record->signature.data3, + record->signature.data4[0], record->signature.data4[1], + record->signature.data4[2], record->signature.data4[3], + record->signature.data4[4], record->signature.data4[5], + record->signature.data4[6], record->signature.data4[7]); + std::string filename = full_file.GetString(rawmodule->module_name_rva); + size_t slash = filename.find_last_of('/'); + std::string basename = slash == std::string::npos ? + filename : filename.substr(slash + 1); + if (strcmp(guid, "00000000-0000-0000-0000-000000000000")) { + crashinfo->signatures[rawmodule->base_of_image] = + std::string("/var/lib/breakpad/") + guid + "-" + basename; + } + + if (verbose) { + fprintf(stderr, "0x%08llX-0x%08llX, ChkSum: 0x%08X, GUID: %s, \"%s\"\n", + (unsigned long long)rawmodule->base_of_image, + (unsigned long long)rawmodule->base_of_image + + rawmodule->size_of_image, + rawmodule->checksum, guid, filename.c_str()); + } + } + if (verbose) { + fputs("\n\n", stderr); + } +} + +static void +AddDataToMapping(CrashedProcess* crashinfo, const std::string& data, + uintptr_t addr) { + for (std::map::iterator + iter = crashinfo->mappings.begin(); + iter != crashinfo->mappings.end(); + ++iter) { + if (addr >= iter->second.start_address && + addr < iter->second.end_address) { + CrashedProcess::Mapping mapping = iter->second; + if ((addr & ~4095) != iter->second.start_address) { + // If there are memory pages in the mapping prior to where the + // data starts, truncate the existing mapping so that it ends with + // the page immediately preceding the data region. + iter->second.end_address = addr & ~4095; + if (!mapping.filename.empty()) { + // "mapping" is a copy of "iter->second". We are splitting the + // existing mapping into two separate ones when we write the data + // to the core file. The first one does not have any associated + // data in the core file, the second one is backed by data that is + // included with the core file. + // If this mapping wasn't supposed to be anonymous, then we also + // have to update the file offset upon splitting the mapping. + mapping.offset += iter->second.end_address - + iter->second.start_address; + } + } + // Create a new mapping that contains the data contents. We often + // limit the amount of data that is actually written to the core + // file. But it is OK if the mapping itself extends past the end of + // the data. + mapping.start_address = addr & ~4095; + mapping.data.assign(addr & 4095, 0).append(data); + mapping.data.append(-mapping.data.size() & 4095, 0); + crashinfo->mappings[mapping.start_address] = mapping; + return; + } + } + // Didn't find a suitable existing mapping for the data. Create a new one. + CrashedProcess::Mapping mapping; + mapping.permissions = PF_R | PF_W; + mapping.start_address = addr & ~4095; + mapping.end_address = + (addr + data.size() + 4095) & ~4095; + mapping.data.assign(addr & 4095, 0).append(data); + mapping.data.append(-mapping.data.size() & 4095, 0); + crashinfo->mappings[mapping.start_address] = mapping; +} + +static void +AugmentMappings(CrashedProcess* crashinfo, + const MMappedRange &full_file) { + // For each thread, find the memory mapping that matches the thread's stack. + // Then adjust the mapping to include the stack dump. + for (unsigned i = 0; i < crashinfo->threads.size(); ++i) { + const CrashedProcess::Thread& thread = crashinfo->threads[i]; + AddDataToMapping(crashinfo, + std::string((char *)thread.stack, thread.stack_length), + thread.stack_addr); + } + + // Create a new link map with information about DSOs. We move this map to + // the beginning of the address space, as this area should always be + // available. + static const uintptr_t start_addr = 4096; + std::string data; + struct r_debug debug = { 0 }; + debug.r_version = crashinfo->debug.version; + debug.r_brk = (ElfW(Addr))crashinfo->debug.brk; + debug.r_state = r_debug::RT_CONSISTENT; + debug.r_ldbase = (ElfW(Addr))crashinfo->debug.ldbase; + debug.r_map = crashinfo->debug.dso_count > 0 ? + (struct link_map*)(start_addr + sizeof(debug)) : 0; + data.append((char*)&debug, sizeof(debug)); + + struct link_map* prev = 0; + for (std::vector::iterator iter = crashinfo->link_map.begin(); + iter != crashinfo->link_map.end(); + ++iter) { + struct link_map link_map = { 0 }; + link_map.l_addr = (ElfW(Addr))iter->addr; + link_map.l_name = (char*)(start_addr + data.size() + sizeof(link_map)); + link_map.l_ld = (ElfW(Dyn)*)iter->ld; + link_map.l_prev = prev; + prev = (struct link_map*)(start_addr + data.size()); + std::string filename = full_file.GetString(iter->name); + + // Look up signature for this filename. If available, change filename + // to point to GUID, instead. + std::map::const_iterator guid = + crashinfo->signatures.find((uintptr_t)iter->addr); + if (guid != crashinfo->signatures.end()) { + filename = guid->second; + } + + if (std::distance(iter, crashinfo->link_map.end()) == 1) { + link_map.l_next = 0; + } else { + link_map.l_next = (struct link_map*)(start_addr + data.size() + + sizeof(link_map) + + ((filename.size() + 8) & ~7)); + } + data.append((char*)&link_map, sizeof(link_map)); + data.append(filename); + data.append(8 - (filename.size() & 7), 0); + } + AddDataToMapping(crashinfo, data, start_addr); + + // Map the page containing the _DYNAMIC array + if (!crashinfo->dynamic_data.empty()) { + // Make _DYNAMIC DT_DEBUG entry point to our link map + for (int i = 0;; ++i) { + ElfW(Dyn) dyn; + if ((i+1)*sizeof(dyn) > crashinfo->dynamic_data.length()) { + no_dt_debug: + if (verbose) { + fprintf(stderr, "No DT_DEBUG entry found\n"); + } + return; + } + memcpy(&dyn, crashinfo->dynamic_data.c_str() + i*sizeof(dyn), + sizeof(dyn)); + if (dyn.d_tag == DT_DEBUG) { + crashinfo->dynamic_data.replace(i*sizeof(dyn) + + offsetof(ElfW(Dyn), d_un.d_ptr), + sizeof(start_addr), + (char*)&start_addr, sizeof(start_addr)); + break; + } else if (dyn.d_tag == DT_NULL) { + goto no_dt_debug; + } + } + AddDataToMapping(crashinfo, crashinfo->dynamic_data, + (uintptr_t)crashinfo->debug.dynamic); } } int main(int argc, char** argv) { - if (argc != 2) + int argi = 1; + while (argi < argc && argv[argi][0] == '-') { + if (!strcmp(argv[argi], "-v")) { + verbose = true; + } else { + return usage(argv[0]); + } + argi++; + } + + if (argc != argi + 1) return usage(argv[0]); - const int fd = open(argv[1], O_RDONLY); + const int fd = open(argv[argi], O_RDONLY); if (fd < 0) return usage(argv[0]); @@ -454,6 +990,27 @@ main(int argc, char** argv) { CrashedProcess crashinfo; + // Always check the system info first, as that allows us to tell whether + // this is a minidump file that is compatible with our converter. + bool ok = false; + for (unsigned i = 0; i < header->stream_count; ++i) { + const MDRawDirectory* dirent = + (const MDRawDirectory*) dump.GetArrayElement( + header->stream_directory_rva, sizeof(MDRawDirectory), i); + switch (dirent->stream_type) { + case MD_SYSTEM_INFO_STREAM: + ParseSystemInfo(&crashinfo, dump.Subrange(dirent->location), dump); + ok = true; + break; + default: + break; + } + } + if (!ok) { + fprintf(stderr, "Cannot determine input file format.\n"); + _exit(1); + } + for (unsigned i = 0; i < header->stream_count; ++i) { const MDRawDirectory* dirent = (const MDRawDirectory*) dump.GetArrayElement( @@ -462,22 +1019,44 @@ main(int argc, char** argv) { case MD_THREAD_LIST_STREAM: ParseThreadList(&crashinfo, dump.Subrange(dirent->location), dump); break; + case MD_LINUX_CPU_INFO: + ParseCPUInfo(&crashinfo, dump.Subrange(dirent->location)); + break; + case MD_LINUX_PROC_STATUS: + ParseProcessStatus(&crashinfo, dump.Subrange(dirent->location)); + break; + case MD_LINUX_LSB_RELEASE: + ParseLSBRelease(&crashinfo, dump.Subrange(dirent->location)); + break; + case MD_LINUX_ENVIRON: + ParseEnvironment(&crashinfo, dump.Subrange(dirent->location)); + break; + case MD_LINUX_MAPS: + ParseMaps(&crashinfo, dump.Subrange(dirent->location)); + break; case MD_LINUX_AUXV: ParseAuxVector(&crashinfo, dump.Subrange(dirent->location)); break; case MD_LINUX_CMD_LINE: ParseCmdLine(&crashinfo, dump.Subrange(dirent->location)); break; + case MD_LINUX_DSO_DEBUG: + ParseDSODebugInfo(&crashinfo, dump.Subrange(dirent->location), dump); + break; case MD_EXCEPTION_STREAM: ParseExceptionStream(&crashinfo, dump.Subrange(dirent->location)); break; case MD_MODULE_LIST_STREAM: - ParseModuleStream(&crashinfo, dump.Subrange(dirent->location)); + ParseModuleStream(&crashinfo, dump.Subrange(dirent->location), dump); + break; default: - fprintf(stderr, "Skipping %x\n", dirent->stream_type); + if (verbose) + fprintf(stderr, "Skipping %x\n", dirent->stream_type); } } + AugmentMappings(&crashinfo, dump); + // Write the ELF header. The file will look like: // ELF header // Phdr for the PT_NOTE @@ -499,21 +1078,23 @@ main(int argc, char** argv) { ehdr.e_phoff = sizeof(Ehdr); ehdr.e_ehsize = sizeof(Ehdr); ehdr.e_phentsize= sizeof(Phdr); - ehdr.e_phnum = 1 + crashinfo.threads.size() + crashinfo.mappings.size(); + ehdr.e_phnum = 1 + // PT_NOTE + crashinfo.mappings.size(); // memory mappings ehdr.e_shentsize= sizeof(Shdr); if (!writea(1, &ehdr, sizeof(Ehdr))) return 1; - size_t offset = sizeof(Ehdr) + - (1 + crashinfo.threads.size() + - crashinfo.mappings.size()) * sizeof(Phdr); + size_t offset = sizeof(Ehdr) + ehdr.e_phnum * sizeof(Phdr); size_t filesz = sizeof(Nhdr) + 8 + sizeof(prpsinfo) + // sizeof(Nhdr) + 8 + sizeof(user) + sizeof(Nhdr) + 8 + crashinfo.auxv_length + crashinfo.threads.size() * ( (sizeof(Nhdr) + 8 + sizeof(prstatus)) + - sizeof(Nhdr) + 8 + sizeof(user_fpregs_struct) + - sizeof(Nhdr) + 8 + sizeof(user_fpxregs_struct)); + sizeof(Nhdr) + 8 + sizeof(user_fpregs_struct) +#if defined(__i386__) + + sizeof(Nhdr) + 8 + sizeof(user_fpxregs_struct) +#endif + ); Phdr phdr; memset(&phdr, 0, sizeof(Phdr)); @@ -524,31 +1105,35 @@ main(int argc, char** argv) { return 1; phdr.p_type = PT_LOAD; - phdr.p_align = getpagesize(); + phdr.p_align = 4096; size_t note_align = phdr.p_align - ((offset+filesz) % phdr.p_align); if (note_align == phdr.p_align) note_align = 0; offset += note_align; - for (unsigned i = 0; i < crashinfo.threads.size(); ++i) { - const CrashedProcess::Thread& thread = crashinfo.threads[i]; - offset += filesz; - filesz = thread.stack_length; - phdr.p_offset = offset; - phdr.p_vaddr = thread.stack_addr; - phdr.p_filesz = phdr.p_memsz = filesz; - phdr.p_flags = PF_R | PF_W; - if (!writea(1, &phdr, sizeof(phdr))) - return 1; - } - - for (unsigned i = 0; i < crashinfo.mappings.size(); ++i) { - const CrashedProcess::Mapping& mapping = crashinfo.mappings[i]; - phdr.p_offset = 0; + for (std::map::const_iterator iter = + crashinfo.mappings.begin(); + iter != crashinfo.mappings.end(); ++iter) { + const CrashedProcess::Mapping& mapping = iter->second; + if (mapping.permissions == 0xFFFFFFFF) { + // This is a map that we found in MD_MODULE_LIST_STREAM (as opposed to + // MD_LINUX_MAPS). It lacks some of the information that we would like + // to include. + phdr.p_flags = PF_R; + } else { + phdr.p_flags = mapping.permissions; + } phdr.p_vaddr = mapping.start_address; - phdr.p_filesz = 0; - phdr.p_flags = PF_R; phdr.p_memsz = mapping.end_address - mapping.start_address; + if (mapping.data.size()) { + offset += filesz; + filesz = mapping.data.size(); + phdr.p_filesz = mapping.data.size(); + phdr.p_offset = offset; + } else { + phdr.p_filesz = 0; + phdr.p_offset = 0; + } if (!writea(1, &phdr, sizeof(phdr))) return 1; } @@ -591,10 +1176,14 @@ main(int argc, char** argv) { return 1; } - for (unsigned i = 0; i < crashinfo.threads.size(); ++i) { - const CrashedProcess::Thread& thread = crashinfo.threads[i]; - if (!writea(1, thread.stack, thread.stack_length)) - return 1; + for (std::map::const_iterator iter = + crashinfo.mappings.begin(); + iter != crashinfo.mappings.end(); ++iter) { + const CrashedProcess::Mapping& mapping = iter->second; + if (mapping.data.size()) { + if (!writea(1, mapping.data.c_str(), mapping.data.size())) + return 1; + } } munmap(const_cast(bytes), st.st_size); diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj index 5759ab4dde92..abf9565a8ea7 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj @@ -3,24 +3,26 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ 557800400BE1F28500EC23E0 /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5578003E0BE1F28500EC23E0 /* macho_utilities.cc */; }; - 557800410BE1F28500EC23E0 /* macho_utilities.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5578003F0BE1F28500EC23E0 /* macho_utilities.h */; }; + 8B31FF2A11F0C62700FCF3E4 /* dwarf_cfi_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF2411F0C62700FCF3E4 /* dwarf_cfi_to_module.cc */; }; + 8B31FF2B11F0C62700FCF3E4 /* dwarf_cu_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF2611F0C62700FCF3E4 /* dwarf_cu_to_module.cc */; }; + 8B31FF2C11F0C62700FCF3E4 /* dwarf_line_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF2811F0C62700FCF3E4 /* dwarf_line_to_module.cc */; }; + 8B31FF4111F0C64400FCF3E4 /* stabs_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF3D11F0C64400FCF3E4 /* stabs_reader.cc */; }; + 8B31FF4211F0C64400FCF3E4 /* stabs_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF3F11F0C64400FCF3E4 /* stabs_to_module.cc */; }; + 8B31FF7411F0C6E000FCF3E4 /* macho_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF7211F0C6E000FCF3E4 /* macho_reader.cc */; }; + 8B31FF8811F0C6FB00FCF3E4 /* language.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF8411F0C6FB00FCF3E4 /* language.cc */; }; + 8B31FF8911F0C6FB00FCF3E4 /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF8611F0C6FB00FCF3E4 /* module.cc */; }; + 8B31FFC511F0C8AB00FCF3E4 /* dwarf2diehandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */; }; 8B40BDC00C0638E4009535AF /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B40BDBF0C0638E4009535AF /* logging.cc */; }; + 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */; }; 8DD76F9A0486AA7600D96B5E /* crash_report.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* crash_report.mm */; settings = {ATTRIBUTES = (); }; }; 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; - 9B35FEE40B2675F9008DE8C7 /* code_module.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B35FEE20B2675F9008DE8C7 /* code_module.h */; }; - 9B35FEE50B2675F9008DE8C7 /* code_modules.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B35FEE30B2675F9008DE8C7 /* code_modules.h */; }; - 9B35FEE90B26761C008DE8C7 /* basic_code_module.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B35FEE60B26761C008DE8C7 /* basic_code_module.h */; }; 9B35FEEA0B26761C008DE8C7 /* basic_code_modules.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B35FEE70B26761C008DE8C7 /* basic_code_modules.cc */; }; - 9B35FEEB0B26761C008DE8C7 /* basic_code_modules.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B35FEE80B26761C008DE8C7 /* basic_code_modules.h */; }; - 9B3904960B2E52D90059FABE /* basic_source_line_resolver.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B3904940B2E52D90059FABE /* basic_source_line_resolver.h */; }; - 9B3904970B2E52D90059FABE /* source_line_resolver_interface.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B3904950B2E52D90059FABE /* source_line_resolver_interface.h */; }; 9B3904990B2E52FD0059FABE /* basic_source_line_resolver.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B3904980B2E52FD0059FABE /* basic_source_line_resolver.cc */; }; - 9B44619E0B66C66B00BBB817 /* system_info.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B44619D0B66C66B00BBB817 /* system_info.h */; }; 9BDF172C0B1B8B2400F8391B /* call_stack.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF172A0B1B8B2400F8391B /* call_stack.cc */; }; 9BDF172D0B1B8B2400F8391B /* minidump_processor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF172B0B1B8B2400F8391B /* minidump_processor.cc */; }; 9BDF17410B1B8B9A00F8391B /* minidump.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF173F0B1B8B9A00F8391B /* minidump.cc */; }; @@ -28,21 +30,12 @@ 9BDF17550B1B8BF900F8391B /* stackwalker_x86.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF17520B1B8BF900F8391B /* stackwalker_x86.cc */; }; 9BDF17560B1B8BF900F8391B /* stackwalker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF17530B1B8BF900F8391B /* stackwalker.cc */; }; 9BDF175D0B1B8C1B00F8391B /* process_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF175B0B1B8C1B00F8391B /* process_state.cc */; }; - 9BDF176D0B1B8CB100F8391B /* on_demand_symbol_supplier.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF176B0B1B8CB100F8391B /* on_demand_symbol_supplier.h */; }; 9BDF176E0B1B8CB100F8391B /* on_demand_symbol_supplier.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF176C0B1B8CB100F8391B /* on_demand_symbol_supplier.mm */; }; 9BDF1A280B1BD58200F8391B /* pathname_stripper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF1A270B1BD58200F8391B /* pathname_stripper.cc */; }; - 9BDF1AB90B1BE70C00F8391B /* range_map.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1A7B0B1BE30100F8391B /* range_map.h */; }; - 9BDF1ABA0B1BE70D00F8391B /* range_map-inl.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1A7A0B1BE30100F8391B /* range_map-inl.h */; }; - 9BDF1AFC0B1BEB6300F8391B /* address_map-inl.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1AFA0B1BEB6300F8391B /* address_map-inl.h */; }; - 9BDF1AFD0B1BEB6300F8391B /* address_map.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1AFB0B1BEB6300F8391B /* address_map.h */; }; - 9BDF21A60B1E825400F8391B /* dump_syms.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF192D0B1BC15D00F8391B /* dump_syms.h */; }; 9BDF21A70B1E825400F8391B /* dump_syms.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF192E0B1BC15D00F8391B /* dump_syms.mm */; }; 9BE650B20B52FE3000611104 /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650AC0B52FE3000611104 /* file_id.cc */; }; - 9BE650B30B52FE3000611104 /* file_id.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650AD0B52FE3000611104 /* file_id.h */; }; 9BE650B40B52FE3000611104 /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650AE0B52FE3000611104 /* macho_id.cc */; }; - 9BE650B50B52FE3000611104 /* macho_id.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650AF0B52FE3000611104 /* macho_id.h */; }; 9BE650B60B52FE3000611104 /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650B00B52FE3000611104 /* macho_walker.cc */; }; - 9BE650B70B52FE3000611104 /* macho_walker.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650B10B52FE3000611104 /* macho_walker.h */; }; D2A5DD4D1188651100081F03 /* cfi_frame_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2A5DD4C1188651100081F03 /* cfi_frame_info.cc */; }; D2A5DD631188658B00081F03 /* tokenize.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2A5DD621188658B00081F03 /* tokenize.cc */; }; F9C7ECE50E8ABCA600E953AD /* bytereader.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9C7ECE20E8ABCA600E953AD /* bytereader.cc */; }; @@ -51,45 +44,36 @@ F9F0706710FBC02D0037B88B /* stackwalker_arm.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9F0706510FBC02D0037B88B /* stackwalker_arm.cc */; }; FD6625CD0CF4D45C004AC844 /* stackwalker_amd64.cc in Sources */ = {isa = PBXBuildFile; fileRef = FD6625C40CF4D438004AC844 /* stackwalker_amd64.cc */; }; FD8EDEAE0CADDAD400A5EDF1 /* stackwalker_sparc.cc in Sources */ = {isa = PBXBuildFile; fileRef = FD8EDEAC0CADDAD400A5EDF1 /* stackwalker_sparc.cc */; }; - FD8EDEAF0CADDAD400A5EDF1 /* stackwalker_sparc.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD8EDEAD0CADDAD400A5EDF1 /* stackwalker_sparc.h */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 8DD76F9E0486AA7600D96B5E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 8; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - 9BDF176D0B1B8CB100F8391B /* on_demand_symbol_supplier.h in CopyFiles */, - 9BDF1AB90B1BE70C00F8391B /* range_map.h in CopyFiles */, - 9BDF1ABA0B1BE70D00F8391B /* range_map-inl.h in CopyFiles */, - 9BDF1AFC0B1BEB6300F8391B /* address_map-inl.h in CopyFiles */, - 9BDF1AFD0B1BEB6300F8391B /* address_map.h in CopyFiles */, - 9BDF21A60B1E825400F8391B /* dump_syms.h in CopyFiles */, - 9B35FEE40B2675F9008DE8C7 /* code_module.h in CopyFiles */, - 9B35FEE50B2675F9008DE8C7 /* code_modules.h in CopyFiles */, - 9B35FEE90B26761C008DE8C7 /* basic_code_module.h in CopyFiles */, - 9B35FEEB0B26761C008DE8C7 /* basic_code_modules.h in CopyFiles */, - 9B3904960B2E52D90059FABE /* basic_source_line_resolver.h in CopyFiles */, - 9B3904970B2E52D90059FABE /* source_line_resolver_interface.h in CopyFiles */, - 9BE650B30B52FE3000611104 /* file_id.h in CopyFiles */, - 9BE650B50B52FE3000611104 /* macho_id.h in CopyFiles */, - 9BE650B70B52FE3000611104 /* macho_walker.h in CopyFiles */, - 9B44619E0B66C66B00BBB817 /* system_info.h in CopyFiles */, - 557800410BE1F28500EC23E0 /* macho_utilities.h in CopyFiles */, - FD8EDEAF0CADDAD400A5EDF1 /* stackwalker_sparc.h in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* crash_report.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = crash_report.mm; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 5578003E0BE1F28500EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; }; 5578003F0BE1F28500EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; }; + 8B31025311F0D2D400FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102DA11F0D65600FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102DB11F0D65600FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B31FF2411F0C62700FCF3E4 /* dwarf_cfi_to_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf_cfi_to_module.cc; path = ../../../common/dwarf_cfi_to_module.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF2511F0C62700FCF3E4 /* dwarf_cfi_to_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf_cfi_to_module.h; path = ../../../common/dwarf_cfi_to_module.h; sourceTree = SOURCE_ROOT; }; + 8B31FF2611F0C62700FCF3E4 /* dwarf_cu_to_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf_cu_to_module.cc; path = ../../../common/dwarf_cu_to_module.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF2711F0C62700FCF3E4 /* dwarf_cu_to_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf_cu_to_module.h; path = ../../../common/dwarf_cu_to_module.h; sourceTree = SOURCE_ROOT; }; + 8B31FF2811F0C62700FCF3E4 /* dwarf_line_to_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf_line_to_module.cc; path = ../../../common/dwarf_line_to_module.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF2911F0C62700FCF3E4 /* dwarf_line_to_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf_line_to_module.h; path = ../../../common/dwarf_line_to_module.h; sourceTree = SOURCE_ROOT; }; + 8B31FF3D11F0C64400FCF3E4 /* stabs_reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stabs_reader.cc; path = ../../../common/stabs_reader.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF3E11F0C64400FCF3E4 /* stabs_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stabs_reader.h; path = ../../../common/stabs_reader.h; sourceTree = SOURCE_ROOT; }; + 8B31FF3F11F0C64400FCF3E4 /* stabs_to_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stabs_to_module.cc; path = ../../../common/stabs_to_module.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF4011F0C64400FCF3E4 /* stabs_to_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stabs_to_module.h; path = ../../../common/stabs_to_module.h; sourceTree = SOURCE_ROOT; }; + 8B31FF7211F0C6E000FCF3E4 /* macho_reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader.cc; path = ../../../common/mac/macho_reader.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF7311F0C6E000FCF3E4 /* macho_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macho_reader.h; path = ../../../common/mac/macho_reader.h; sourceTree = SOURCE_ROOT; }; + 8B31FF8411F0C6FB00FCF3E4 /* language.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = language.cc; path = ../../../common/language.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF8511F0C6FB00FCF3E4 /* language.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = language.h; path = ../../../common/language.h; sourceTree = SOURCE_ROOT; }; + 8B31FF8611F0C6FB00FCF3E4 /* module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = module.cc; path = ../../../common/module.cc; sourceTree = SOURCE_ROOT; }; + 8B31FF8711F0C6FB00FCF3E4 /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../../../common/module.h; sourceTree = SOURCE_ROOT; }; + 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2diehandler.cc; path = ../../../common/dwarf/dwarf2diehandler.cc; sourceTree = SOURCE_ROOT; }; + 8B31FFC411F0C8AB00FCF3E4 /* dwarf2diehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf2diehandler.h; path = ../../../common/dwarf/dwarf2diehandler.h; sourceTree = SOURCE_ROOT; }; 8B40BDBF0C0638E4009535AF /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logging.cc; path = ../../../processor/logging.cc; sourceTree = SOURCE_ROOT; }; + 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; 8DD76FA10486AA7600D96B5E /* crash_report */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_report; sourceTree = BUILT_PRODUCTS_DIR; }; 9B35FEE20B2675F9008DE8C7 /* code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_module.h; path = ../../../google_breakpad/processor/code_module.h; sourceTree = SOURCE_ROOT; }; 9B35FEE30B2675F9008DE8C7 /* code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_modules.h; path = ../../../google_breakpad/processor/code_modules.h; sourceTree = SOURCE_ROOT; }; @@ -152,6 +136,7 @@ buildActionMask = 2147483647; files = ( 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */, + 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -161,14 +146,33 @@ 08FB7794FE84155DC02AAC07 /* crash_report */ = { isa = PBXGroup; children = ( + 8B31025311F0D2D400FCF3E4 /* Breakpad.xcconfig */, + 8B3102DA11F0D65600FCF3E4 /* BreakpadDebug.xcconfig */, + 8B3102DB11F0D65600FCF3E4 /* BreakpadRelease.xcconfig */, F9C7ECE10E8ABC7F00E953AD /* DWARF */, 5578003E0BE1F28500EC23E0 /* macho_utilities.cc */, 5578003F0BE1F28500EC23E0 /* macho_utilities.h */, + 8B31FF7211F0C6E000FCF3E4 /* macho_reader.cc */, + 8B31FF7311F0C6E000FCF3E4 /* macho_reader.h */, 9BDF192D0B1BC15D00F8391B /* dump_syms.h */, 9BDF192E0B1BC15D00F8391B /* dump_syms.mm */, 08FB7796FE84155DC02AAC07 /* crash_report.mm */, 9BDF176B0B1B8CB100F8391B /* on_demand_symbol_supplier.h */, 9BDF176C0B1B8CB100F8391B /* on_demand_symbol_supplier.mm */, + 8B31FF2411F0C62700FCF3E4 /* dwarf_cfi_to_module.cc */, + 8B31FF2511F0C62700FCF3E4 /* dwarf_cfi_to_module.h */, + 8B31FF2611F0C62700FCF3E4 /* dwarf_cu_to_module.cc */, + 8B31FF2711F0C62700FCF3E4 /* dwarf_cu_to_module.h */, + 8B31FF2811F0C62700FCF3E4 /* dwarf_line_to_module.cc */, + 8B31FF2911F0C62700FCF3E4 /* dwarf_line_to_module.h */, + 8B31FF3D11F0C64400FCF3E4 /* stabs_reader.cc */, + 8B31FF3E11F0C64400FCF3E4 /* stabs_reader.h */, + 8B31FF3F11F0C64400FCF3E4 /* stabs_to_module.cc */, + 8B31FF4011F0C64400FCF3E4 /* stabs_to_module.h */, + 8B31FF8411F0C6FB00FCF3E4 /* language.cc */, + 8B31FF8511F0C6FB00FCF3E4 /* language.h */, + 8B31FF8611F0C6FB00FCF3E4 /* module.cc */, + 8B31FF8711F0C6FB00FCF3E4 /* module.h */, 08FB7795FE84155DC02AAC07 /* breakpad */, 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */, 1AB674ADFE9D54B511CA2CBB /* Products */, @@ -189,6 +193,7 @@ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */, 08FB779EFE84155DC02AAC07 /* Foundation.framework */, ); name = "External Frameworks and Libraries"; @@ -292,6 +297,8 @@ children = ( F9C7ECE20E8ABCA600E953AD /* bytereader.cc */, F9C7ECE30E8ABCA600E953AD /* dwarf2reader.cc */, + 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */, + 8B31FFC411F0C8AB00FCF3E4 /* dwarf2diehandler.h */, F9C7ECE40E8ABCA600E953AD /* functioninfo.cc */, ); name = DWARF; @@ -306,7 +313,6 @@ buildPhases = ( 8DD76F990486AA7600D96B5E /* Sources */, 8DD76F9B0486AA7600D96B5E /* Frameworks */, - 8DD76F9E0486AA7600D96B5E /* CopyFiles */, ); buildRules = ( ); @@ -324,7 +330,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "crash_report" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* crash_report */; projectDirPath = ""; @@ -366,6 +372,15 @@ F9F0706710FBC02D0037B88B /* stackwalker_arm.cc in Sources */, D2A5DD4D1188651100081F03 /* cfi_frame_info.cc in Sources */, D2A5DD631188658B00081F03 /* tokenize.cc in Sources */, + 8B31FF2A11F0C62700FCF3E4 /* dwarf_cfi_to_module.cc in Sources */, + 8B31FF2B11F0C62700FCF3E4 /* dwarf_cu_to_module.cc in Sources */, + 8B31FF2C11F0C62700FCF3E4 /* dwarf_line_to_module.cc in Sources */, + 8B31FF4111F0C64400FCF3E4 /* stabs_reader.cc in Sources */, + 8B31FF4211F0C64400FCF3E4 /* stabs_to_module.cc in Sources */, + 8B31FF7411F0C6E000FCF3E4 /* macho_reader.cc in Sources */, + 8B31FF8811F0C6FB00FCF3E4 /* language.cc in Sources */, + 8B31FF8911F0C6FB00FCF3E4 /* module.cc in Sources */, + 8B31FFC511F0C8AB00FCF3E4 /* dwarf2diehandler.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -375,65 +390,32 @@ 1DEB927508733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - _GLIBCXX_DEBUG_PEDANTIC, - _GLIBCXX_DEBUG, - _GLIBCPP_CONCEPT_CHECKS, - ); - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = "-lcrypto"; + HEADER_SEARCH_PATHS = ../../../../src; PRODUCT_NAME = crash_report; - USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Debug; }; 1DEB927608733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = "-lcrypto"; + HEADER_SEARCH_PATHS = ../../../../src; PRODUCT_NAME = crash_report; - USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Release; }; 1DEB927908733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102DA11F0D65600FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; }; name = Debug; }; 1DEB927A08733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102DB11F0D65600FCF3E4 /* BreakpadRelease.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; }; name = Release; }; diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.mm b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.mm index 4123a27c82eb..4cc64f6aedf1 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.mm +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/crash_report/on_demand_symbol_supplier.mm @@ -53,7 +53,7 @@ OnDemandSymbolSupplier::OnDemandSymbolSupplier(const string &search_dir, const string &symbol_search_dir) : search_dir_(search_dir) { NSFileManager *mgr = [NSFileManager defaultManager]; - int length = symbol_search_dir.length(); + size_t length = symbol_search_dir.length(); if (length) { // Load all sym files in symbol_search_dir into our module_file_map // A symbol file always starts with a line like this: @@ -87,6 +87,7 @@ OnDemandSymbolSupplier::OnDemandSymbolSupplier(const string &search_dir, BOOL goodScan = [scanner scanString:@"MODULE mac " intoString:nil]; if (goodScan) { goodScan = ([scanner scanString:@"x86 " intoString:nil] || + [scanner scanString:@"x86_64 " intoString:nil] || [scanner scanString:@"ppc " intoString:nil]); if (goodScan) { NSString *moduleID; @@ -149,7 +150,7 @@ OnDemandSymbolSupplier::GetSymbolFile(const CodeModule *module, if (s == FOUND) { - ifstream in(symbol_file->c_str()); + std::ifstream in(symbol_file->c_str()); getline(in, *symbol_data, std::string::traits_type::to_char_type( std::string::traits_type::eof())); in.close(); @@ -174,14 +175,14 @@ string OnDemandSymbolSupplier::GetLocalModulePath(const CodeModule *module) { // search string and stop if a file (not dir) is found or all components // have been appended NSArray *pathComponents = [modulePath componentsSeparatedByString:@"/"]; - int count = [pathComponents count]; + size_t count = [pathComponents count]; NSMutableString *path = [NSMutableString string]; - for (int i = 0; i < count; ++i) { + for (size_t i = 0; i < count; ++i) { [path setString:searchDir]; - for (int j = 0; j < i + 1; ++j) { - int idx = count - 1 - i + j; + for (size_t j = 0; j < i + 1; ++j) { + size_t idx = count - 1 - i + j; [path appendFormat:@"/%@", [pathComponents objectAtIndex:idx]]; } @@ -214,7 +215,7 @@ static float GetFileModificationTime(const char *path) { struct stat file_stat; if (stat(path, &file_stat) == 0) result = (float)file_stat.st_mtimespec.tv_sec + - (float)file_stat.st_mtimespec.tv_nsec / 1.0e9; + (float)file_stat.st_mtimespec.tv_nsec / 1.0e9f; return result; } @@ -236,7 +237,7 @@ bool OnDemandSymbolSupplier::GenerateSymbolFile(const CodeModule *module, if ([[NSFileManager defaultManager] fileExistsAtPath:symbol_path]) { // Check if the module file is newer than the saved symbols float cache_time = - GetFileModificationTime([symbol_path fileSystemRepresentation]); + GetFileModificationTime([symbol_path fileSystemRepresentation]); float module_time = GetFileModificationTime(module_path.c_str()); @@ -248,15 +249,26 @@ bool OnDemandSymbolSupplier::GenerateSymbolFile(const CodeModule *module, NSString *module_str = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:module_path.c_str() length:module_path.length()]; - DumpSymbols *dump = [[DumpSymbols alloc] initWithContentsOfFile:module_str]; - const char *archStr = system_info->cpu.c_str(); - if ([dump setArchitecture:[NSString stringWithUTF8String:archStr]]) { - [dump writeSymbolFile:symbol_path]; + DumpSymbols dump; + if (dump.Read(module_str)) { + if (dump.SetArchitecture(system_info->cpu)) { + FILE *file = fopen([symbol_path fileSystemRepresentation],"w"); + if (file) { + dump.WriteSymbolFile(file); + fclose(file); + } else { + printf("Unable to open %s (%d)\n", name.c_str(), errno); + result = false; + } + } else { + printf("Architecture %s not available for %s\n", + system_info->cpu.c_str(), name.c_str()); + result = false; + } } else { - printf("Architecture %s not available for %s\n", archStr, name.c_str()); + printf("Unable to open %s\n", [module_str UTF8String]); result = false; } - [dump release]; } // Add the mapping diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj index 172b1fd3ac66..2ddaf2c7d8fd 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXAggregateTarget section */ @@ -25,6 +25,7 @@ B88FB15D116CF54B00407530 /* PBXTargetDependency */, B84A9201116CF7D2006C210E /* PBXTargetDependency */, B88FB0C8116CEB4A00407530 /* PBXTargetDependency */, + 8B31051511F100CF00FCF3E4 /* PBXTargetDependency */, ); name = all_unittests; productName = all_unittests; @@ -32,6 +33,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBC912013288009C7060 /* libcrypto.dylib */; }; B84A91F8116CF78F006C210E /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; }; B84A91FB116CF7AF006C210E /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE241166603300407530 /* module.cc */; }; B84A91FC116CF7AF006C210E /* stabs_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE3C11666C8900407530 /* stabs_to_module.cc */; }; @@ -83,7 +85,6 @@ B88FB13F116CF38300407530 /* bytereader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0DA116CEC5800407530 /* bytereader_unittest.cc */; }; B88FB14F116CF4AE00407530 /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; }; B88FB152116CF4D300407530 /* byte_cursor_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0D4116CEC0600407530 /* byte_cursor_unittest.cc */; }; - B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */; }; B89E0E781166576C00DD08C9 /* macho_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6E1166571D00DD08C9 /* macho_reader.cc */; }; B89E0E7A1166576C00DD08C9 /* macho_dump.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E701166573700DD08C9 /* macho_dump.cc */; }; B89E0E9911665A7200DD08C9 /* macho_reader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */; }; @@ -103,6 +104,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 8B31051411F100CF00FCF3E4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D21F97D111CBA0F200239E38; + remoteInfo = test_assembler_unittest; + }; B84A91F9116CF796006C210E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -261,9 +269,13 @@ /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* dump_syms.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = dump_syms.mm; path = ../../../common/mac/dump_syms.mm; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 557800890BE1F3AB00EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; }; 5578008A0BE1F3AB00EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; }; + 8B31023E11F0CF1C00FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102D411F0D60300FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102D511F0D60300FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B4BDBC912013288009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; 9BDF186D0B1BB43700F8391B /* dump_syms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dump_syms.h; path = ../../../common/mac/dump_syms.h; sourceTree = ""; }; 9BDF186E0B1BB43700F8391B /* dump_syms_tool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = dump_syms_tool.mm; sourceTree = ""; }; 9BE650410B52F6D800611104 /* file_id.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = file_id.cc; path = ../../../common/mac/file_id.cc; sourceTree = SOURCE_ROOT; }; @@ -315,7 +327,6 @@ B88FB11F116CF27F00407530 /* dwarf_cfi_to_module_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dwarf_cfi_to_module_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; B88FB135116CF30F00407530 /* bytereader_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = bytereader_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; B88FB14B116CF4A700407530 /* byte_cursor_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = byte_cursor_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; - B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = ""; }; B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader_unittest.cc; path = ../../../common/mac/macho_reader_unittest.cc; sourceTree = SOURCE_ROOT; }; B89E0E6E1166571D00DD08C9 /* macho_reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader.cc; path = ../../../common/mac/macho_reader.cc; sourceTree = SOURCE_ROOT; }; B89E0E6F1166571D00DD08C9 /* macho_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macho_reader.h; path = ../../../common/mac/macho_reader.h; sourceTree = SOURCE_ROOT; }; @@ -445,7 +456,7 @@ buildActionMask = 2147483647; files = ( B8C5B523116653BA00D34F4E /* Foundation.framework in Frameworks */, - B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */, + 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -463,6 +474,9 @@ 08FB7794FE84155DC02AAC07 /* dump_syms */ = { isa = PBXGroup; children = ( + 8B31023E11F0CF1C00FCF3E4 /* Breakpad.xcconfig */, + 8B3102D411F0D60300FCF3E4 /* BreakpadDebug.xcconfig */, + 8B3102D511F0D60300FCF3E4 /* BreakpadRelease.xcconfig */, B89E0E9D11665A9500DD08C9 /* TESTING */, F9F5344B0E7C8FFC0012363F /* DWARF */, B89E0E6C1166569700DD08C9 /* MACHO */, @@ -486,8 +500,8 @@ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 8B4BDBC912013288009C7060 /* libcrypto.dylib */, 08FB779EFE84155DC02AAC07 /* Foundation.framework */, - B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -869,7 +883,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "dump_syms" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* dump_syms */; projectDirPath = ""; @@ -907,7 +921,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -eu\n\ncd $BUILT_PRODUCTS_DIR\npwd\n\n./byte_cursor_unittest\n./macho_reader_unittest\n./stabs_reader_unittest\n./bytereader_unittest\n./dwarf2reader_cfi_unittest\n./dwarf2diehandler_unittest\n./dwarf_cu_to_module_unittest\n./dwarf_line_to_module_unittest\n./dwarf_cfi_to_module_unittest\n./stabs_to_module_unittest\n./module_unittest\n\necho \"Expect two warnings from the following tests:\"\necho \" Errors.BadFileNumber\"\necho \" Errors.BadDirectoryNumber\"\necho \"The proper behavior of these tests is to print text that XCode confuses with compiler warnings.\"\n"; + shellScript = "set -eu\n\ncd $BUILT_PRODUCTS_DIR\npwd\n\n./byte_cursor_unittest\n./macho_reader_unittest\n./stabs_reader_unittest\n./bytereader_unittest\n./dwarf2reader_cfi_unittest\n./dwarf2diehandler_unittest\n./dwarf_cu_to_module_unittest\n./dwarf_line_to_module_unittest\n./dwarf_cfi_to_module_unittest\n./stabs_to_module_unittest\n./module_unittest\n./test_assembler_unittest\n\necho \"Expect two warnings from the following tests:\"\necho \" Errors.BadFileNumber\"\necho \" Errors.BadDirectoryNumber\"\necho \"The proper behavior of these tests is to print text that XCode confuses with compiler warnings.\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1074,6 +1088,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 8B31051511F100CF00FCF3E4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D21F97D111CBA0F200239E38 /* test_assembler_unittest */; + targetProxy = 8B31051411F100CF00FCF3E4 /* PBXContainerItemProxy */; + }; B84A91FA116CF796006C210E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B88FB023116BDFFF00407530 /* gtestmockall */; @@ -1189,38 +1208,30 @@ /* Begin XCBuildConfiguration section */ 1DEB927908733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102D411F0D60300FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "../../../**"; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + HEADER_SEARCH_PATHS = ../../..; }; name = Debug; }; 1DEB927A08733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102D511F0D60300FCF3E4 /* BreakpadRelease.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + HEADER_SEARCH_PATHS = ../../..; }; name = Release; }; B84A91F6116CF784006C210E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_to_module_unittest; }; name = Debug; @@ -1228,38 +1239,32 @@ B84A91F7116CF784006C210E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_to_module_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FAF31116A591F00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - INSTALL_PATH = /usr/local/bin; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug\""; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - PREBINDING = NO; PRODUCT_NAME = dwarf2reader_cfi_unittest; }; name = Debug; @@ -1267,29 +1272,25 @@ B88FAF32116A591F00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug\""; - PREBINDING = NO; PRODUCT_NAME = dwarf2reader_cfi_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FAFCA116BDCAD00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = all_unittests; }; name = Debug; @@ -1297,26 +1298,21 @@ B88FAFCB116BDCAD00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = all_unittests; - ZERO_LINK = NO; }; name = Release; }; B88FB009116BDE8400407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_reader_unittest; }; name = Debug; @@ -1324,32 +1320,28 @@ B88FB00A116BDE8400407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_reader_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB025116BE00100407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = gtestmockall; }; name = Debug; @@ -1357,29 +1349,27 @@ B88FB026116BE00100407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = gtestmockall; - ZERO_LINK = NO; }; name = Release; }; B88FB0BB116CEAC000407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = module_unittest; }; name = Debug; @@ -1387,29 +1377,27 @@ B88FB0BC116CEAC000407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = module_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB0E1116CEEA800407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf2diehandler_unittest; }; name = Debug; @@ -1417,29 +1405,27 @@ B88FB0E2116CEEA800407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf2diehandler_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB0F4116CEF1900407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_line_to_module_unittest; }; name = Debug; @@ -1447,29 +1433,27 @@ B88FB0F5116CEF1900407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_line_to_module_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB10C116CF07A00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cu_to_module_unittest; }; name = Debug; @@ -1477,29 +1461,27 @@ B88FB10D116CF07A00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cu_to_module_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB121116CF28000407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cfi_to_module_unittest; }; name = Debug; @@ -1507,29 +1489,27 @@ B88FB122116CF28000407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cfi_to_module_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB137116CF30F00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = bytereader_unittest; }; name = Debug; @@ -1537,29 +1517,27 @@ B88FB138116CF30F00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = bytereader_unittest; - ZERO_LINK = NO; }; name = Release; }; B88FB14D116CF4A800407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = byte_cursor_unittest; }; name = Debug; @@ -1567,29 +1545,20 @@ B88FB14E116CF4A800407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = byte_cursor_unittest; - ZERO_LINK = NO; }; name = Release; }; B89E0E761166575300DD08C9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; PRODUCT_NAME = macho_dump; }; name = Debug; @@ -1597,29 +1566,20 @@ B89E0E771166575300DD08C9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; PRODUCT_NAME = macho_dump; - ZERO_LINK = NO; }; name = Release; }; B89E0E9711665A6400DD08C9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = macho_reader_unittest; }; name = Debug; @@ -1627,31 +1587,21 @@ B89E0E9811665A6400DD08C9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = macho_reader_unittest; - ZERO_LINK = NO; }; name = Release; }; B8C5B5131166531B00D34F4E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ""; - PREBINDING = NO; PRODUCT_NAME = dump_syms; }; name = Debug; @@ -1659,39 +1609,21 @@ B8C5B5141166531B00D34F4E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; PRODUCT_NAME = dump_syms; - ZERO_LINK = NO; }; name = Release; }; D21F97D411CBA0F200239E38 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, ); - PREBINDING = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; PRODUCT_NAME = test_assembler_unittest; }; name = Debug; @@ -1699,23 +1631,14 @@ D21F97D511CBA0F200239E38 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, ); - PREBINDING = NO; PRODUCT_NAME = test_assembler_unittest; - ZERO_LINK = NO; }; name = Release; }; diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/macho_dump.cc b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/macho_dump.cc index fcef37c5e62f..940df25bd2ea 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/macho_dump.cc +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/macho_dump.cc @@ -137,7 +137,8 @@ void DumpFile(const char *filename) { } printf("filename: %s\n", filename); size_t object_files_size; - struct fat_arch *object_files = fat_reader.object_files(&object_files_size); + const struct fat_arch *object_files + = fat_reader.object_files(&object_files_size); printf(" object file count: %ld\n", object_files_size); for (size_t i = 0; i < object_files_size; i++) { const struct fat_arch &file = object_files[i]; diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/minidump_upload.m b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/minidump_upload.m index 4f9d8c7a335c..991a5de5ebc8 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/minidump_upload.m +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/minidump_upload.m @@ -98,10 +98,10 @@ SetupOptions(int argc, const char *argv[], Options *options) { while ((ch = getopt(argc, (char * const *)argv, "p:v:h?")) != -1) { switch (ch) { case 'p': - options->product = [NSString stringWithCString:optarg]; + options->product = [NSString stringWithUTF8String:optarg]; break; case 'v': - options->version = [NSString stringWithCString:optarg]; + options->version = [NSString stringWithUTF8String:optarg]; break; default: @@ -117,8 +117,8 @@ SetupOptions(int argc, const char *argv[], Options *options) { exit(1); } - options->minidumpPath = [NSString stringWithCString:argv[optind]]; - options->uploadURLStr = [NSString stringWithCString:argv[optind + 1]]; + options->minidumpPath = [NSString stringWithUTF8String:argv[optind]]; + options->uploadURLStr = [NSString stringWithUTF8String:argv[optind + 1]]; } //============================================================================= diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.m b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.m index 7830cdca0613..fe0cb67cb449 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.m +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.m @@ -134,7 +134,7 @@ static void Start(Options *options) { fprintf(stdout, "Send: %s\n", error ? [[error description] UTF8String] : "No Error"); fprintf(stdout, "Response: %d\n", status); - fprintf(stdout, "Result: %d bytes\n%s\n", [data length], [result UTF8String]); + fprintf(stdout, "Result: %lu bytes\n%s\n", [data length], [result UTF8String]); [result release]; [ul release]; @@ -173,8 +173,8 @@ SetupOptions(int argc, const char *argv[], Options *options) { exit(1); } - options->symbolsPath = [NSString stringWithCString:argv[optind]]; - options->uploadURLStr = [NSString stringWithCString:argv[optind + 1]]; + options->symbolsPath = [NSString stringWithUTF8String:argv[optind]]; + options->uploadURLStr = [NSString stringWithUTF8String:argv[optind + 1]]; } //============================================================================= diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj index d2f4a1cae3e9..a6a78dc5f3e9 100644 --- a/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ + 8B31022C11F0CEBD00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; 8DD76F9A0486AA7600D96B5E /* symupload.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* symupload.m */; settings = {ATTRIBUTES = (); }; }; 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; 9BC1D49E0B37427A00F2A2B4 /* minidump_upload.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD836000B0544BA0055103E /* minidump_upload.m */; }; @@ -30,7 +31,10 @@ /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* symupload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = symupload.m; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 8B31022B11F0CE6900FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102B611F0D5CE00FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B3102B711F0D5CE00FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; 8DD76FA10486AA7600D96B5E /* symupload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = symupload; sourceTree = BUILT_PRODUCTS_DIR; }; 9BD833680B03E4080055103E /* HTTPMultipartUpload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPMultipartUpload.h; path = ../../../common/mac/HTTPMultipartUpload.h; sourceTree = ""; }; 9BD833690B03E4080055103E /* HTTPMultipartUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTTPMultipartUpload.m; path = ../../../common/mac/HTTPMultipartUpload.m; sourceTree = ""; }; @@ -51,6 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8B31022C11F0CEBD00FCF3E4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -60,6 +65,9 @@ 08FB7794FE84155DC02AAC07 /* symupload */ = { isa = PBXGroup; children = ( + 8B31022B11F0CE6900FCF3E4 /* Breakpad.xcconfig */, + 8B3102B611F0D5CE00FCF3E4 /* BreakpadDebug.xcconfig */, + 8B3102B711F0D5CE00FCF3E4 /* BreakpadRelease.xcconfig */, 08FB7796FE84155DC02AAC07 /* symupload.m */, 9BD836000B0544BA0055103E /* minidump_upload.m */, 9BD833680B03E4080055103E /* HTTPMultipartUpload.h */, @@ -130,9 +138,11 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "symupload" */; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* symupload */; projectDirPath = ""; + projectRoot = ""; targets = ( 8DD76F960486AA7600D96B5E /* symupload */, 9BD835FA0B0544950055103E /* minidump_upload */, @@ -165,105 +175,46 @@ 1DEB927508733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INSTALL_PATH = "$(HOME)/bin"; + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = symupload; - USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Debug; }; 1DEB927608733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_C_LANGUAGE_STANDARD = c99; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - INSTALL_PATH = "$(HOME)/bin"; + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = symupload; - USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; - ZERO_LINK = NO; }; name = Release; }; 1DEB927908733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102B611F0D5CE00FCF3E4 /* BreakpadDebug.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Debug; }; 1DEB927A08733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8B3102B711F0D5CE00FCF3E4 /* BreakpadRelease.xcconfig */; buildSettings = { - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Release; }; 9BD836030B0544BB0055103E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = minidump_upload; - USER_HEADER_SEARCH_PATHS = "../../../**"; - ZERO_LINK = NO; }; name = Debug; }; 9BD836040B0544BB0055103E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = minidump_upload; - USER_HEADER_SEARCH_PATHS = "../../../**"; - ZERO_LINK = NO; }; name = Release; }; From d5e14afdc933c99d768857d1b5d9e8b7a7752bb5 Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 16 Aug 2010 15:05:09 -0400 Subject: [PATCH 091/109] bug 559228 - Update Breakpad to r652 (mozilla build system changes). r=bsmedberg a=blocking --HG-- extra : rebase_source : a3aeb2907f6102abd1628387beed004e242f9c3b --- toolkit/crashreporter/Makefile.in | 1 + .../client/mac/crash_generation/Makefile.in | 59 +++++++++++++++++++ .../src/common/mac/Makefile.in | 6 ++ toolkit/crashreporter/nsExceptionHandler.cpp | 6 +- toolkit/xre/Makefile.in | 1 + 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 0ecba837b8cc..0b6dd9c9542f 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -61,6 +61,7 @@ DIRS += \ google-breakpad/src/common \ google-breakpad/src/common/mac \ google-breakpad/src/client \ + google-breakpad/src/client/mac/crash_generation \ google-breakpad/src/client/mac/handler \ google-breakpad/src/tools/mac/dump_syms \ $(NULL) diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in new file mode 100644 index 000000000000..0ac754449644 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in @@ -0,0 +1,59 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla Breakpad integration +# +# The Initial Developer of the Original Code is +# The Mozilla Foundation +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Ted Mielczarek +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = crash_generation +LIBRARY_NAME = crash_generation_s +XPI_NAME = crashreporter + +LOCAL_INCLUDES = -I$(srcdir)/../../.. + +CPPSRCS = \ + crash_generation_client.cc \ + crash_generation_server.cc \ + $(NULL) + +# need static lib +FORCE_STATIC_LIB = 1 + +include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index 06169b4f08c0..3233455b898e 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -63,6 +63,10 @@ CMSRCS = \ HTTPMultipartUpload.m \ $(NULL) +CMMSRCS = \ + MachIPC.mm \ + $(NULL) + HOST_CPPSRCS = $(CPPSRCS) HOST_CMMSRCS = \ @@ -73,3 +77,5 @@ HOST_CMMSRCS = \ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk + +COMPILE_CMFLAGS += -std=c99 diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index 05f584d06e1f..69ac36e5568e 100644 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -570,8 +570,12 @@ nsresult SetExceptionHandler(nsILocalFile* aXREDirectory, #if defined(XP_WIN32) google_breakpad::ExceptionHandler::HANDLER_ALL); #else - true); + true #endif +#if defined(XP_MACOSX) + , NULL +#endif + ); if (!gExceptionHandler) return NS_ERROR_OUT_OF_MEMORY; diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index df2451ec3a13..141c68b7adee 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -154,6 +154,7 @@ endif ifeq ($(OS_ARCH),Darwin) SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ + $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) From 3f7bf2f258a34feed644beb479eff1176dee590d Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Mon, 16 Aug 2010 15:05:09 -0400 Subject: [PATCH 092/109] bug 559228 - Implement multi-process crash reporting on Mac. r=bsmedberg a=blocking --HG-- extra : rebase_source : 83e8073a3c8e47f8fec39b123221f80db89941e7 --- ipc/app/MozillaRuntimeMain.cpp | 6 +- ipc/glue/GeckoChildProcessHost.cpp | 4 +- toolkit/crashreporter/nsExceptionHandler.cpp | 102 +++++++++++++------ toolkit/crashreporter/nsExceptionHandler.h | 17 ++-- toolkit/xre/nsEmbedFunctions.cpp | 4 +- 5 files changed, 84 insertions(+), 49 deletions(-) diff --git a/ipc/app/MozillaRuntimeMain.cpp b/ipc/app/MozillaRuntimeMain.cpp index 917656d1c6ec..61c988b93615 100644 --- a/ipc/app/MozillaRuntimeMain.cpp +++ b/ipc/app/MozillaRuntimeMain.cpp @@ -54,13 +54,13 @@ int main(int argc, char* argv[]) { -#if defined(MOZ_CRASHREPORTER) && !defined(XP_MACOSX) +#if defined(MOZ_CRASHREPORTER) if (argc < 2) return 1; const char* const crashReporterArg = argv[--argc]; -# if defined(XP_WIN) - // on windows, |crashReporterArg| is the named pipe on which the +# if defined(XP_WIN) || defined(XP_MACOSX) + // on windows and mac, |crashReporterArg| is the named pipe on which the // server is listening for requests, or "-" if crash reporting is // disabled. if (0 != strcmp("-", crashReporterArg) diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp index 363064660f31..695a9ca870ab 100644 --- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -318,9 +318,7 @@ GeckoChildProcessHost::PerformAsyncLaunch(std::vector aExtraOpts) childArgv.push_back("false"); } # elif defined(XP_MACOSX) - // Call the stub for initialization side effects. Eventually this - // code will be unified with that above. - CrashReporter::CreateNotificationPipeForChild(); + childArgv.push_back(CrashReporter::GetChildNotificationPipe()); # endif // OS_LINUX #endif diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index 69ac36e5568e..99ed68aa159f 100644 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -52,6 +52,10 @@ #include #include #elif defined(XP_MACOSX) +#if defined(MOZ_IPC) +# include "client/mac/crash_generation/client_info.h" +# include "client/mac/crash_generation/crash_generation_server.h" +#endif #include "client/mac/handler/exception_handler.h" #include #include @@ -104,11 +108,8 @@ CFStringRef reporterClientAppID = CFSTR("org.mozilla.crashreporter"); #if defined(MOZ_IPC) #include "nsIUUIDGenerator.h" -#if !defined(XP_MACOSX) using google_breakpad::CrashGenerationServer; using google_breakpad::ClientInfo; -#endif - using mozilla::Mutex; using mozilla::MutexAutoLock; #endif // MOZ_IPC @@ -191,12 +192,10 @@ static nsCString* crashReporterAPIData = nsnull; static nsCString* notesField = nsnull; #if defined(MOZ_IPC) -#if !defined(XP_MACOSX) // OOP crash reporting static CrashGenerationServer* crashServer; // chrome process has this -#endif -# if defined(XP_WIN) +# if defined(XP_WIN) || defined(XP_MACOSX) // If crash reporting is disabled, we hand out this "null" pipe to the // child process and don't attempt to connect to a parent server. static const char kNullNotifyPipe[] = "-"; @@ -206,6 +205,7 @@ static char* childCrashNotifyPipe; static int serverSocketFd = -1; static int clientSocketFd = -1; static const int kMagicChildCrashReportFd = 42; + # endif // |dumpMapLock| must protect all access to |pidToMinidump|. @@ -571,11 +571,11 @@ nsresult SetExceptionHandler(nsILocalFile* aXREDirectory, google_breakpad::ExceptionHandler::HANDLER_ALL); #else true -#endif #if defined(XP_MACOSX) , NULL #endif ); +#endif // XP_WIN32 if (!gExceptionHandler) return NS_ERROR_OUT_OF_MEMORY; @@ -604,11 +604,7 @@ nsresult SetExceptionHandler(nsILocalFile* aXREDirectory, bool GetEnabled() { -#if defined(XP_MACOSX) - return gExceptionHandler != nsnull; -#else return gExceptionHandler != nsnull && !gExceptionHandler->IsOutOfProcess(); -#endif } bool GetMinidumpPath(nsAString& aPath) @@ -1469,16 +1465,27 @@ MoveToPending(nsIFile* dumpFile, nsIFile* extraFile) NS_SUCCEEDED(extraFile->MoveTo(pendingDir, EmptyString())); } -#if !defined(XP_MACOSX) static void OnChildProcessDumpRequested(void* aContext, +#ifdef XP_MACOSX + const ClientInfo& aClientInfo, + const xpstring& aFilePath +#else const ClientInfo* aClientInfo, - const xpstring* aFilePath) + const xpstring* aFilePath +#endif + ) { nsCOMPtr minidump; nsCOMPtr extraFile; - CreateFileFromPath(*aFilePath, getter_AddRefs(minidump)); + CreateFileFromPath( +#ifdef XP_MACOSX + aFilePath, +#else + *aFilePath, +#endif + getter_AddRefs(minidump)); if (!WriteExtraForMinidump(minidump, Blacklist(kSubprocessBlacklist, @@ -1490,13 +1497,17 @@ OnChildProcessDumpRequested(void* aContext, MoveToPending(minidump, extraFile); { - PRUint32 pid = aClientInfo->pid(); + PRUint32 pid = +#ifdef XP_MACOSX + aClientInfo.pid(); +#else + aClientInfo->pid(); +#endif MutexAutoLock lock(*dumpMapLock); pidToMinidump->Put(pid, minidump); } } -#endif // XP_MACOSX static bool OOPInitialized() @@ -1539,12 +1550,23 @@ OOPInit() NULL, NULL, // we don't care about process exit here true, // automatically generate dumps &dumpPath); + +#elif defined(XP_MACOSX) + childCrashNotifyPipe = + PR_smprintf("gecko-crash-server-pipe.%i", + static_cast(getpid())); + const std::string dumpPath = gExceptionHandler->dump_path(); + + crashServer = new CrashGenerationServer( + childCrashNotifyPipe, + OnChildProcessDumpRequested, NULL, + NULL, NULL, + true, // automatically generate dumps + dumpPath); #endif -#if !defined(XP_MACOSX) if (!crashServer->Start()) NS_RUNTIMEABORT("can't start crash reporter server()"); -#endif pidToMinidump = new ChildMinidumpMap(); pidToMinidump->Init(); @@ -1560,10 +1582,8 @@ OOPDeinit() return; } -#if !defined(XP_MACOSX) delete crashServer; crashServer = NULL; -#endif delete dumpMapLock; dumpMapLock = NULL; @@ -1577,7 +1597,7 @@ OOPDeinit() #endif } -#if defined(XP_WIN) +#if defined(XP_WIN) || defined(XP_MACOSX) // Parent-side API for children const char* GetChildNotificationPipe() @@ -1590,7 +1610,9 @@ GetChildNotificationPipe() return childCrashNotifyPipe; } +#endif +#if defined(XP_WIN) // Child-side API bool SetRemoteExceptionHandler(const nsACString& crashPipe) @@ -1657,11 +1679,26 @@ SetRemoteExceptionHandler() //-------------------------------------------------- #elif defined(XP_MACOSX) -void -CreateNotificationPipeForChild() +// Child-side API +bool +SetRemoteExceptionHandler(const nsACString& crashPipe) { - if (GetEnabled() && !OOPInitialized()) - OOPInit(); + // crash reporting is disabled + if (crashPipe.Equals(kNullNotifyPipe)) + return true; + + NS_ABORT_IF_FALSE(!gExceptionHandler, "crash client already init'd"); + + gExceptionHandler = new google_breakpad:: + ExceptionHandler("", + NULL, // no filter callback + NULL, // no minidump callback + NULL, // no callback context + true, // install signal handlers + crashPipe.BeginReading()); + + // we either do remote or nothing, no fallback to regular crash reporting + return gExceptionHandler->IsOutOfProcess(); } #endif // XP_WIN @@ -1726,7 +1763,7 @@ CurrentThreadId() #elif defined(XP_LINUX) return sys_gettid(); #elif defined(XP_MACOSX) - return -1; + return mach_thread_self(); #else # error "Unsupported platform" #endif @@ -1739,12 +1776,11 @@ CreatePairedMinidumps(ProcessHandle childPid, nsILocalFile** childDump, nsILocalFile** parentDump) { - if (!GetEnabled()) - return false; - -#if defined(XP_MACOSX) +#ifdef XP_MACOSX return false; #else + if (!GetEnabled()) + return false; // create the UUID for the hang dump as a pair nsresult rv; @@ -1788,7 +1824,9 @@ CreatePairedMinidumps(ProcessHandle childPid, { &parentMinidump, &parentExtra, parentBlacklist }; if (!google_breakpad::ExceptionHandler::WriteMinidump( gExceptionHandler->dump_path(), +#ifndef XP_MACOSX true, // write exception stream +#endif PairedDumpCallback, &parentCtx)) return false; @@ -1805,10 +1843,9 @@ CreatePairedMinidumps(ProcessHandle childPid, parentMinidump.swap(*parentDump); return true; -#endif // XP_MACOSX +#endif } -#if !defined(XP_MACOSX) bool UnsetRemoteExceptionHandler() { @@ -1816,7 +1853,6 @@ UnsetRemoteExceptionHandler() gExceptionHandler = NULL; return true; } -#endif // XP_MACOSX #endif // MOZ_IPC diff --git a/toolkit/crashreporter/nsExceptionHandler.h b/toolkit/crashreporter/nsExceptionHandler.h index d4f916612a58..b561be3ca228 100644 --- a/toolkit/crashreporter/nsExceptionHandler.h +++ b/toolkit/crashreporter/nsExceptionHandler.h @@ -52,6 +52,10 @@ #include #endif +#if defined(XP_MACOSX) +#include +#endif + namespace CrashReporter { nsresult SetExceptionHandler(nsILocalFile* aXREDirectory, bool force=false); nsresult UnsetExceptionHandler(); @@ -94,9 +98,13 @@ nsresult SetSubmitReports(PRBool aSubmitReport); bool TakeMinidumpForChild(PRUint32 childPid, nsILocalFile** dump NS_OUTPARAM); -#ifdef XP_WIN +#if defined(XP_WIN) typedef HANDLE ProcessHandle; typedef DWORD ThreadId; +#elif defined(XP_MACOSX) +//FIXME: mach_port_t +typedef int ProcessHandle; +typedef mach_port_t ThreadId; #else typedef int ProcessHandle; typedef int ThreadId; @@ -123,7 +131,7 @@ bool CreatePairedMinidumps(ProcessHandle childPid, nsILocalFile** childDump NS_OUTPARAM, nsILocalFile** parentDump NS_OUTPARAM); -# if defined(XP_WIN32) +# if defined(XP_WIN32) || defined(XP_MACOSX) // Parent-side API for children const char* GetChildNotificationPipe(); @@ -146,11 +154,6 @@ bool CreateNotificationPipeForChild(int* childCrashFd, int* childCrashRemapFd); // Child-side API bool SetRemoteExceptionHandler(); -# elif defined(XP_MACOSX) -// When OOP crash reporting is implemented for Mac, it will almost -// certainly use the same interface as the linux code above. Until -// then, we provide stubs. -void CreateNotificationPipeForChild(); #endif // XP_WIN32 bool UnsetRemoteExceptionHandler(); diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index 6ace326f569f..32ba8403c02c 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -258,11 +258,10 @@ XRE_TakeMinidumpForChild(PRUint32 aChildPid, nsILocalFile** aDump) return CrashReporter::TakeMinidumpForChild(aChildPid, aDump); } -#if !defined(XP_MACOSX) PRBool XRE_SetRemoteExceptionHandler(const char* aPipe/*= 0*/) { -#if defined(XP_WIN) +#if defined(XP_WIN) || defined(XP_MACOSX) return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe)); #elif defined(OS_LINUX) return CrashReporter::SetRemoteExceptionHandler(); @@ -270,7 +269,6 @@ XRE_SetRemoteExceptionHandler(const char* aPipe/*= 0*/) # error "OOP crash reporter unsupported on this platform" #endif } -#endif // !XP_MACOSX #endif // if defined(MOZ_CRASHREPORTER) #if defined(XP_WIN) From 053eb5ce3516f838eb731d16c84a3c17312e976b Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Mon, 16 Aug 2010 15:25:13 -0400 Subject: [PATCH 093/109] Bug 587406 - Crashes inside window procedures on Windows 64 get eaten, r=ted/jeffm --- widget/src/windows/nsWindow.cpp | 24 +++++++++++++++++++++++- widget/src/windows/nsWindow.h | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 650d81c20630..7dbb3fe72fb6 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -4182,8 +4182,30 @@ nsWindow::IPCWindowProcHandler(UINT& msg, WPARAM& wParam, LPARAM& lParam) * **************************************************************/ -// The WndProc procedure for all nsWindows in this toolkit +static int ReportException(EXCEPTION_POINTERS *aExceptionInfo) +{ +#ifdef MOZ_CRASHREPORTER + nsCOMPtr cr = + do_GetService("@mozilla.org/toolkit/crash-reporter;1"); + if (cr) + cr->WriteMinidumpForException(aExceptionInfo); +#endif + return EXCEPTION_EXECUTE_HANDLER; +} + +// The WndProc procedure for all nsWindows in this toolkit. This merely catches +// exceptions and passes the real work to WindowProcInternal LRESULT CALLBACK nsWindow::WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + __try { + return WindowProcInternal(hWnd, msg, wParam, lParam); + } + __except(ReportException(GetExceptionInformation())) { + ::TerminateProcess(::GetCurrentProcess(), 253); + } +} + +LRESULT CALLBACK nsWindow::WindowProcInternal(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { NS_TIME_FUNCTION_MIN_FMT(5.0, "%s (line %d) (hWnd: %p, msg: %p, wParam: %p, lParam: %p", MOZ_FUNCTION_NAME, __LINE__, hWnd, msg, diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index 20d37b560c2d..d6212eefc4f4 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -277,6 +277,8 @@ protected: * Callbacks */ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + static LRESULT CALLBACK WindowProcInternal(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + static BOOL CALLBACK BroadcastMsgToChildren(HWND aWnd, LPARAM aMsg); static BOOL CALLBACK BroadcastMsg(HWND aTopWindow, LPARAM aMsg); static BOOL CALLBACK DispatchStarvedPaints(HWND aTopWindow, LPARAM aMsg); From 4062274cceadfebe2378da281ae2f9e44db9c7f0 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Mon, 16 Aug 2010 15:28:18 -0400 Subject: [PATCH 094/109] Add a comment mentioning bug 587406, per jeffm. --- widget/src/windows/nsWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 7dbb3fe72fb6..1021344354a6 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -4194,7 +4194,8 @@ static int ReportException(EXCEPTION_POINTERS *aExceptionInfo) } // The WndProc procedure for all nsWindows in this toolkit. This merely catches -// exceptions and passes the real work to WindowProcInternal +// exceptions and passes the real work to WindowProcInternal. See bug 587406 +// and http://msdn.microsoft.com/en-us/library/ms633573%28VS.85%29.aspx LRESULT CALLBACK nsWindow::WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { __try { From 36b65f9ee11e24ca735e4babd46a746913e6ec0b Mon Sep 17 00:00:00 2001 From: Frank Yan Date: Mon, 16 Aug 2010 16:33:32 -0400 Subject: [PATCH 095/109] Bug 587267 - Display the Firefox button when in TabView; r=dao approval2.0=gavin.sharp --- browser/base/content/browser.xul | 8 ++++---- browser/base/content/tabview/ui.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 79d2c37ae271..b737591546d2 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -102,10 +102,7 @@