Title: [175106] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175106
- Author
- [email protected]
- Date
- 2014-10-23 02:23:38 -0700 (Thu, 23 Oct 2014)
Log Message
Merged r172653. rdar://problem/18428706
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175105 => 175106)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:22:38 UTC (rev 175105)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:23:38 UTC (rev 175106)
@@ -1,5 +1,23 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge r172653.
+
+ 2014-08-15 Gavin Barraclough <[email protected]>
+
+ Fix plugin visibility check.
+ https://bugs.webkit.org/show_bug.cgi?id=135991
+
+ D'oh, more unreviewed typo fix. :-(
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::visibilityDidChange):
+ (WebKit::PluginControllerProxy::windowVisibilityChanged):
+ (WebKit::PluginControllerProxy::updateVisibilityActivity):
+ (WebKit::PluginControllerProxy::updateVisiblityActivity): Deleted.
+ * PluginProcess/PluginControllerProxy.h:
+
+2014-10-23 Babak Shafiei <[email protected]>
+
Merge r172646.
2014-08-15 Gavin Barraclough <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175105 => 175106)
--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:22:38 UTC (rev 175105)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:23:38 UTC (rev 175106)
@@ -437,7 +437,7 @@
ASSERT(m_plugin);
m_plugin->visibilityDidChange(isVisible);
- updateVisiblityActivity();
+ updateVisibilityActivity();
}
void PluginControllerProxy::windowFocusChanged(bool hasFocus)
@@ -453,10 +453,10 @@
ASSERT(m_plugin);
m_plugin->windowVisibilityChanged(isVisible);
- updateVisiblityActivity();
+ updateVisibilityActivity();
}
-void PluginControllerProxy::updateVisiblityActivity()
+void PluginControllerProxy::updateVisibilityActivity()
{
if (m_isVisible && m_isWindowVisible)
m_visiblityActivity.start();
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175105 => 175106)
--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:22:38 UTC (rev 175105)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:23:38 UTC (rev 175106)
@@ -151,7 +151,7 @@
void windowFocusChanged(bool);
void windowVisibilityChanged(bool);
- void updateVisiblityActivity();
+ void updateVisibilityActivity();
#if PLATFORM(COCOA)
void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
