Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip some debug code that made it in by accident

Browse Source
This commit is contained in:
Vladimir Vukicevic 2009-07-17 16:04:05 -07:00
parent 69fed5bbfb
commit 895e662780
1 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
widget/src/windows/nsWindowGfx.cpp
View File

@ -73,10 +73,6 @@ extern "C" {
#include "pixman.h"
}
#ifdef DEBUG_vladimir
#include "nsFunctionTimer.h"
#endif
/**************************************************************
**************************************************************
**
@ -328,13 +324,6 @@ PRBool nsWindow::OnPaint(HDC aDC)
#endif
}
#ifdef DEBUG_vladimir
nsFunctionTimer ft("OnPaint [%d %d %d %d]",
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right - ps.rcPaint.left,
ps.rcPaint.bottom - ps.rcPaint.top);
#endif
nsCOMPtr<nsIRegion> paintRgnWin;
if (paintRgn) {
paintRgnWin = nsWindowGfx::ConvertHRGNToRegion(paintRgn);
@ -489,18 +478,10 @@ DDRAW_FAILED:
return PR_FALSE;
}
#ifdef DEBUG_vladimir
ft.Mark("Init");
#endif
event.renderingContext = rc;
result = DispatchWindowEvent(&event, eventStatus);
event.renderingContext = nsnull;
#ifdef DEBUG_vladimir
ft.Mark("Dispatch");
#endif
#ifdef MOZ_XUL
if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI) &&
eTransparencyTransparent == mTransparencyMode) {
@ -631,14 +612,6 @@ DDRAW_FAILED:
DIB_RGB_COLORS,
SRCCOPY);
}
#ifdef DEBUG_vladimir
ft.Mark("Blit");
#endif
} else {
#ifdef DEBUG_vladimir
ft.Mark("Discard!");
#endif
}
}
@ -692,12 +665,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
HRGN paintRgn = ::CreateRectRgn(ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right, ps.rcPaint.bottom);
#ifdef DEBUG_vladimir
nsFunctionTimer ft("OnPaint [%d %d %d %d]",
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right - ps.rcPaint.left,
ps.rcPaint.bottom - ps.rcPaint.top);
#endif
nsCOMPtr<nsIRegion> paintRgnWin;
if (paintRgn) {
@ -787,17 +754,10 @@ PRBool nsWindow::OnPaintImageDDraw16()
goto cleanup;
}
#ifdef DEBUG_vladimir
ft.Mark("Init");
#endif
event.renderingContext = rc;
result = DispatchWindowEvent(&event, eventStatus);
event.renderingContext = nsnull;
#ifdef DEBUG_vladimir
ft.Mark("Dispatch");
#endif
if (!result) {
printf("result is null from dispatch\n");
goto cleanup;
@ -812,9 +772,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
goto cleanup;
}
#ifdef DEBUG_vladimir
ft.Mark("Locked");
#endif
// Convert RGB24 -> RGB565
pixman_image_t *srcPixmanImage = pixman_image_create_bits(PIXMAN_x8r8g8b8,
surfaceSize.width,
@ -828,10 +785,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
(uint32_t*) gDDSDSecondary.lpSurface,
gDDSDSecondary.dwWidth * 2);
#ifdef DEBUG_vladimir
ft.Mark("created pixman images");
#endif
pixman_image_composite(PIXMAN_OP_SRC,
srcPixmanImage,
NULL,
@ -845,10 +798,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
pixman_image_unref(dstPixmanImage);
pixman_image_unref(srcPixmanImage);
#ifdef DEBUG_vladimir
ft.Mark("composite");
#endif
hr = glpDDSecondary->Unlock(0);
if (FAILED(hr)) {
#ifdef DEBUG
@ -857,10 +806,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
goto cleanup;
}
#ifdef DEBUG_vladimir
ft.Mark("unlock");
#endif
hr = glpDDClipper->SetHWnd(0, mWnd);
if (FAILED(hr)) {
#ifdef DEBUG
@ -869,18 +814,10 @@ PRBool nsWindow::OnPaintImageDDraw16()
goto cleanup;
}
#ifdef DEBUG_vladimir
ft.Mark("sethwnd");
#endif
// translate the paint region to screen coordinates
renderArea = ps.rcPaint;
MapWindowPoints(mWnd, 0, (LPPOINT)&renderArea, 2);
#ifdef DEBUG_vladimir
ft.Mark("preblt");
#endif
// set the rect to be 0,0 based
ps.rcPaint.right = surfaceSize.width;
ps.rcPaint.bottom = surfaceSize.height;
@ -898,10 +835,6 @@ PRBool nsWindow::OnPaintImageDDraw16()
goto cleanup;
}
#ifdef DEBUG_vladimir
ft.Mark("Blit");
#endif
cleanup:
::EndPaint(mWnd, &ps);