Fix build warnings 2
authorKrzysztof Wolanski <k.wolanski@samsung.com>
Thu, 4 Apr 2013 13:28:26 +0000 (15:28 +0200)
committerKrzysztof Wolanski <k.wolanski@samsung.com>
Thu, 4 Apr 2013 13:28:26 +0000 (15:28 +0200)
Change-Id: If9e8b2147ba36e4bfd5749a2d7fbeff6c6a03151

Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.cpp
Source/WebCore/platform/graphics/efl/tizen/GraphicsContext3DInternal.cpp
Source/WebCore/platform/graphics/efl/tizen/SharedPlatformSurfaceTizen.cpp
Source/WebCore/platform/graphics/gstreamer/tizen/VideoLayerTizen.cpp
Source/WebCore/platform/mediastream/tizen/LocalMediaServer.cpp

index 1782ebc..e22a75f 100644 (file)
@@ -95,9 +95,9 @@ bool UnfoldShortCircuit::visitBinary(Visit visit, TIntermBinary *node)
             mTemporaryIndex = i + 1;
         }
         return false;
+      default:
+        return true;
     }
-
-    return true;
 }
 
 bool UnfoldShortCircuit::visitSelection(Visit visit, TIntermSelection *node)
index 41d67a0..a19c166 100755 (executable)
@@ -65,11 +65,11 @@ GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attribut
     : m_attributes(attrs)
     , m_renderStyle(renderStyle)
 #if ENABLE(TIZEN_WEBKIT2)
+    , m_width(0)
+    , m_height(0)
     , m_display(EGL_NO_DISPLAY)
     , m_context(EGL_NO_CONTEXT)
     , m_surface(EGL_NO_SURFACE)
-    , m_width(0)
-    , m_height(0)
 #else
     , m_evasGL(0)
     , m_context(0)
index eb95dd9..c6a52b3 100755 (executable)
@@ -324,8 +324,8 @@ PassOwnPtr<SharedPlatformSurfaceTizen> SharedPlatformSurfaceTizen::create(const
 }
 
 SharedPlatformSurfaceTizen::SharedPlatformSurfaceTizen(const IntSize& size, bool lockable, bool hasAlpha, bool hasDepth, bool hasStencil, PixmapContextTizen* pixmapContext)
-    : m_size(size)
-    , m_pixmap(0)
+    : m_pixmap(0)
+    , m_size(size)
     , m_surface(0)
     , m_isLockable(lockable)
     , m_hasAlpha(hasAlpha)
index 655a892..8454b22 100644 (file)
@@ -55,12 +55,12 @@ namespace WebCore {
 #endif
 
 VideoLayerTizen::VideoLayerTizen(HTMLMediaElement* media)
-    : m_media(media)
 #if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
-    , m_videoSink(0)
+    : m_videoSink(0)
 #else
-    , m_platformSurfaceID(0)
+    : m_platformSurfaceID(0)
 #endif // ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
+    , m_media(media)
 {
 #if !ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
     if (!g_nativeDisplay)
index 44b2af0..f170b83 100644 (file)
@@ -26,8 +26,8 @@
 namespace WebCore {
 
 LocalMediaServer::LocalMediaServer(PassRefPtr<MediaStreamSourcesQueryClient> client)
-    : m_camPipeline(0)
-    , m_gstInitialized(false)
+    : m_gstInitialized(false)
+    , m_camPipeline(0)
 {
     if (!m_gstInitialized)
         m_gstInitialized = gst_init_check(0, 0, 0);