Bug 796084 - Remove reference to java compositor in comments. r=Cwiiis, DONTBUILD because comment only
authorBenoit Girard <b56girard@gmail.com>
Tue, 02 Oct 2012 09:46:01 -0400
changeset 109073 5a5dabf022b72c35c86172c6c75dc951ab24c315
parent 109072 65404c2b69c4d499d1f49771e3eab0e40685df8e
child 109074 a3b82cf0dcb0f8b8aad81c31d7c7f769e873dd8a
push id23609
push userryanvm@gmail.com
push dateThu, 04 Oct 2012 01:43:15 +0000
treeherdermozilla-central@ae646840907e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCwiiis, DONTBUILD
bugs796084
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 796084 - Remove reference to java compositor in comments. r=Cwiiis, DONTBUILD because comment only
configure.in
gfx/layers/opengl/LayerManagerOGL.cpp
--- a/configure.in
+++ b/configure.in
@@ -5078,17 +5078,17 @@ dnl = Enable Android History instead of 
 dnl ========================================================
 if test -n "$MOZ_ANDROID_HISTORY"; then
      dnl Do this if defined in confvars.sh
      AC_DEFINE(MOZ_ANDROID_HISTORY)
 fi
 
 
 dnl ========================================================
-dnl = Build with the Android Java compositor
+dnl = Build with the Android compositor
 dnl ========================================================
 if test -n "$MOZ_ANDROID_OMTC"; then
      dnl Do this if defined in confvars.sh
      AC_DEFINE(MOZ_ANDROID_OMTC)
 fi
 
 dnl ========================================================
 dnl = Disable WebSMS backend
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -916,17 +916,17 @@ LayerManagerOGL::Render()
     RootLayer()->RenderLayer(mGLContext->IsDoubleBuffered() ? 0 : mBackBufferFBO,
                              nsIntPoint(0, 0));
     mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
     return;
   }
 
   mGLContext->fEnable(LOCAL_GL_SCISSOR_TEST);
 
-  // If the Java compositor is being used, this clear will be done in
+  // If the Android compositor is being used, this clear will be done in
   // DrawWindowUnderlay. Make sure the bits used here match up with those used
   // in mobile/android/base/gfx/LayerRenderer.java
 #ifndef MOZ_ANDROID_OMTC
   mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
   mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
 #endif
 
   // Allow widget to render a custom background.