fix bug OnWebPageBlockSelected()
authorSeongjun Yim <se201.yim@samsung.com>
Mon, 1 Apr 2013 09:14:30 +0000 (18:14 +0900)
committerSeongjun Yim <se201.yim@samsung.com>
Mon, 1 Apr 2013 09:30:04 +0000 (18:30 +0900)
Change-Id: I89ebfc071bbb9c819faf96f84ff1e028d11a5dab
Signed-off-by: Seongjun Yim <se201.yim@samsung.com>
src/controls/FWebCtrl_WebImpl.cpp

index 395ec43..1280cb0 100755 (executable)
@@ -1332,20 +1332,23 @@ FireWebPageBlockSelectedEvent(_WebImpl* pImpl)
 
        pImpl->GetBlockRange(*startPoint.get(), *endPoint.get());
 
-       std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED));
-       SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
+       if ((endPoint->x != 0) && (endPoint->y != 0))
+       {
+               std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED));
+               SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-       r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       startPoint.release();
+               r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               startPoint.release();
 
-       r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       endPoint.release();
+               r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               endPoint.release();
 
-       r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       pEventArg.release();
+               r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               pEventArg.release();
+       }
 
        return E_SUCCESS;
 }
@@ -1363,20 +1366,23 @@ FireWebPageBlockSelectedEventF(_WebImpl* pImpl)
 
        pImpl->GetBlockRange(*startPoint.get(), *endPoint.get());
 
-       std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED_FLOAT));
-       SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
+       if ((endPoint->x != 0.0f) && (endPoint->y != 0.0f))
+       {
+               std::unique_ptr<_WebUiEventArg> pEventArg(new (std::nothrow) _WebUiEventArg(WEB_EVENT_WEBUIEVENTLISTENER_PAGE_BLOCK_SELECTED_FLOAT));
+               SysTryReturnResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "Memory Allocation failed.");
 
-       r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       startPoint.release();
+               r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_START, *startPoint.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               startPoint.release();
 
-       r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       endPoint.release();
+               r = pEventArg->SetEventInfo(_WebUiEventArg::BLOCK_END, *endPoint.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               endPoint.release();
 
-       r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       pEventArg.release();
+               r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
+               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               pEventArg.release();
+       }
 
        return E_SUCCESS;
 }