Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kuznetsov <r.kuznetsow@gmail.com>2016-03-24 13:41:53 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2016-03-24 13:41:53 +0300
commit55f2a67e955fb69afca28dbca11ba1274400b6f9 (patch)
treeccd1f1f47d72b0a37d47dbcf70aa57e869bfa97c /iphone/Maps/Classes
parent76cb6e84ab2e0ea0ff34790ff1c3ed2ac6331120 (diff)
Revert "[ios] Improved safety of present calls"
Diffstat (limited to 'iphone/Maps/Classes')
-rw-r--r--iphone/Maps/Classes/EAGLView.h1
-rw-r--r--iphone/Maps/Classes/EAGLView.mm5
-rw-r--r--iphone/Maps/Classes/MapViewController.h2
-rw-r--r--iphone/Maps/Classes/MapViewController.mm10
-rw-r--r--iphone/Maps/Classes/MapsAppDelegate.mm2
5 files changed, 0 insertions, 20 deletions
diff --git a/iphone/Maps/Classes/EAGLView.h b/iphone/Maps/Classes/EAGLView.h
index dffcb6f167..600ce61de8 100644
--- a/iphone/Maps/Classes/EAGLView.h
+++ b/iphone/Maps/Classes/EAGLView.h
@@ -28,6 +28,5 @@ namespace dp
- (CGPoint)viewPoint2GlobalPoint:(CGPoint)pt;
- (CGPoint)globalPoint2ViewPoint:(CGPoint)pt;
- (void)initialize;
-- (void)setPresentAvailable:(BOOL)available;
@end
diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index eb9dc73d01..6b8c1bcbcf 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -173,9 +173,4 @@ double getExactDPI(double contentScaleFactor)
return CGPointMake(ptP.x / scaleFactor, ptP.y / scaleFactor);
}
-- (void)setPresentAvailable:(BOOL)available
-{
- static_cast<iosOGLContextFactory*>(m_factory.get())->setPresentAvailable(available);
-}
-
@end
diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index 4cd5ba4d1e..c5c694c871 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -21,8 +21,6 @@ namespace search { struct AddressInfo; }
- (void)onTerminate;
- (void)onEnterForeground;
- (void)onEnterBackground;
-- (void)onGetFocus;
-- (void)onLoseFocus;
- (void)setMapStyle:(MapStyle)mapStyle;
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index d7dc0e9337..dc98413c7f 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -362,16 +362,6 @@ NSString * const kReportSegue = @"Map2ReportSegue";
GetFramework().EnterForeground();
}
-- (void)onGetFocus
-{
- [(EAGLView *)self.view setPresentAvailable:YES];
-}
-
-- (void)onLoseFocus
-{
- [(EAGLView *)self.view setPresentAvailable:NO];
-}
-
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 28f47d394f..e674b2e6b6 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -559,7 +559,6 @@ using namespace osm_auth_ios;
- (void)applicationWillResignActive:(UIApplication *)application
{
- [self.mapViewController onLoseFocus];
[self.mapViewController.appWallAd close];
[RouteState save];
GetFramework().SetRenderingEnabled(false);
@@ -586,7 +585,6 @@ using namespace osm_auth_ios;
{
if (application.applicationState == UIApplicationStateBackground)
return;
- [self.mapViewController onGetFocus];
[self handleURLs];
[self restoreRouteState];
[[Statistics instance] applicationDidBecomeActive];