Using weak table instead of encoding the filename to indicate hit-tes…

…t-only masks (probably not the issue, but paranoid :) )

Doing no-bitmap test before trying to make paint, to avoid bool pointer (much more suspect)

Workaround for Windows doing double-lock (non-issue with another upcoming PR)

Wasn't passing along hit-test-only-ness through CreateAndAdd()

File-based technique seems to not work

librtt/Display/Rtt_BitmapMask.cpp

@@ -23,10 +23,9 @@ namespace Rtt
 // ----------------------------------------------------------------------------
 
 BitmapMask*
-BitmapMask::Create( Runtime& runtime, const FilePath& maskData )
+BitmapMask::Create( Runtime& runtime, const FilePath& maskData, bool onlyForHitTests )
 {
-	bool onlyForHitTests = false;
-	BitmapPaint *paint = BitmapPaint::NewBitmap( runtime, maskData, PlatformBitmap::kIsBitsFullResolution, true, &onlyForHitTests );
+	BitmapPaint *paint = BitmapPaint::NewBitmap( runtime, maskData, PlatformBitmap::kIsBitsFullResolution, true, onlyForHitTests );
 	BitmapMask *result = NULL;
 
 	if ( Rtt_VERIFY( paint || onlyForHitTests ) )
@@ -45,7 +44,7 @@ BitmapMask::BitmapMask( BitmapPaint *paint, bool onlyForHitTests, bool isTempora
 	fOnlyForHitTests( onlyForHitTests ),
 	fIsTemporary( isTemporary )
 {
-	Rtt_ASSERT( paint );
+	Rtt_ASSERT( paint || onlyForHitTests );
 }
 
 BitmapMask::BitmapMask( BitmapPaint *paint, Real contentW, Real contentH )
@@ -66,28 +65,7 @@ BitmapMask::~BitmapMask()
 	}
 }
 
-static const char kHitTestOnlyPrefix[] = "hitTestOnly://";
-
-const char*
-BitmapMask::StripHitTestPrefix( const char* filename )
-{
-	if ( Rtt_StringStartsWith( filename, kHitTestOnlyPrefix ) )
-	{
-		return filename + strlen( kHitTestOnlyPrefix );
-	}
-
-	else
-	{
-		return filename;
-	}
-}
-
-void
-BitmapMask::EncodeFilenameForHitTests( String& encoded, const char* filename )
-{
-	encoded.Set( kHitTestOnlyPrefix );
-	encoded.Append( filename );
-}
+const char BitmapMask::kHitTestOnlyTable[] = "hitTestOnlyTableKey";
 
 void
 BitmapMask::GetSelfBounds( Rect& rect ) const

librtt/Display/Rtt_BitmapMask.h

