Fix build warnings 4

Change-Id: Ia2e0566b0f740e856831556ac9d1115178e72b31

diff --git a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
index 801c1b3..80c2529 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
@@ -383,6 +383,11 @@ bool ApplicationCacheHost::getApplicationCacheFallbackResource(const ResourceReq
     resource = cache->resourceForURL(fallbackURL);
     ASSERT(resource);
 
+#if ENABLE(TIZEN_DAILY_UPVERSIONING)
+    if (!resource)
+        return false;
+#endif
+
     return true;
 }
 

diff --git a/Source/WebCore/page/ContextMenuController.cpp b/Source/WebCore/page/ContextMenuController.cpp
index 4f78aca..b2c537c 100755 (executable)
--- a/Source/WebCore/page/ContextMenuController.cpp
+++ b/Source/WebCore/page/ContextMenuController.cpp
@@ -1505,6 +1505,10 @@ void ContextMenuController::checkOrEnableIfNeeded(ContextMenuItem& item) const
             shouldEnable = m_hitTestResult.mediaHasAudio();
             shouldCheck = shouldEnable &&  m_hitTestResult.mediaMuted();
             break;
+#if ENABLE(TIZEN_DAILY_UPVERSIONING)
+        default:
+            break;
+#endif
     }
 
     item.setChecked(shouldCheck);

diff --git a/Source/WebCore/platform/efl/tizen/AsyncFileSystemCallbacksTizen.cpp b/Source/WebCore/platform/efl/tizen/AsyncFileSystemCallbacksTizen.cpp
index d68052b..eeed4ae 100644 (file)
--- a/Source/WebCore/platform/efl/tizen/AsyncFileSystemCallbacksTizen.cpp
+++ b/Source/WebCore/platform/efl/tizen/AsyncFileSystemCallbacksTizen.cpp
@@ -62,6 +62,8 @@ static void performDidReadMetadataCallback(ScriptExecutionContext*, PassOwnPtr<A
     callbacks->didReadMetadata(metadata);
 }
 
+/*
+// Defined but not used.
 static void performDidReadDirectoryEntryCallback(ScriptExecutionContext*, AsyncFileSystemCallbacks* callbacks, const String& name, bool isDirectory)
 {
     callbacks->didReadDirectoryEntry(name, isDirectory);
@@ -71,6 +73,7 @@ static void performDidReadDirectoryEntriesCallback(ScriptExecutionContext*, Asyn
 {
     callbacks->didReadDirectoryEntries(true);
 }
+*/
 
 static void performDidReadDirectoryEntriesAndFinishedCallback(ScriptExecutionContext*, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 147cbc6..3a24f74 100755 (executable)
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -325,6 +325,9 @@ bool MediaPlayerPrivateGStreamer::isAvailable()
 MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer(MediaPlayer* player)
     : m_player(player)
     , m_webkitVideoSink(0)
+#if ENABLE(TIZEN_GSTREAMER_VIDEO)
+    , m_videoSinkBin(0)
+#endif
     , m_fpsSink(0)
     , m_source(0)
     , m_seekTime(0)
@@ -360,18 +363,17 @@ MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer(MediaPlayer* player)
     , m_audioTimerHandler(0)
     , m_videoTimerHandler(0)
     , m_webkitAudioSink(0)
+    , m_totalBytes(-1)
 #if ENABLE(TIZEN_ACCELERATED_COMPOSITING) && USE(TIZEN_TEXTURE_MAPPER)
     , m_videoLayer(VideoLayerTizen::create(static_cast<HTMLMediaElement*>(player->mediaPlayerClient())))
 #endif // ENABLE(TIZEN_ACCELERATED_COMPOSITING) && USE(TIZEN_TEXTURE_MAPPER)
 #if ENABLE(TIZEN_GSTREAMER_AUDIO)
     , m_audioSessionManager(AudioSessionManagerGStreamerTizen::createAudioSessionManager())
 #endif
-    , m_totalBytes(-1)
     , m_originalPreloadWasAutoAndWasOverridden(false)
     , m_preservesPitch(false)
 #if ENABLE(TIZEN_GSTREAMER_VIDEO)
     , m_suspendTime(0)
-    , m_videoSinkBin(0)
 #endif
 {
 }

diff --git a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
index 17ad2b6..cb31929 100644 (file)
--- a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
+++ b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
@@ -401,8 +401,13 @@ int HarfBuzzShaper::offsetForPosition(float targetX)
 FloatRect HarfBuzzShaper::selectionRect(const FloatPoint& point, int height, int from, int to)
 {
     float currentX = 0;
+#if ENABLE(TIZEN_DAILY_UPVERSIONING)
+    float fromX = 0;
+    float toX = 0;
+#else
     float fromX;
     float toX;
+#endif
     bool foundFromX = false;
     bool foundToX = false;