Fix for issue

Change-Id: I2eaffbfbe22ccc4e918a822e806bad11752b568c
Signed-off-by: hyun lee <hyunn.lee@samsung.com>

diff --git a/src/controls/FWebCtrl_Utility.cpp b/src/controls/FWebCtrl_Utility.cpp
index 8f8b6ad..78e7b2c 100755 (executable)
--- a/src/controls/FWebCtrl_Utility.cpp
+++ b/src/controls/FWebCtrl_Utility.cpp
@@ -22,20 +22,22 @@
  * The file contains the definition of _Utility class.\r
  */\r
 \r
+#include <unique_ptr.h>\r
 #include <Ecore.h>\r
-#include <FAppUiApp.h>
-#include <FAppIAppFrame.h>
+#include <FAppUiApp.h>\r
+#include <FAppIAppFrame.h>\r
 #include <FBaseSysLog.h>\r
+#include <FApp_AppInfo.h>\r
 #include <FUiAnim_EflNode.h>\r
-#include <FUiAnim_VisualElementImpl.h>
-#include <FUiCtrlFrame.h>
+#include <FUiAnim_VisualElementImpl.h>\r
+#include <FUiCtrlFrame.h>\r
 #include <FUi_ControlImpl.h>\r
 #include "FWebCtrl_Utility.h"\r
 \r
 using namespace Tizen::App;\r
 using namespace Tizen::Base;\r
 using namespace Tizen::Graphics;\r
-using namespace Tizen::Ui;
+using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Controls;\r
 using namespace Tizen::Ui::Animations;\r
 \r
@@ -43,6 +45,9 @@ namespace Tizen { namespace Web { namespace Controls
 {\r
 \r
 \r
+static const float SEVICE_APP_FRAME_SIZE = 200;\r
+\r
+\r
 _Utility::_Utility(void)\r
 {\r
 }\r
@@ -55,25 +60,37 @@ _Utility::~_Utility(void)
 Evas*\r
 _Utility::GetEvasFromUiApp()\r
 {\r
-       IAppFrame* pAppFrame = Application::GetInstance()->GetAppFrame();
-       SysTryReturn(NID_WEB_CTRL, pAppFrame, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       Frame* pFrame = pAppFrame->GetFrame();
-       SysTryReturn(NID_WEB_CTRL, pFrame, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       _ControlImpl* pControlimpl = _ControlImpl::GetInstance(*pFrame);
-       SysTryReturn(NID_WEB_CTRL, pControlimpl, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       VisualElement* pVisual = pControlimpl->GetCore().GetVisualElement();
-       SysTryReturn(NID_WEB_CTRL, pVisual, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       _VisualElementImpl* pWebVisualElementImpl = _VisualElementImpl::GetInstance(*pVisual);
-       SysTryReturn(NID_WEB_CTRL,pWebVisualElementImpl, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       _EflNode* pEflNode = dynamic_cast< _EflNode* >(pWebVisualElementImpl->GetNativeNode());
-       SysTryReturn(NID_WEB_CTRL, pEflNode, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       Evas* pEvas = pEflNode->GetEvas();
+       std::unique_ptr<Frame> pFrame;\r
+\r
+       if (_AppInfo::GetAppType() == _APP_TYPE_UI_APP)\r
+       {\r
+               IAppFrame* pAppFrame = Application::GetInstance()->GetAppFrame();\r
+               SysTryReturn(NID_WEB_CTRL, pAppFrame, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+               pFrame = std::unique_ptr<Frame>(pAppFrame->GetFrame());\r
+               SysTryReturn(NID_WEB_CTRL, pFrame, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+               pFrame.release();\r
+       }\r
+       else\r
+       {\r
+               pFrame = std::unique_ptr<Frame>(new (std::nothrow) Frame());\r
+               pFrame->Construct(Rectangle(0, 0, SEVICE_APP_FRAME_SIZE, SEVICE_APP_FRAME_SIZE));\r
+       }\r
+\r
+       _ControlImpl* pControlimpl = _ControlImpl::GetInstance(*pFrame);\r
+       SysTryReturn(NID_WEB_CTRL, pControlimpl, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+       VisualElement* pVisual = pControlimpl->GetCore().GetVisualElement();\r
+       SysTryReturn(NID_WEB_CTRL, pVisual, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+       _VisualElementImpl* pWebVisualElementImpl = _VisualElementImpl::GetInstance(*pVisual);\r
+       SysTryReturn(NID_WEB_CTRL,pWebVisualElementImpl, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+       _EflNode* pEflNode = dynamic_cast< _EflNode* >(pWebVisualElementImpl->GetNativeNode());\r
+       SysTryReturn(NID_WEB_CTRL, pEflNode, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
+\r
+       Evas* pEvas = pEflNode->GetEvas();\r
        SysTryReturn(NID_WEB_CTRL, pEvas, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));\r
 \r
        return pEvas;\r
@@ -146,25 +163,25 @@ _Utility::GetPixelBufferFromEvasObject(const Evas_Object* source, Tizen::Graphic
 }\r
 \r
 \r
-String
+String\r
 _Utility::CreateOrigin(const Ewk_Security_Origin* pSecurityOrigin)\r
-{
+{\r
        String protocol(ewk_security_origin_protocol_get(pSecurityOrigin));\r
        String host(ewk_security_origin_host_get(pSecurityOrigin));\r
        int port = ewk_security_origin_port_get(pSecurityOrigin);\r
-
-       String origin = protocol + L"://" + host;
-
-       if (port)
-       {
-               origin.Append(L":");
-               origin.Append(port);
-       }
-
-       SysLog(NID_WEB_CTRL, "The current value of origin is %ls", origin.GetPointer());
-
-       return origin;
-}
+\r
+       String origin = protocol + L"://" + host;\r
+\r
+       if (port)\r
+       {\r
+               origin.Append(L":");\r
+               origin.Append(port);\r
+       }\r
+\r
+       SysLog(NID_WEB_CTRL, "The current value of origin is %ls", origin.GetPointer());\r
+\r
+       return origin;\r
+}\r
 \r
 \r
 }}}\r