Bug 1106906 - Always return false from nsFocusManager::IsParentActivated in the parent process. r=smaug, a=sledru
authorMarkus Stange <mstange@themasta.com>
Wed, 21 Jan 2015 16:59:57 -0500
changeset 243003 0d51214654ad
parent 243002 e35e98044772
child 243004 1237ddff18be
push id4358
push userryanvm@gmail.com
push date2015-01-22 19:57 +0000
treeherdermozilla-beta@62f7b8ea571f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, sledru
bugs1106906
milestone36.0
Bug 1106906 - Always return false from nsFocusManager::IsParentActivated in the parent process. r=smaug, a=sledru
dom/base/nsFocusManager.h
--- a/dom/base/nsFocusManager.h
+++ b/dom/base/nsFocusManager.h
@@ -94,20 +94,16 @@ public:
 
   /**
    * Update the caret with current mode (whether in caret browsing mode or not).
    */
   void UpdateCaretForCaretBrowsingMode();
 
   bool IsParentActivated()
   {
-    if (mParentFocusType == ParentFocusType_Ignore) {
-      return mActiveWindow != nullptr;
-    }
-
     return mParentFocusType == ParentFocusType_Active;
   }
 
   /**
    * Returns the content node that would be focused if aWindow was in an
    * active window. This will traverse down the frame hierarchy, starting at
    * the given window aWindow. Sets aFocusedWindow to the window with the
    * document containing aFocusedContent. If no element is focused,