Merge mc->Maple

2012-03-13 11:05:28 -04:00
parent db205def09 83a08cc477
commit bbefdec4f2
578 changed files with 12639 additions and 4868 deletions
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5128,6 +5128,9 @@ void PresShell::SetRenderingState(const RenderingState& aState)

 void PresShell::SynthesizeMouseMove(bool aFromScroll)
 {
+  if (!sSynthMouseMove)
+    return;
+
  if (mPaintingSuppressed || !mIsActive || !mPresContext) {
    return;
  }