Fix build warnings 7

Change-Id: I83658ba3c91496b1b5314edb348af7b093614b25

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 749099b..ceaaf2b 100755 (executable)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -219,6 +219,9 @@ static ExceptionCode exceptionCodeForMediaKeyException(MediaPlayer::MediaKeyExce
 HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* document, bool createdByParser)
     : HTMLElement(tagName, document)
     , ActiveDOMObject(document, this)
+#if ENABLE(TIZEN_DEVICE_ROTATION)
+    , m_rotation(ROTATE_0)
+#endif
     , m_loadTimer(this, &HTMLMediaElement::loadTimerFired)
     , m_progressEventTimer(this, &HTMLMediaElement::progressEventTimerFired)
     , m_playbackProgressTimer(this, &HTMLMediaElement::playbackProgressTimerFired)
@@ -289,9 +292,6 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* docum
 #if ENABLE(TIZEN_GSTREAMER_VIDEO)
     , m_suspended(false)
 #endif
-#if ENABLE(TIZEN_DEVICE_ROTATION)
-    , m_rotation(ROTATE_0)
-#endif
 {
     LOG(Media, "HTMLMediaElement::HTMLMediaElement");
     document->registerForMediaVolumeCallbacks(this);

diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
index 6fcde13..eb85774 100755 (executable)
--- a/Source/WebCore/loader/EmptyClients.h
+++ b/Source/WebCore/loader/EmptyClients.h
@@ -183,7 +183,7 @@ public:
     virtual void reachedMaxAppCacheSize(int64_t) { }
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) { }
 #if ENABLE(TIZEN_APPLICATION_CACHE)
-    virtual bool requestApplicationCachePermission(Frame*) { }
+    virtual bool requestApplicationCachePermission(Frame*) { return false; }
 #endif
 
 #if ENABLE(DIRECTORY_UPLOAD)
@@ -234,11 +234,11 @@ public:
 #endif
 
 #if ENABLE(TIZEN_INDEXED_DATABASE)
-    virtual bool exceededIndexedDatabaseQuota(Frame*, int64_t) { }
+    virtual bool exceededIndexedDatabaseQuota(Frame*, int64_t) { return false; }
 #endif
 
 #if ENABLE(TIZEN_FILE_SYSTEM)
-    virtual bool exceededLocalFileSystemQuota(Frame* frame, int64_t currentUsage) { }
+    virtual bool exceededLocalFileSystemQuota(Frame* frame, int64_t currentUsage) { return false; }
 #endif
 
 };

diff --git a/Source/WebCore/platform/efl/tizen/FileSystemTizen.cpp b/Source/WebCore/platform/efl/tizen/FileSystemTizen.cpp
index a0d6f9c..731e711 100644 (file)
--- a/Source/WebCore/platform/efl/tizen/FileSystemTizen.cpp
+++ b/Source/WebCore/platform/efl/tizen/FileSystemTizen.cpp
@@ -62,7 +62,6 @@ bool getDirectorySize(const String& path, long long& size)
             return false;
         }
 
-        bool result;
         if (S_ISDIR(buf.st_mode)) {
             if (!getDirectorySize(absolutePath, size)) {
                 closedir(directory);

diff --git a/Source/WebCore/platform/graphics/gstreamer/tizen/SharedVideoPlatformSurfaceTizen.cpp b/Source/WebCore/platform/graphics/gstreamer/tizen/SharedVideoPlatformSurfaceTizen.cpp
index 53e4bb1..0617193 100644 (file)
--- a/Source/WebCore/platform/graphics/gstreamer/tizen/SharedVideoPlatformSurfaceTizen.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/tizen/SharedVideoPlatformSurfaceTizen.cpp
@@ -144,6 +144,8 @@ void VideoPlatformSurface::copySurface(VideoPlatformSurface* other, SharedVideoP
             xPosition = (m_size.width() - other->m_size.width() * yScale) / 2;
             xScale = yScale;
             break;
+        default:
+            break;
         }
     }
     graphicsContext->translate(xPosition, yPosition);

diff --git a/Source/WebCore/platform/graphics/gstreamer/tizen/VideoLayerTizen.cpp b/Source/WebCore/platform/graphics/gstreamer/tizen/VideoLayerTizen.cpp
index 8454b22..24be59c 100644 (file)
--- a/Source/WebCore/platform/graphics/gstreamer/tizen/VideoLayerTizen.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/tizen/VideoLayerTizen.cpp
@@ -119,11 +119,14 @@ void VideoLayerTizen::syncLayer(VideoLayerTizen* layer)
 }
 
 #if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
