open things in the proper frame

comex · Jul 10, 2010 · d162171 · d162171
1 parent 4be11e2
commit d162171
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Player2/Classes/PluginFlashView.m b/Player2/Classes/PluginFlashView.m
@@ -15,6 +15,7 @@ @interface NSObject (FakeMethodsToMakeGCCShutUp)
 - (id)webFrame;
 - (id)windowObject;
 - (WebFrame *)findFrameNamed:(NSString *)name;
+- (void)webPlugInContainerLoadRequest:(NSURLRequest *)request inFrame:(NSString *)target;
 
 @end
 
@@ -261,13 +262,7 @@ - (void)func:(NSSet *)touches withEvent:(UIEvent *)event { \
 foo(touchesCancelled, kCancel_ANPTouchAction)
 
 - (void)goToURL:(NSURL *)URL inFrame:(NSString *)frameName {
-	WebFrame *myframe = [[arguments objectForKey:@"WebPlugInContainerKey"] webFrame];
-	WebFrame *frame = [myframe findFrameNamed:frameName];
-	if(!frame) {
-		// It really should open a new window
-		frame = myframe;
-	}
-	[frame loadRequest:[NSURLRequest requestWithURL:URL]];
+	[[arguments objectForKey:@"WebPlugInContainerKey"] webPlugInContainerLoadRequest: [NSURLRequest requestWithURL:URL] inFrame: frameName];
 }
 
 - (UIImage *)scaleImage:(UIImage *) image maxWidth:(float) maxWidth maxHeight:(float) maxHeight

diff --git a/food/anp.cpp b/food/anp.cpp
@@ -624,7 +624,6 @@ void    window_impl_clearVisibleRects(NPP instance) {
  */
 void    window_impl_showKeyboard(NPP instance, bool value) {
     notice("%s", __func__);
-    _abort();
 }
 /** Called when a plugin wishes to enter into full screen mode. The plugin's
     Java class (set using kSetPluginStubJavaClassName_ANPSetValue) will be