Title: [102345] branches/safari-534.53-branch/Source/WebKit2
- Revision
- 102345
- Author
- lforsch...@apple.com
- Date
- 2011-12-08 09:25:13 -0800 (Thu, 08 Dec 2011)
Log Message
Merged r99912.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102344 => 102345)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 17:23:00 UTC (rev 102344)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-08 17:25:13 UTC (rev 102345)
@@ -1,5 +1,17 @@
2011-12-08 Lucas Forschler <lforsch...@apple.com>
+ Merge 99912
+
+ 2011-11-10 Beth Dakin <bda...@apple.com>
+
+ Speculative build fix.
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::setFindIndicator):
+ * UIProcess/win/WebView.h:
+
+2011-12-08 Lucas Forschler <lforsch...@apple.com>
+
Merge 99911
2011-11-10 Beth Dakin <bda...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.cpp (102344 => 102345)
--- branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.cpp 2011-12-08 17:23:00 UTC (rev 102344)
+++ branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.cpp 2011-12-08 17:25:13 UTC (rev 102345)
@@ -1443,8 +1443,10 @@
return WebContextMenuProxyWin::create(m_window, page);
}
-void WebView::setFindIndicator(PassRefPtr<FindIndicator> prpFindIndicator, bool fadeOut)
+void WebView::setFindIndicator(PassRefPtr<FindIndicator> prpFindIndicator, bool fadeOut, bool animate)
{
+ UNUSED_PARAM(animate);
+
if (!m_findIndicatorCallback)
return;
Modified: branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.h (102344 => 102345)
--- branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.h 2011-12-08 17:23:00 UTC (rev 102344)
+++ branches/safari-534.53-branch/Source/WebKit2/UIProcess/win/WebView.h 2011-12-08 17:25:13 UTC (rev 102345)
@@ -198,7 +198,7 @@
virtual void compositionSelectionChanged(bool);
virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);
- virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut);
+ virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate);
virtual void didInstallOrUninstallPageOverlay(bool);
#if USE(ACCELERATED_COMPOSITING)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
