diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitTools/MiniBrowser/mac | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitTools/MiniBrowser/mac')
| -rw-r--r-- | WebKitTools/MiniBrowser/mac/BrowserWindowController.m | 3 | ||||
| -rw-r--r-- | WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m index ff6246e..4f2b63f 100644 --- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m +++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m @@ -690,7 +690,8 @@ static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKF { WKStringRef string = WKStringCreateWithCFString((CFStringRef)[sender stringValue]); - WKPageFindString(_webView.pageRef, string, kWKFindOptionsCaseInsensitive | kWKFindOptionsWrapAround | kWKFindOptionsShowFindIndicator | kWKFindOptionsShowOverlay, 100); + WKPageFindString(_webView.pageRef, string, kWKFindDirectionForward, + kWKFindOptionsCaseInsensitive | kWKFindOptionsWrapAround | kWKFindOptionsShowFindIndicator | kWKFindOptionsShowOverlay, 100); } @end diff --git a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m index 90db033..f3d44a5 100644 --- a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m +++ b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m @@ -97,7 +97,6 @@ void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData) 0, didCreatePage, willDestroyPage, - 0, // didInitializePageGroup didRecieveMessage }; WKBundleSetClient(bundle, &client); |