WaylandWindowSystems: Correct a previous overwritten method name change
authorRahul Singhal <rasinghal@nvidia.com>
Tue, 12 Jun 2012 10:09:08 +0000 (15:39 +0530)
committerTimo Lotterbach <timo.lotterbach@bmw-carit.de>
Tue, 10 Jul 2012 06:14:00 +0000 (23:14 -0700)
Change checkForNewSurface function name to checkForNewSurfaceNativeContent

This change was overwritten during the wayland window system
refactoring.

LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/WaylandBaseWindowSystem.h
LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandBaseWindowSystem.cpp

index 98d7940..081548a 100644 (file)
@@ -118,7 +118,7 @@ protected:
     void Redraw();
     void shutdownCompositor();
     Surface* getSurfaceFromNativeSurface(struct native_surface* nativeSurface);
-    void checkForNewSurface();
+    void checkForNewSurfaceNativeContent();
     void calculateFps();
     void calculateSurfaceFps(Surface *currentSurface, float time) ;
     void printDebug();
index c7b443a..61820bd 100644 (file)
@@ -217,7 +217,7 @@ Surface* WaylandBaseWindowSystem::getSurfaceFromNativeSurface(struct native_surf
     return NULL;
 }
 
-void WaylandBaseWindowSystem::checkForNewSurface()
+void WaylandBaseWindowSystem::checkForNewSurfaceNativeContent()
 {
     m_pScene->lockScene();
     LayerList layers = m_pScene->getCurrentRenderOrder();
@@ -679,7 +679,7 @@ extern "C" void WaylandBaseWindowSystem::surfaceIFFrame(struct wl_client *client
     wl_client_add_resource(client, &cb->resource);
     wl_list_insert(windowSystem->m_listFrameCallback.prev, &cb->link);
 
-    windowSystem->checkForNewSurface();
+    windowSystem->checkForNewSurfaceNativeContent();
     idleEventRepaint(windowSystem);
 
     LOG_DEBUG("WaylandBaseWindowSystem", "surfaceIFFrame OUT");