|
 |
f325b2 |
From 74d4aa83ab2a936b4210dc249531240087e2fc84 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 6 Oct 2015 10:47:03 +0200
|
|
|
f325b2 |
Subject: [PATCH 182/398] lokdocview: log paintTile() arguments
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I8015c8030c1c7f53ae1de053fe268a33464834ad
|
|
|
f325b2 |
(cherry picked from commit 23ac7f2fb57c338fa608cbc28ac39d140026e3c3)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 1 -
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 14 +++++++-------
|
|
|
f325b2 |
libreofficekit/source/gtk/tilebuffer.cxx | 1 -
|
|
|
f325b2 |
3 files changed, 7 insertions(+), 9 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index ed97a6743b38..3d0b0deba323 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -371,7 +371,6 @@ static void signalCommand(LOKDocView* pLOKDocView, char* pPayload, gpointer /*pD
|
|
|
f325b2 |
{
|
|
|
f325b2 |
std::string aKey = aPayload.substr(0, nPosition);
|
|
|
f325b2 |
std::string aValue = aPayload.substr(nPosition + 1);
|
|
|
f325b2 |
- g_info("signalCommand: '%s' is '%s'", aKey.c_str(), aValue.c_str());
|
|
|
f325b2 |
|
|
|
f325b2 |
if (rWindow.m_aCommandNameToolItems.find(aKey) != rWindow.m_aCommandNameToolItems.end())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 220e488a53a4..4026d958b8ed 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -1395,7 +1395,13 @@ paintTileInThread (gpointer data)
|
|
|
f325b2 |
aTileRectangle.y = pixelToTwip(nTileSizePixels, pLOEvent->m_fPaintTileZoom) * pLOEvent->m_nPaintTileX;
|
|
|
f325b2 |
|
|
|
f325b2 |
priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
|
|
|
f325b2 |
- g_test_timer_start();
|
|
|
f325b2 |
+ std::stringstream ss;
|
|
|
f325b2 |
+ ss << "lok::Document::paintTile(" << static_cast<void*>(pBuffer) << ", "
|
|
|
f325b2 |
+ << nTileSizePixels << ", " << nTileSizePixels << ", "
|
|
|
f325b2 |
+ << aTileRectangle.x << ", " << aTileRectangle.y << ", "
|
|
|
f325b2 |
+ << pixelToTwip(nTileSizePixels, pLOEvent->m_fPaintTileZoom) << ", "
|
|
|
f325b2 |
+ << pixelToTwip(nTileSizePixels, pLOEvent->m_fPaintTileZoom) << ")";
|
|
|
f325b2 |
+ g_info(ss.str().c_str());
|
|
|
f325b2 |
priv->m_pDocument->pClass->paintTile(priv->m_pDocument,
|
|
|
f325b2 |
pBuffer,
|
|
|
f325b2 |
nTileSizePixels, nTileSizePixels,
|
|
|
f325b2 |
@@ -1403,12 +1409,6 @@ paintTileInThread (gpointer data)
|
|
|
f325b2 |
pixelToTwip(nTileSizePixels, pLOEvent->m_fPaintTileZoom),
|
|
|
f325b2 |
pixelToTwip(nTileSizePixels, pLOEvent->m_fPaintTileZoom));
|
|
|
f325b2 |
|
|
|
f325b2 |
- double elapsedTime = g_test_timer_elapsed();
|
|
|
f325b2 |
- g_info ("Rendered (%d, %d) in %f seconds",
|
|
|
f325b2 |
- pLOEvent->m_nPaintTileX,
|
|
|
f325b2 |
- pLOEvent->m_nPaintTileY,
|
|
|
f325b2 |
- elapsedTime);
|
|
|
f325b2 |
-
|
|
|
f325b2 |
//create a mapping for it
|
|
|
f325b2 |
buffer.m_mTiles[index].setPixbuf(pPixBuf);
|
|
|
f325b2 |
buffer.m_mTiles[index].valid = true;
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
index 687ef44d6468..0e81bc33f262 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
@@ -64,7 +64,6 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,
|
|
|
f325b2 |
GThreadPool* lokThreadPool)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
int index = x * m_nWidth + y;
|
|
|
f325b2 |
- g_info("Setting tile invalid (%d, %d)", x, y);
|
|
|
f325b2 |
if (m_mTiles.find(index) != m_mTiles.end())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
m_mTiles[index].valid = false;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|