@@ -28,7 +28,7 @@ class UserdataWrapper;
 class BitmapMask
 {
 	public:
-		static BitmapMask* Create( Runtime& runtime, const FilePath& maskData );
+		static BitmapMask* Create( Runtime& runtime, const FilePath& maskData, bool onlyForHitTests );
 
 	public:
 		BitmapMask( BitmapPaint *paint, bool onlyForHitTests, bool isTemporary = false );
@@ -37,16 +37,16 @@ class BitmapMask
 	public:
 		~BitmapMask();
 
+	public:
+		static const char kHitTestOnlyTable[];
+
 	public:
 		const BitmapPaint* GetPaint() const { return fPaint; }
 		BitmapPaint* GetPaint() { return fPaint; }
 
 	public:
 	   bool GetOnlyForHitTests() const { return fOnlyForHitTests; }
 
-	   static const char* StripHitTestPrefix( const char* filename );
-	   static void EncodeFilenameForHitTests( String& encoded, const char* filename );
-
 	public:
 		const Transform& GetTransform() const { return fTransform; }
 		Transform& GetTransform() { return fTransform; }

librtt/Display/Rtt_BitmapPaint.cpp

@@ -66,33 +66,21 @@ BitmapPaint::NewBitmap( Runtime& runtime, const char* filename, MPlatform::Direc
 }
 
 BitmapPaint*
-BitmapPaint::NewBitmap( Runtime& runtime, const FilePath& data, U32 flags, bool isMask, bool* onlyForHitTests )
+BitmapPaint::NewBitmap( Runtime& runtime, const FilePath& data, U32 flags, bool isMask, bool onlyForHitTests )
 {
 	BitmapPaint *result = NULL;
 
 	const char *filename = data.GetFilename();
 	MPlatform::Directory baseDir = data.GetBaseDir();
 
-	if ( isMask && NULL != onlyForHitTests )
+	if ( onlyForHitTests && '\0' == *filename )
 	{
-		const char *stripped = BitmapMask::StripHitTestPrefix( filename );
-
-		if ( stripped != filename )
-		{
-			*onlyForHitTests = true;
-
-			if ( !*stripped ) // no bitmap?
-			{
-				return result;
-			}
-
-			filename = stripped;
-		}
+		return NULL;
 	}
 
 	TextureFactory& factory = runtime.GetDisplay().GetTextureFactory();
 	SharedPtr< TextureResource > pTexture =
-		factory.FindOrCreate( filename, baseDir, flags, isMask );
+		factory.FindOrCreate( filename, baseDir, flags, isMask, onlyForHitTests );
 
 	if ( pTexture.NotNull() )
 	{

librtt/Display/Rtt_BitmapPaint.h

@@ -40,7 +40,7 @@ class BitmapPaint : public Paint
 		static BitmapPaint* NewBitmap( Runtime& runtime, const char* filename, MPlatform::Directory baseDir, U32 flags );
 
 		// Load bitmap mask from file or reuse bitmap from image cache
-		static BitmapPaint* NewBitmap( Runtime& runtime, const FilePath& data, U32 flags, bool isMask, bool* onlyForHitTests = NULL  );
+		static BitmapPaint* NewBitmap( Runtime& runtime, const FilePath& data, U32 flags, bool isMask, bool onlyForHitTests = false );
 
 		// Wrap platform bitmap in Paint-compatible interface. Typically used
 		// in conjunction with PlatformImageProvider

librtt/Display/Rtt_LuaLibGraphics.cpp

@@ -210,32 +210,37 @@ GraphicsLibrary::newMask( lua_State *L )
 int
 GraphicsLibrary::newHitTestOnlyMask( lua_State *L )
 {
-	if ( lua_isstring( L, 1 ) )
-	{
-		String str;
+	int result = GraphicsLibrary::newMask( L );
 
-		BitmapMask::EncodeFilenameForHitTests( str, lua_tostring( L, 1 ) );
+	if ( result )
+	{
+		lua_getfield( L, LUA_REGISTRYINDEX, BitmapMask::kHitTestOnlyTable );
 
-		lua_pushstring( L, str.GetString() );
-		lua_replace( L, 1 );
+		if ( lua_istable( L, -1 ) )
+		{
+			lua_pushvalue( L, -2 );
+			lua_pushboolean( L, 1 );
+			lua_rawset( L, -3 );
+			lua_pop( L, 1 );
+		}
+
+		else
+		{
+			result = 0;
+		}
 	}
 
-	return newMask( L );
+	return result;
 }
 
 // graphics.newHitTestOnlyMaskFromPaint( [opts] )
 int
 GraphicsLibrary::newHitTestOnlyMaskFromPaint( lua_State *L )
 {
 	lua_settop( L, 0 ); // TODO: any options?
+	lua_pushliteral( L, "" );
 
-	String str;
-
-	BitmapMask::EncodeFilenameForHitTests( str, "" );
-
-	lua_pushstring( L, str.GetString() );
-
-	return newMask( L );
+	return newHitTestOnlyMask( L );
 }
 
 // graphics.newVertexArray( x1, y1 [,x2, y2, ... ] )
@@ -937,6 +942,13 @@ LuaLibGraphics::Initialize( lua_State *L, Display& display )
 
 	CoronaLuaPushModule( L, GraphicsLibrary::kName );
 	lua_setglobal( L, GraphicsLibrary::kName ); // graphics = library
+
+	lua_newtable( L );
+	lua_createtable( L, 0, 1 );
+	lua_pushliteral( L, "k" );
+	lua_setfield( L, -2, "__mode" );
+	lua_setmetatable( L, -2 );
+	lua_setfield( L, LUA_REGISTRYINDEX, BitmapMask::kHitTestOnlyTable );
 }
 
 // ----------------------------------------------------------------------------

librtt/Rtt_LuaProxyVTable.cpp

@@ -532,7 +532,28 @@ setMask( lua_State *L )
 				FilePath *maskData = *ud;
 				if ( maskData )
 				{
-					mask = BitmapMask::Create( * runtime, * maskData );
+					bool onlyForHitTests = false;
+
+					lua_getfield( L, LUA_REGISTRYINDEX, BitmapMask::kHitTestOnlyTable );
+
+					if ( lua_istable( L, -1 ))
+					{
+						lua_pushvalue( L, 2 );
+						lua_rawget( L, -2 );
+
+						onlyForHitTests = lua_toboolean( L, -1 );
+
+						lua_pop( L, 1 );
+					}
+
+					else
+					{
+						Rtt_TRACE_SIM( ( "WARNING: Hit test only table missing for masks.\n" ) );
+					}
+
+					lua_pop( L, 1 );
+
+					mask = BitmapMask::Create( * runtime, * maskData, onlyForHitTests );
 				}
 			}
 		}

platform/windows/Corona.Native.Library.Win32/Rtt/Rtt_WinBitmap.cpp

@@ -112,6 +112,13 @@ WinBitmap::Lock()
 	if ( fBitmap == NULL )
 		return;
 
+	if ( fLockedBitmapData )
+	{
+		Rtt_ASSERT( fData );
+
+		return;
+	}
+
 	Gdiplus::Rect rect;
 
 	rect.X = rect.Y = 0;