wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 76f9cced8105 (bug 902715) for build bustage on at least Windows on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2013-09-20 16:07:13 -07:00
parent 536d657d91
commit 6905761d71
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsGlobalWindow.cpp
View File

@ -34,7 +34,6 @@
#include "nsIPermissionManager.h"
#include "nsIScriptContext.h"
#include "nsIScriptTimeoutHandler.h"
#include "mozilla/dom/TabChild.h"
#ifdef XP_WIN
// Thanks so much, Microsoft! :(
@ -5712,9 +5711,6 @@ nsGlobalWindow::Focus()
return fm->SetFocus(frameElement, flags);
}
}
else if (TabChild *child = TabChild::GetFrom(this)) {
child->SendRequestFocus(canFocus);
}
else if (canFocus) {
// if there is no parent, this must be a toplevel window, so raise the
// window if canFocus is true

6
dom/ipc/PBrowser.ipdl
View File

@ -163,12 +163,6 @@ parent:
*/
sync EndIMEComposition(bool cancel) returns (nsString composition);
/**
* Request that the parent process move focus to the browser's frame. If
* canRaise is true, the window can be raised if it is inactive.
*/
RequestFocus(bool canRaise);
sync GetInputContext() returns (int32_t IMEEnabled, int32_t IMEOpen,
intptr_t NativeIMEContext);

22
dom/ipc/TabParent.cpp
View File

@ -897,28 +897,6 @@ TabParent::RecvNotifyIMETextHint(const nsString& aText)
return true;
}
bool
TabParent::RecvRequestFocus(const bool& aCanFocus)
{
nsCOMPtr<nsIFocusManager> fm = nsFocusManager::GetFocusManager();
if (!fm) {
return true;
}
nsCOMPtr<nsIContent> content = do_QueryInterface(mFrameElement);
if (!content || !content->OwnerDoc()) {
return true;
}
uint32_t flags = nsIFocusManager::FLAG_NOSCROLL;
if (aCanFocus)
flags |= nsIFocusManager::FLAG_RAISE;
nsCOMPtr<nsIDOMElement> node = do_QueryInterface(mFrameElement);
fm->SetFocus(node, flags);
return true;
}
/**
* Try to answer query event using cached text.
*

1
dom/ipc/TabParent.h
View File

@ -149,7 +149,6 @@ public:
const nsString& aActionHint,
const int32_t& aCause,
const int32_t& aFocusChange);
virtual bool RecvRequestFocus(const bool& aCanFocus);
virtual bool RecvSetCursor(const uint32_t& aValue);
virtual bool RecvSetBackgroundColor(const nscolor& aValue);
virtual bool RecvSetStatus(const uint32_t& aType, const nsString& aStatus);