<!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>[163647] trunk/Source</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/163647">163647</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 14:27:06 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Should report user input to PageThrottler
https://bugs.webkit.org/show_bug.cgi?id=128398
Reviewed by Tim Horton.
Make sure we wake from AppNap if there is user interaction.
Source/WebCore:
* page/PageThrottler.h:
(WebCore::PageThrottler::didReceiveUserInput):
(WebCore::PageThrottler::pluginDidEvaluate):
- added, these call reportInterestingEvent()
Source/WebKit2:
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
(WebKit::NPRuntimeObjectMap::evaluate):
- reportInterestingEvent() -> pluginDidEvaluate()
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::mouseEvent):
(WebKit::WebPage::wheelEvent):
(WebKit::WebPage::keyEvent):
- call didReceiveUserInput()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePageThrottlerh">trunk/Source/WebCore/page/PageThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163646 => 163647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 22:12:03 UTC (rev 163646)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 22:27:06 UTC (rev 163647)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Should report user input to PageThrottler
+ https://bugs.webkit.org/show_bug.cgi?id=128398
+
+ Reviewed by Tim Horton.
+
+ Make sure we wake from AppNap if there is user interaction.
+
+ * page/PageThrottler.h:
+ (WebCore::PageThrottler::didReceiveUserInput):
+ (WebCore::PageThrottler::pluginDidEvaluate):
+ - added, these call reportInterestingEvent()
+
</ins><span class="cx"> 2014-02-07 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for 32-bit iOS.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (163646 => 163647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2014-02-07 22:12:03 UTC (rev 163646)
+++ trunk/Source/WebCore/page/PageThrottler.h 2014-02-07 22:27:06 UTC (rev 163647)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx">
</span><span class="cx"> void setIsVisuallyIdle(bool);
</span><span class="cx">
</span><del>- void reportInterestingEvent();
</del><ins>+ void didReceiveUserInput() { reportInterestingEvent(); }
+ void pluginDidEvaluate() { reportInterestingEvent(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum PageThrottleState {
</span><span class="lines">@@ -63,6 +64,8 @@
</span><span class="cx"> void addActivityToken(PageActivityAssertionToken&);
</span><span class="cx"> void removeActivityToken(PageActivityAssertionToken&);
</span><span class="cx">
</span><ins>+ void reportInterestingEvent();
+
</ins><span class="cx"> void startThrottleHysteresisTimer();
</span><span class="cx"> void stopThrottleHysteresisTimer();
</span><span class="cx"> void throttleHysteresisTimerFired(Timer<PageThrottler>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163646 => 163647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-07 22:12:03 UTC (rev 163646)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 22:27:06 UTC (rev 163647)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Should report user input to PageThrottler
+ https://bugs.webkit.org/show_bug.cgi?id=128398
+
+ Reviewed by Tim Horton.
+
+ Make sure we wake from AppNap if there is user interaction.
+
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+ (WebKit::NPRuntimeObjectMap::evaluate):
+ - reportInterestingEvent() -> pluginDidEvaluate()
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::mouseEvent):
+ (WebKit::WebPage::wheelEvent):
+ (WebKit::WebPage::keyEvent):
+ - call didReceiveUserInput()
+
</ins><span class="cx"> 2014-02-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL doesn't update with remotely hosted layers
</span><span class="lines">@@ -60,7 +78,7 @@
</span><span class="cx"> Reviewed by Tim Horton.
</span><span class="cx">
</span><span class="cx"> * Shared/WebPreferencesStore.h:
</span><del>- - pageVisibilityBasedProcessSuppressionEnabled shoud default to true.
</del><ins>+ - pageVisibilityBasedProcessSuppressionEnabled should default to true.
</ins><span class="cx">
</span><span class="cx"> 2014-02-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNPRuntimeObjectMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (163646 => 163647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2014-02-07 22:12:03 UTC (rev 163646)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2014-02-07 22:27:06 UTC (rev 163647)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_pluginView && !m_pluginView->isBeingDestroyed()) {
</span><span class="cx"> if (Page* page = m_pluginView->frame()->page())
</span><del>- page->pageThrottler().reportInterestingEvent();
</del><ins>+ page->pageThrottler().pluginDidEvaluate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExecState* exec = globalObject->globalExec();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163646 => 163647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-07 22:12:03 UTC (rev 163646)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-07 22:27:06 UTC (rev 163647)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> #include <WebCore/MainFrame.h>
</span><span class="cx"> #include <WebCore/MouseEvent.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><ins>+#include <WebCore/PageThrottler.h>
</ins><span class="cx"> #include <WebCore/PlatformKeyboardEvent.h>
</span><span class="cx"> #include <WebCore/PluginDocument.h>
</span><span class="cx"> #include <WebCore/PrintContext.h>
</span><span class="lines">@@ -1665,6 +1666,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
</span><span class="cx"> {
</span><ins>+ m_page->pageThrottler().didReceiveUserInput();
+
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> // Don't try to handle any pending mouse events if a context menu is showing.
</span><span class="cx"> if (m_isShowingContextMenu) {
</span><span class="lines">@@ -1745,6 +1748,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::wheelEvent(const WebWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><ins>+ m_page->pageThrottler().didReceiveUserInput();
+
</ins><span class="cx"> bool handled = false;
</span><span class="cx">
</span><span class="cx"> if (canHandleUserEvents()) {
</span><span class="lines">@@ -1774,6 +1779,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
</span><span class="cx"> {
</span><ins>+ m_page->pageThrottler().didReceiveUserInput();
+
</ins><span class="cx"> bool handled = false;
</span><span class="cx">
</span><span class="cx"> if (canHandleUserEvents()) {
</span></span></pre>
</div>
</div>
</body>
</html>