Title: [188074] branches/safari-601.1-branch
- Revision
- 188074
- Author
- dburk...@apple.com
- Date
- 2015-08-06 16:08:46 -0700 (Thu, 06 Aug 2015)
Log Message
Merge r187622. rdar://problem/15779101
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188073 => 188074)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-06 23:08:46 UTC (rev 188074)
@@ -1,5 +1,16 @@
2015-08-06 Dana Burkart <dburk...@apple.com>
+ Merge r187622. rdar://problem/15779101
+
+ 2015-07-30 Anders Carlsson <ander...@apple.com>
+
+ Remove stray printf.
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::requestObject):
+
+2015-08-06 Dana Burkart <dburk...@apple.com>
+
Merge r187620. rdar://problem/15779101
2015-07-30 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp (188073 => 188074)
--- branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp 2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp 2015-08-06 23:08:46 UTC (rev 188074)
@@ -212,7 +212,6 @@
bool SubframeLoader::requestObject(HTMLPlugInImageElement& ownerElement, const String& url, const AtomicString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
{
- printf("request oject url %s mime type %s\n", url.ascii().data(), mimeType.ascii().data());
if (url.isEmpty() && mimeType.isEmpty())
return false;
Modified: branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (188073 => 188074)
--- branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-08-06 23:08:46 UTC (rev 188074)
@@ -52,6 +52,7 @@
[[WebPreferences standardPreferences] setDeveloperExtrasEnabled:YES];
[[WebPreferences standardPreferences] setImageControlsEnabled:YES];
[[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
+ [[WebPreferences standardPreferences] setJavaScriptCanOpenWindowsAutomatically:YES];
[_webView _listenForLayoutMilestones:WebDidFirstLayout | WebDidFirstVisuallyNonEmptyLayout | WebDidHitRelevantRepaintedObjectsAreaThreshold];
@@ -87,7 +88,7 @@
- (IBAction)showHideWebView:(id)sender
{
BOOL hidden = ![_webView isHidden];
-
+
[_webView setHidden:hidden];
}
@@ -95,7 +96,7 @@
{
if ([_webView window]) {
[_webView retain];
- [_webView removeFromSuperview];
+ [_webView removeFromSuperview];
} else {
[containerView addSubview:_webView];
[_webView release];
@@ -104,7 +105,7 @@
- (IBAction)setScale:(id)sender
{
-
+
}
- (IBAction)reload:(id)sender
@@ -154,10 +155,10 @@
if (action == @selector(goBack:))
return [_webView canGoBack];
-
+
if (action == @selector(goForward:))
return [_webView canGoForward];
-
+
return YES;
}
@@ -302,6 +303,14 @@
{
}
+- (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request
+{
+ WK1BrowserWindowController *newBrowserWindowController = [[WK1BrowserWindowController alloc] initWithWindowNibName:@"BrowserWindow"];
+ [newBrowserWindowController.window makeKeyAndOrderFront:self];
+
+ return newBrowserWindowController->_webView;
+}
+
- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
{
if (frame != [sender mainFrame])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
