<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167097] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167097">167097</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-10 16:52:29 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] Disable the find overlay for now
https://bugs.webkit.org/show_bug.cgi?id=131509
Reviewed by Adele Peterson.
* Shared/WebPreferencesStore.h:
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::FindController):
(WebKit::FindController::hideFindOverlay):
(WebKit::FindController::hideFindUI):
(WebKit::FindController::setShouldShowOverlay):
* WebProcess/WebPage/FindController.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Add a setting allowing us to turn off the find-in-page overlay on iOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllerh">trunk/Source/WebKit2/WebProcess/WebPage/FindController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167096 => 167097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-10 23:23:11 UTC (rev 167096)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-10 23:52:29 UTC (rev 167097)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-10 Tim Horton <timothy_horton@apple.com>
+
+ [iOS WebKit2] Disable the find overlay for now
+ https://bugs.webkit.org/show_bug.cgi?id=131509
+
+ Reviewed by Adele Peterson.
+
+ * Shared/WebPreferencesStore.h:
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::FindController):
+ (WebKit::FindController::hideFindOverlay):
+ (WebKit::FindController::hideFindUI):
+ (WebKit::FindController::setShouldShowOverlay):
+ * WebProcess/WebPage/FindController.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ Add a setting allowing us to turn off the find-in-page overlay on iOS.
+
</ins><span class="cx"> 2014-04-10 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK build fix after r167074.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (167096 => 167097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-04-10 23:23:11 UTC (rev 167096)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-04-10 23:52:29 UTC (rev 167097)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> #define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE false
</span><span class="cx"> #define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE true
</span><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
</span><ins>+#define DEFAULT_FIND_IN_PAGE_OVERLAY_ENABLED false
</ins><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_FRAME_FLATTENING_ENABLED false
</span><span class="cx"> #define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
</span><span class="lines">@@ -86,6 +87,7 @@
</span><span class="cx"> #define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE true
</span><span class="cx"> #define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE false
</span><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
</span><ins>+#define DEFAULT_FIND_IN_PAGE_OVERLAY_ENABLED true
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
</span><span class="lines">@@ -225,6 +227,7 @@
</span><span class="cx"> macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED) \
</span><span class="cx"> macro(ImageControlsEnabled, imageControlsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
</span><ins>+ macro(FindInPageOverlayEnabled, findInPageOverlayEnabled, Bool, bool, DEFAULT_FIND_IN_PAGE_OVERLAY_ENABLED) \
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (167096 => 167097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-04-10 23:23:11 UTC (rev 167096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-04-10 23:52:29 UTC (rev 167097)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> : m_webPage(webPage)
</span><span class="cx"> , m_findPageOverlay(0)
</span><span class="cx"> , m_isShowingFindIndicator(false)
</span><ins>+ , m_shouldShowOverlay(true)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -268,19 +269,26 @@
</span><span class="cx"> frame->selection().setSelection(VisibleSelection(m_findMatches[matchIndex].get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FindController::hideFindOverlay()
+{
+ if (!m_findPageOverlay)
+ return;
+
+ m_webPage->uninstallPageOverlay(m_findPageOverlay, PageOverlay::FadeMode::Fade);
+}
+
</ins><span class="cx"> void FindController::hideFindUI()
</span><span class="cx"> {
</span><span class="cx"> m_findMatches.clear();
</span><del>- if (m_findPageOverlay)
- m_webPage->uninstallPageOverlay(m_findPageOverlay, PageOverlay::FadeMode::Fade);
</del><span class="cx">
</span><span class="cx"> PluginView* pluginView = pluginViewForFrame(m_webPage->mainFrame());
</span><del>-
</del><ins>+
</ins><span class="cx"> if (pluginView)
</span><span class="cx"> pluginView->findString(emptyString(), 0, 0);
</span><span class="cx"> else
</span><span class="cx"> m_webPage->corePage()->unmarkAllTextMatches();
</span><del>-
</del><ins>+
+ hideFindOverlay();
</ins><span class="cx"> hideFindIndicator();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,4 +451,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FindController::setShouldShowOverlay(bool shouldShowOverlay)
+{
+ if (m_shouldShowOverlay == shouldShowOverlay)
+ return;
+
+ m_shouldShowOverlay = shouldShowOverlay;
+
+ if (isShowingOverlay() && !m_shouldShowOverlay)
+ hideFindOverlay();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.h (167096 => 167097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.h 2014-04-10 23:23:11 UTC (rev 167096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.h 2014-04-10 23:52:29 UTC (rev 167097)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class Frame;
- class Range;
</del><ins>+class Frame;
+class Range;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -54,13 +54,15 @@
</span><span class="cx"> void findStringMatches(const String&, FindOptions, unsigned maxMatchCount);
</span><span class="cx"> void getImageForFindMatch(uint32_t matchIndex);
</span><span class="cx"> void selectFindMatch(uint32_t matchIndex);
</span><ins>+ void countStringMatches(const String&, FindOptions, unsigned maxMatchCount);
+
</ins><span class="cx"> void hideFindUI();
</span><del>- void countStringMatches(const String&, FindOptions, unsigned maxMatchCount);
-
</del><ins>+ void hideFindOverlay();
</ins><span class="cx"> void hideFindIndicator();
</span><span class="cx"> void showFindIndicatorInSelection();
</span><span class="cx">
</span><span class="cx"> bool isShowingOverlay() const { return m_isShowingFindIndicator && m_findPageOverlay; }
</span><ins>+ void setShouldShowOverlay(bool);
</ins><span class="cx">
</span><span class="cx"> void deviceScaleFactorDidChange();
</span><span class="cx">
</span><span class="lines">@@ -86,6 +88,8 @@
</span><span class="cx"> bool m_isShowingFindIndicator;
</span><span class="cx"> WebCore::IntRect m_findIndicatorRect;
</span><span class="cx"> Vector<RefPtr<WebCore::Range>> m_findMatches;
</span><ins>+
+ bool m_shouldShowOverlay;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167096 => 167097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-10 23:23:11 UTC (rev 167096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-10 23:52:29 UTC (rev 167097)
</span><span class="lines">@@ -2639,6 +2639,8 @@
</span><span class="cx"> m_drawingArea->updatePreferences(store);
</span><span class="cx">
</span><span class="cx"> m_pageOverlayController.didChangePreferences();
</span><ins>+
+ m_findController.setShouldShowOverlay(store.getBoolValueForKey(WebPreferencesKey::findInPageOverlayEnabledKey()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>