From fc446877311d74146228173537b7bf013065e927 Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Thu, 22 Sep 2016 16:25:59 +0200
Subject: [PATCH] Support RN 0.34

This change adds support for RN 0.34.0-rc0.

Related changes in RN:
https://github.com/facebook/react-native/commit/1a7c231ef35812e8d4a79cd2482c69b10c52dc4a
https://github.com/facebook/react-native/commit/a718f14af7fee54457f7f89d2a89efb2f61a28ef#diff-eb2d634923bec6e03e2ba8558ff3c3b8
---
 ios/GLCanvas.m | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ios/GLCanvas.m b/ios/GLCanvas.m
index 1a19eec..8bd92ee 100644
--- a/ios/GLCanvas.m
+++ b/ios/GLCanvas.m
@@ -14,7 +14,7 @@
 #import "RCTImageSource.h"
 
 NSString* imageSourceHash (RCTImageSource *is) {
-  return is.imageURL.absoluteString;
+  return is.request.URL;
 }
 
 NSArray* diff (NSArray* a, NSArray* b) {
@@ -338,7 +338,7 @@ RCT_NOT_IMPLEMENTED(-init)
   }
   _contentData = contentData;
   [self setNeedsDisplay];
-  RCT_PROFILE_END_EVENT(0, @"gl", nil);
+  RCT_PROFILE_END_EVENT(0, @"gl");
 }
 
 
@@ -486,7 +486,8 @@ RCT_NOT_IMPLEMENTED(-init)
       for (GLRenderData *child in renderData.children)
         weak_recDraw(child);
 
-      RCT_PROFILE_BEGIN_EVENT(0, [NSString stringWithFormat:@"node:%@", renderData.shader.name], nil);
+      NSString *nodeName = [NSString stringWithFormat:@"node:%@", renderData.shader.name];
+      RCT_PROFILE_BEGIN_EVENT(0, nodeName, nil);
 
       RCT_PROFILE_BEGIN_EVENT(0, @"bind fbo", nil);
       if (renderData.fboId == -1) {
@@ -500,11 +501,11 @@ RCT_NOT_IMPLEMENTED(-init)
         [fbo bind];
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       }
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
 
       RCT_PROFILE_BEGIN_EVENT(0, @"bind shader", nil);
       [renderData.shader bind];
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
 
       RCT_PROFILE_BEGIN_EVENT(0, @"bind textures", nil);
       for (NSString *uniformName in renderData.textures) {
@@ -512,21 +513,21 @@ RCT_NOT_IMPLEMENTED(-init)
         int unit = [((NSNumber *)renderData.uniforms[uniformName]) intValue];
         [texture bind:unit];
       }
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
 
       RCT_PROFILE_BEGIN_EVENT(0, @"bind set uniforms", nil);
       for (NSString *uniformName in renderData.uniforms) {
         [renderData.shader setUniform:uniformName withValue:renderData.uniforms[uniformName]];
       }
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
 
       RCT_PROFILE_BEGIN_EVENT(0, @"draw", nil);
       glClearColor(0.0, 0.0, 0.0, 0.0);
       glClear(GL_COLOR_BUFFER_BIT);
       glDrawArrays(GL_TRIANGLES, 0, 3);
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
 
-      RCT_PROFILE_END_EVENT(0, @"gl", nil);
+      RCT_PROFILE_END_EVENT(0, @"gl");
     };
 
     // DRAWING THE SCENE
@@ -546,7 +547,7 @@ RCT_NOT_IMPLEMENTED(-init)
     }
   }
 
-  RCT_PROFILE_END_EVENT(0, @"gl", nil);
+  RCT_PROFILE_END_EVENT(0, @"gl");
 }
 
 //// utility methods
-- 
2.26.2