+/*
+// Defined but not used.
 static gboolean platformSurfaceUpdateTimeoutCallback(VideoLayerTizen* layer)
 {
     layer->notifySyncRequired();
     return FALSE;
 }
+*/
 
 bool VideoLayerTizen::swapPlatformSurfaces()
 {

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp
index a4fd6ef..be5ed3d 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp
@@ -109,6 +109,8 @@ const char* ewk_intent_action_get(const Ewk_Intent* intent)
 
 #if ENABLE(WEB_INTENTS)
     return intent->action();
+#else
+    return 0;
 #endif
 }
 
@@ -118,6 +120,8 @@ const char* ewk_intent_type_get(const Ewk_Intent* intent)
 
 #if ENABLE(WEB_INTENTS)
     return intent->type();
+#else
+    return 0;
 #endif
 }
 
@@ -127,6 +131,8 @@ const char* ewk_intent_service_get(const Ewk_Intent* intent)
 
 #if ENABLE(WEB_INTENTS)
     return intent->service();
+#else
+    return 0;
 #endif
 }
 

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp
index 0068222..9740205 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp
@@ -95,6 +95,8 @@ const char* ewk_intent_service_action_get(const Ewk_Intent_Service* service)
 
 #if ENABLE(WEB_INTENTS_TAG)
     return service->action();
+#else
+    return 0;
 #endif
 }
 
@@ -104,6 +106,8 @@ const char* ewk_intent_service_type_get(const Ewk_Intent_Service* service)
 
 #if ENABLE(WEB_INTENTS_TAG)
     return service->type();
+#else
+    return 0;
 #endif
 }
 
@@ -113,6 +117,8 @@ const char* ewk_intent_service_href_get(const Ewk_Intent_Service* service)
 
 #if ENABLE(WEB_INTENTS_TAG)
     return service->href();
+#else
+    return 0;
 #endif
 }
 
@@ -122,6 +128,8 @@ const char* ewk_intent_service_title_get(const Ewk_Intent_Service* service)
 
 #if ENABLE(WEB_INTENTS_TAG)
     return service->title();
+#else
+    return 0;
 #endif
 }
 
@@ -131,5 +139,7 @@ const char* ewk_intent_service_disposition_get(const Ewk_Intent_Service* service
 
 #if ENABLE(WEB_INTENTS_TAG)
     return service->disposition();
+#else
+    return 0;
 #endif
 }

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index 8f0ff01..7a61a45 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -261,6 +261,7 @@ static void _ewk_view_smart_changed(Ewk_View_Smart_Data* smartData)
     evas_object_smart_changed(smartData->self);
 }
 
+#if !ENABLE(TIZEN_ICON_DATABASE)
 static void _ewk_view_on_favicon_changed(const char* pageURL, void* eventInfo)
 {
     Evas_Object* ewkView = static_cast<Evas_Object*>(eventInfo);
@@ -273,6 +274,7 @@ static void _ewk_view_on_favicon_changed(const char* pageURL, void* eventInfo)
 
     impl->informIconChange();
 }
+#endif
 
 // Default Event Handling.
 static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* smartData)

diff --git a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
index 554ca35..cc2fafc 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
@@ -123,7 +123,11 @@ public:
 
     bool isDone() const { return m_done; }
 
+#if ENABLE(TIZEN_DAILY_UPVERSIONING)
+    void setDone()
+#else
     bool setDone()
