[orca] Move clearing of flat review context out of event manager and into script

[Joanmarie Diggs <joanied src gnome org>]

commit 9bae5f3abf4651d570026a454c793c5c16df7046
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Mar 26 12:58:52 2018 -0400

    Move clearing of flat review context out of event manager and into script

 src/orca/event_manager.py   |    9 ---------
 src/orca/scripts/default.py |    1 +
 2 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index 3f72366..569e4dc 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -663,15 +663,6 @@ class EventManager:
                 if role == pyatspi.ROLE_FRAME:
                     _scriptManager.reclaimScripts()
 
-        # Clean up any flat review context so that Orca does not get
-        # confused (see bgo#609633)
-        #
-        if eType.startswith("window:deactivate") \
-           and orca_state.activeScript \
-           and orca_state.activeScript.flatReviewContext \
-           and orca_state.activeScript.app == event.host_application:
-            orca_state.activeScript.flatReviewContext = None
-
         try:
             state = event.source.getState()
         except (LookupError, RuntimeError):
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 77a943b..32139cc 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2825,6 +2825,7 @@ class Script(script.Script):
         if event.source == orca_state.activeWindow:
             orca.setLocusOfFocus(event, None)
             orca_state.activeWindow = None
+            self.flatReviewContext = None
 
         # disable list notification  messages mode
         orca_state.listNotificationsModeEnabled = False