Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175104 => 175105)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:22:38 UTC (rev 175105)
@@ -1,5 +1,23 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge r172646.
+
+ 2014-08-15 Gavin Barraclough <[email protected]>
+
+ Fix plugin visibility check.
+ https://bugs.webkit.org/show_bug.cgi?id=135991
+
+ Unreviewed typo fix.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::PluginControllerProxy):
+ (WebKit::PluginControllerProxy::visibilityDidChange):
+ (WebKit::PluginControllerProxy::windowVisibilityChanged):
+ (WebKit::PluginControllerProxy::updateVisiblityActivity):
+ * PluginProcess/PluginControllerProxy.h:
+
+2014-10-23 Babak Shafiei <[email protected]>
+
Merge r172645.
2014-08-15 Gavin Barraclough <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175104 => 175105)
--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:22:38 UTC (rev 175105)
@@ -61,8 +61,8 @@
, m_isPrivateBrowsingEnabled(creationParameters.isPrivateBrowsingEnabled)
, m_isAcceleratedCompositingEnabled(creationParameters.isAcceleratedCompositingEnabled)
, m_isInitializing(false)
- , m_isVisibile(false)
- , m_isWindowVisibile(false)
+ , m_isVisible(false)
+ , m_isWindowVisible(false)
, m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint)
, m_pluginDestructionProtectCount(0)
, m_pluginDestroyTimer(RunLoop::main(), this, &PluginControllerProxy::destroy)
@@ -432,7 +432,7 @@
void PluginControllerProxy::visibilityDidChange(bool isVisible)
{
- m_isVisibile = isVisible;
+ m_isVisible = isVisible;
ASSERT(m_plugin);
m_plugin->visibilityDidChange(isVisible);
@@ -448,7 +448,7 @@
void PluginControllerProxy::windowVisibilityChanged(bool isVisible)
{
- m_isWindowVisibile = isVisible;
+ m_isWindowVisible = isVisible;
ASSERT(m_plugin);
m_plugin->windowVisibilityChanged(isVisible);
@@ -458,7 +458,7 @@
void PluginControllerProxy::updateVisiblityActivity()
{
- if (m_isVisibile && m_isWindowVisibile)
+ if (m_isVisible && m_isWindowVisible)
m_visiblityActivity.start();
else
m_visiblityActivity.stop();
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175104 => 175105)
--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:21:41 UTC (rev 175104)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:22:38 UTC (rev 175105)
@@ -177,8 +177,8 @@
bool m_isPrivateBrowsingEnabled;
bool m_isAcceleratedCompositingEnabled;
bool m_isInitializing;
- bool m_isVisibile;
- bool m_isWindowVisibile;
+ bool m_isVisible;
+ bool m_isWindowVisible;
RefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> m_initializationReply;
