From: HeeJu Kang Date: Thu, 30 May 2013 05:23:04 +0000 (+0900) Subject: Fix dump image X-Git-Tag: submit/tizen_2.2/20130714.153040~47^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4089a0a5f09fa2027cdad95fd168fa3aef3f803;p=framework%2Fosp%2Fshell.git Fix dump image Change-Id: I3098dae50015e438b343f110aacebb7be503f464 Signed-off-by: HeeJu Kang --- diff --git a/src/FShell_AppWidgetBuffer.cpp b/src/FShell_AppWidgetBuffer.cpp index fb9283a..7c47b76 100644 --- a/src/FShell_AppWidgetBuffer.cpp +++ b/src/FShell_AppWidgetBuffer.cpp @@ -211,11 +211,12 @@ _AppWidgetBuffer::GetPixmap(void) const } void -_AppWidgetBuffer::Dump(void) +_AppWidgetBuffer::Dump(const char* pName) { + SysTryReturnVoidResult(NID_SHELL, pName, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid."); SysTryReturnVoidResult(NID_SHELL, __pBuffer, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient."); - return __pBuffer->Dump(); + return __pBuffer->Dump(pName); } _AppWidgetBuffer::_Buffer::_Buffer(_AppWidgetBuffer* pAppWidgetBuffer) @@ -290,7 +291,7 @@ _AppWidgetBuffer::_Buffer::GetPixmap(void) const } void -_AppWidgetBuffer::_Buffer::Dump(void) +_AppWidgetBuffer::_Buffer::Dump(const char* pName) { void* pBuffer = null; bool lock = false; @@ -310,7 +311,7 @@ _AppWidgetBuffer::_Buffer::Dump(void) char fileName[1024]; memset(fileName, 0, sizeof(fileName)); - snprintf(fileName, sizeof(fileName), "./dump%d.raw", __dumpFileIndex++); + snprintf(fileName, sizeof(fileName), "./dump-%s-%d.raw", pName, __dumpFileIndex++); FILE* pFile = fopen(fileName, "w+b"); if (pFile) diff --git a/src/FShell_AppWidgetBuffer.h b/src/FShell_AppWidgetBuffer.h index 9880fdb..314eed3 100644 --- a/src/FShell_AppWidgetBuffer.h +++ b/src/FShell_AppWidgetBuffer.h @@ -69,7 +69,7 @@ public: GC GetGc(void) const; XImage* GetXImage(void) const; Pixmap GetPixmap(void) const; - void Dump(void); + void Dump(const char* pName); private: _AppWidgetBuffer(const _AppWidgetBuffer& rhs); @@ -88,7 +88,7 @@ private: GC GetGc(void) const; XImage* GetXImage(void) const; Pixmap GetPixmap(void) const; - void Dump(void); + void Dump(const char* pName); private: _Buffer(const _Buffer& rhs); diff --git a/src/FShell_AppWidgetLayer.cpp b/src/FShell_AppWidgetLayer.cpp index feb08a5..3ac414a 100644 --- a/src/FShell_AppWidgetLayer.cpp +++ b/src/FShell_AppWidgetLayer.cpp @@ -37,7 +37,7 @@ #include "FShell_AppWidgetLayer.h" #include "FShell_AppWidgetProviderManagerImpl.h" -//#define _BUFFER_TEST +//#define _DUMP_BUFFER using namespace std; using namespace Tizen::Base; @@ -99,6 +99,7 @@ namespace Tizen { namespace Shell _AppWidgetLayer::_AppWidgetLayer(const Tizen::Base::String& providerId, const FloatDimension& size) : __isReleased(false) , __size(size) + , __pAppWidgetBuffer(new (std::nothrow) _AppWidgetBuffer) , __pEcoreEvas(null) , __pEvasObject(null) , __providerId(providerId) @@ -106,7 +107,6 @@ _AppWidgetLayer::_AppWidgetLayer(const Tizen::Base::String& providerId, const Fl , __pTempBuffer(null) , __bufferSize(0) , __pixmapId(-1) - , __pAppWidgetBuffer(new (std::nothrow) _AppWidgetBuffer) { } @@ -337,6 +337,10 @@ _AppWidgetLayer::Sync(const FloatDimension& size) { SysTryReturn(NID_SHELL, !__providerId.IsEmpty(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid."); +#if defined(_DUMP_BUFFER) + __pAppWidgetBuffer->Dump("Box"); +#endif //_DUMP_BUFFER + result r = _AppWidgetProviderManagerImpl::GetInstance()->RequestSyncSharedMemory(__providerId, size.width, size.height); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/FShell_AppWidgetLayer.h b/src/FShell_AppWidgetLayer.h index 2c93156..d74444f 100644 --- a/src/FShell_AppWidgetLayer.h +++ b/src/FShell_AppWidgetLayer.h @@ -79,6 +79,7 @@ private: protected: bool __isReleased; Tizen::Graphics::FloatDimension __size; + std::unique_ptr<_AppWidgetBuffer> __pAppWidgetBuffer; private: struct _EcoreEvasDeleter @@ -104,7 +105,6 @@ private: void* __pTempBuffer; int __bufferSize; int __pixmapId; - std::unique_ptr<_AppWidgetBuffer> __pAppWidgetBuffer; }; }} // Tizen::Shell diff --git a/src/FShell_AppWidgetViewManager.cpp b/src/FShell_AppWidgetViewManager.cpp index 02f6c2b..9873d31 100644 --- a/src/FShell_AppWidgetViewManager.cpp +++ b/src/FShell_AppWidgetViewManager.cpp @@ -380,7 +380,7 @@ _AppWidgetViewManager::IsGlMode(void) const } void -_AppWidgetViewManager::DumpBuffer(unsigned int pixmap) +_AppWidgetViewManager::DumpBuffer(unsigned int pixmap, const char* pName) { if (__pAppWidgetBuffer->GetPixmap() != pixmap) { @@ -394,13 +394,13 @@ _AppWidgetViewManager::DumpBuffer(unsigned int pixmap) __pAppWidgetBuffer->DeallocBuffer(); __pAppWidgetBuffer->AllocBuffer(pixmap, FloatDimension(width, height)); - __pAppWidgetBuffer->Dump(); + __pAppWidgetBuffer->Dump(pName); __pAppWidgetBuffer->UnlockBuffer(); } else { __pAppWidgetBuffer->LockBuffer(); - __pAppWidgetBuffer->Dump(); + __pAppWidgetBuffer->Dump(pName); __pAppWidgetBuffer->UnlockBuffer(); } } @@ -456,7 +456,7 @@ _AppWidgetViewManager::OnAppWidgetUpdated(livebox* pAppWidget) pAppWidgetView->OnAppWidgetUpdated(pixmap); #if defined(_DUMP_BUFFER) - DumpBuffer(pixmap); + DumpBuffer(pixmap, "Box"); #endif // _DUMP_BUFFER } else @@ -531,7 +531,7 @@ _AppWidgetViewManager::OnAppWidgetPopupUpdated(livebox* pAppWidget) Pixmap pixmap = livebox_pd_pixmap(pAppWidget); pAppWidgetPopupView->OnAppWidgetUpdated(pixmap); #if defined(_DUMP_BUFFER) - DumpBuffer(pixmap); + DumpBuffer(pixmap, "Popup"); #endif // _DUMP_BUFFER } else diff --git a/src/FShell_AppWidgetViewManager.h b/src/FShell_AppWidgetViewManager.h index 41b1e77..e09dc49 100644 --- a/src/FShell_AppWidgetViewManager.h +++ b/src/FShell_AppWidgetViewManager.h @@ -78,7 +78,7 @@ private: Tizen::Graphics::Bitmap* GetBitmapN(const Tizen::Base::String& fileName) const; Tizen::Graphics::Bitmap* GetBitmapN(void* pBuffer, const Tizen::Graphics::FloatDimension& size) const; bool IsGlMode(void) const; - void DumpBuffer(unsigned int pixmap); + void DumpBuffer(unsigned int pixmap, const char* pName); void OnAppWidgetCreated(livebox* pAppWidget); void OnAppWidgetUpdated(livebox* pAppWidget);