+#endif
     {
         if (m_timer) {
             ecore_timer_del(m_timer);

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/ClipboardHelper.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/ClipboardHelper.cpp
index 38f7f23..37476e4 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/ClipboardHelper.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/ClipboardHelper.cpp
@@ -108,11 +108,11 @@ static Eina_Bool clientMessageCallback(void* data, int type, void* event);
 ClipboardHelper::ClipboardHelper(EwkViewImpl* viewImpl)
     : m_viewImpl(viewImpl)
 #if ENABLE(TIZEN_WEBKIT2_CONTEXT_MENU_CLIPBOARD)
+    , m_clipboardWindowOpened(false)
+    , m_cbhmPropertyChangeHandler(0)
     , m_selectionClearHandler(0)
     , m_selectionNotifyHandler(0)
     , m_clientMessageHandler(0)
-    , m_cbhmPropertyChangeHandler(0)
-    , m_clipboardWindowOpened(false)
 #endif
 {
 #if ENABLE(TIZEN_WEBKIT2_CONTEXT_MENU_CLIPBOARD)
@@ -795,7 +795,6 @@ void ClipboardHelper::pasteClipboardLastItem(bool isContentEditable)
 
 void ClipboardHelper::updateClipboardWindowState(Ecore_X_Event_Window_Property* ev)
 {
-    Ecore_X_Window zone = ecore_x_e_illume_zone_get(ev->win);
     Ecore_X_Illume_Clipboard_State state = ecore_x_e_illume_clipboard_state_get(ev->win);
 
     if (state == ECORE_X_ILLUME_CLIPBOARD_STATE_UNKNOWN)

diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h
index 28c31d1..c70cb8a 100755 (executable)
--- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h
+++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h
@@ -71,6 +71,10 @@ private:
     static void onIMFInputSequenceComplete(void* data, Ecore_IMF_Context*, void* eventInfo);
     static void onIMFPreeditSequenceChanged(void* data, Ecore_IMF_Context*, void* eventInfo);
 
+    EwkViewImpl* m_viewImpl;
+    OwnPtr<Ecore_IMF_Context> m_context;
+    bool m_focused;
+
 #if ENABLE(TIZEN_ISF_PORT)
     void initializeIMFContext(Ecore_IMF_Context*, Ecore_IMF_Input_Panel_Layout);
 
@@ -90,10 +94,6 @@ private:
     int m_state;
     WebCore::IntRect m_imeRect;
 #endif
-
-    EwkViewImpl* m_viewImpl;
-    OwnPtr<Ecore_IMF_Context> m_context;
-    bool m_focused;
 };
 
 } // namespace WebKit

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index bd3f50d..ee407c1 100755 (executable)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -660,9 +660,9 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 
     DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(databaseName, origin);
     uint64_t currentQuota = DatabaseTracker::tracker().quotaForOrigin(origin);
-    uint64_t currentOriginUsage = DatabaseTracker::tracker().usageForOrigin(origin);
-    uint64_t newQuota = 0;
+
 #if ENABLE(TIZEN_SQL_DATABASE)
+    uint64_t newQuota = 0;
     const uint64_t defaultQuota = 5 * 1024 * 1024;
     uint64_t requirement = currentQuota + details.expectedUsage();
     if (requirement <= defaultQuota)
@@ -679,6 +679,8 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
             newQuota = currentQuota;
     }
 #else
+    uint64_t currentOriginUsage = DatabaseTracker::tracker().usageForOrigin(origin);
+    uint64_t newQuota = 0;
     WebProcess::shared().connection()->sendSync(
         Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), origin->databaseIdentifier(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage()),
         Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page->pageID());

diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c
index 783045e..aa37739 100755 (executable)
--- a/Tools/MiniBrowser/efl/main.c
+++ b/Tools/MiniBrowser/efl/main.c
@@ -275,8 +275,8 @@ on_download_request(void *user_data, Evas_Object *webview, void *event_info)
     else {
         // Generate a unique file name since no name was suggested.
         char unique_path[] = "/tmp/downloaded-file.XXXXXX";
-        mktemp(unique_path);
-        eina_strbuf_append(destination_path, unique_path);
+        // change from org distribution
+        eina_strbuf_append(destination_path, mktemp(unique_path));
     }
 
     ewk_download_job_destination_set(download, eina_strbuf_string_get(destination_path));