mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug 300639 (don't recompile xbl event handlers on every event dispatch). Patch by Robert Sayre, r/sr=peterv.

This commit is contained in:
peterv@propagandism.org 2007-12-04 23:21:18 -08:00
Родитель 09f936c891
Коммит 9ac6c3f72f
4 изменённых файлов: 273 добавлений и 182 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
content/xbl/src/nsXBLContentSink.cpp
Просмотреть файл

@ -676,11 +676,9 @@ nsXBLContentSink::ConstructHandler(const PRUnichar **aAtts, PRUint32 aLineNumber
newHandler = new nsXBLPrototypeHandler(event, phase, action, command,
keycode, charcode, modifiers, button,
clickcount, group, preventdefault,
allowuntrusted, mBinding);
allowuntrusted, mBinding, aLineNumber);
if (newHandler) {
newHandler->SetLineNumber(aLineNumber);
// Add this handler to our chain of handlers.
if (mHandler) {
// Already have a chain. Just append to the end.

18
content/xbl/src/nsXBLPrototypeBinding.cpp
Просмотреть файл

@ -361,6 +361,12 @@ nsXBLPrototypeBinding::Traverse(nsCycleCollectionTraversalCallback &cb) const
mInsertionPointTable->Enumerate(TraverseInsertionPoint, &cb);
if (mInterfaceTable)
mInterfaceTable->Enumerate(TraverseBinding, &cb);
nsXBLPrototypeHandler* curr = mPrototypeHandler;
while (curr) {
curr->Traverse(cb);
curr = curr->GetNextHandler();
}
}
void
@ -368,6 +374,12 @@ nsXBLPrototypeBinding::Unlink()
{
if (mImplementation)
mImplementation->Unlink();
nsXBLPrototypeHandler* curr = mPrototypeHandler;
while (curr) {
curr->Unlink();
curr = curr->GetNextHandler();
}
}
void
@ -375,6 +387,12 @@ nsXBLPrototypeBinding::Trace(TraceCallback aCallback, void *aClosure) const
{
if (mImplementation)
mImplementation->Trace(aCallback, aClosure);
nsXBLPrototypeHandler* curr = mPrototypeHandler;
while (curr) {
curr->Trace(aCallback, aClosure);
curr = curr->GetNextHandler();
}
}
void

402
content/xbl/src/nsXBLPrototypeHandler.cpp
Просмотреть файл

@ -46,7 +46,6 @@
#include "nsIDOMMouseEvent.h"
#include "nsINameSpaceManager.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIJSEventListener.h"
@ -82,7 +81,6 @@
#include "nsCRT.h"
#include "nsXBLEventHandler.h"
#include "nsEventDispatcher.h"
#include "nsDOMScriptObjectHolder.h"
static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@ -116,9 +114,11 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent,
const PRUnichar* aGroup,
const PRUnichar* aPreventDefault,
const PRUnichar* aAllowUntrusted,
nsXBLPrototypeBinding* aBinding)
nsXBLPrototypeBinding* aBinding,
PRUint32 aLineNumber)
: mHandlerText(nsnull),
mLineNumber(0),
mLineNumber(aLineNumber),
mCachedHandler(nsnull),
mNextHandler(nsnull),
mPrototypeBinding(aBinding)
{
@ -135,6 +135,7 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent,
nsXBLPrototypeHandler::nsXBLPrototypeHandler(nsIContent* aHandlerElement)
: mHandlerElement(nsnull),
mLineNumber(0),
mCachedHandler(nsnull),
mNextHandler(nsnull),
mPrototypeBinding(nsnull)
{
@ -160,6 +161,25 @@ nsXBLPrototypeHandler::~nsXBLPrototypeHandler()
delete mNextHandler;
}
void
nsXBLPrototypeHandler::Traverse(nsCycleCollectionTraversalCallback &cb) const
{
cb.NoteXPCOMChild(mGlobalForCachedHandler);
}
void
nsXBLPrototypeHandler::Trace(TraceCallback aCallback, void *aClosure) const
{
if (mCachedHandler)
aCallback(nsIProgrammingLanguage::JAVASCRIPT, mCachedHandler, aClosure);
}
void
nsXBLPrototypeHandler::Unlink()
{
ForgetCachedHandler();
}
already_AddRefed<nsIContent>
nsXBLPrototypeHandler::GetHandlerElement()
{
@ -184,6 +204,9 @@ nsXBLPrototypeHandler::AppendHandlerText(const nsAString& aText)
}
else
mHandlerText = ToNewUnicode(aText);
// Remove our cached handler
ForgetCachedHandler();
}
/////////////////////////////////////////////////////////////////////////////
@ -248,161 +271,14 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget,
}
if (isXBLCommand) {
// This is a special-case optimization to make command handling fast.
// It isn't really a part of XBL, but it helps speed things up.
// See if preventDefault has been set. If so, don't execute.
PRBool preventDefault = PR_FALSE;
nsCOMPtr<nsIDOMNSUIEvent> nsUIEvent(do_QueryInterface(aEvent));
if (nsUIEvent)
nsUIEvent->GetPreventDefault(&preventDefault);
if (preventDefault)
return NS_OK;
nsCOMPtr<nsIPrivateDOMEvent> privateEvent = do_QueryInterface(aEvent);
if (privateEvent) {
PRBool dispatchStopped;
privateEvent->IsDispatchStopped(&dispatchStopped);
if (dispatchStopped)
return NS_OK;
}
// Instead of executing JS, let's get the controller for the bound
// element and call doCommand on it.
nsCOMPtr<nsIController> controller;
nsCOMPtr<nsIFocusController> focusController;
nsCOMPtr<nsPIWindowRoot> windowRoot(do_QueryInterface(aTarget));
if (windowRoot) {
windowRoot->GetFocusController(getter_AddRefs(focusController));
}
else {
nsCOMPtr<nsPIDOMWindow> privateWindow(do_QueryInterface(aTarget));
if (!privateWindow) {
nsCOMPtr<nsIContent> elt(do_QueryInterface(aTarget));
nsCOMPtr<nsIDocument> doc;
// XXXbz sXBL/XBL2 issue -- this should be the "scope doc" or
// something... whatever we use when wrapping DOM nodes
// normally. It's not clear that the owner doc is the right
// thing.
if (elt)
doc = elt->GetOwnerDoc();
if (!doc)
doc = do_QueryInterface(aTarget);
if (!doc)
return NS_ERROR_FAILURE;
privateWindow = do_QueryInterface(doc->GetScriptGlobalObject());
if (!privateWindow)
return NS_ERROR_FAILURE;
}
focusController = privateWindow->GetRootFocusController();
}
NS_LossyConvertUTF16toASCII command(mHandlerText);
if (focusController)
focusController->GetControllerForCommand(command.get(), getter_AddRefs(controller));
else
controller = GetController(aTarget); // We're attached to the receiver possibly.
nsAutoString type;
mEventName->ToString(type);
if (type.EqualsLiteral("keypress") &&
mDetail == nsIDOMKeyEvent::DOM_VK_SPACE &&
mMisc == 1) {
// get the focused element so that we can pageDown only at
// certain times.
nsCOMPtr<nsIDOMElement> focusedElement;
focusController->GetFocusedElement(getter_AddRefs(focusedElement));
PRBool isLink = PR_FALSE;
nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
nsIContent *content = focusedContent;
// if the focused element is a link then we do want space to
// scroll down. focused element may be an element in a link,
// we need to check the parent node too.
if (focusedContent) {
while (content) {
if (content->Tag() == nsGkAtoms::a &&
content->IsNodeOfType(nsINode::eHTML)) {
isLink = PR_TRUE;
break;
}
if (content->HasAttr(kNameSpaceID_XLink, nsGkAtoms::type)) {
isLink = content->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
nsGkAtoms::simple, eCaseMatters);
if (isLink) {
break;
}
}
content = content->GetParent();
}
if (!isLink)
return NS_OK;
}
}
// We are the default action for this command.
// Stop any other default action from executing.
aEvent->PreventDefault();
if (controller)
controller->DoCommand(command.get());
return NS_OK;
return DispatchXBLCommand(aTarget, aEvent);
}
// If we're executing on a XUL key element, just dispatch a command
// event at the element. It will take care of retargeting it to its
// command element, if applicable, and executing the event handler.
if (isXULKey) {
nsCOMPtr<nsIContent> handlerElement = GetHandlerElement();
NS_ENSURE_STATE(handlerElement);
if (handlerElement->AttrValueIs(kNameSpaceID_None,
nsGkAtoms::disabled,
nsGkAtoms::_true,
eCaseMatters)) {
// Don't dispatch command events for disabled keys.
return NS_OK;
}
aEvent->PreventDefault();
nsEventStatus status = nsEventStatus_eIgnore;
nsXULCommandEvent event(PR_TRUE, NS_XUL_COMMAND, nsnull);
// Copy the modifiers from the key event.
nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aEvent);
if (!keyEvent) {
NS_ERROR("Trying to execute a key handler for a non-key event!");
return NS_ERROR_FAILURE;
}
keyEvent->GetAltKey(&event.isAlt);
keyEvent->GetCtrlKey(&event.isControl);
keyEvent->GetShiftKey(&event.isShift);
keyEvent->GetMetaKey(&event.isMeta);
nsPresContext *pc = nsnull;
nsIDocument *doc = handlerElement->GetCurrentDoc();
if (doc) {
nsIPresShell *shell = doc->GetPrimaryShell();
if (shell) {
pc = shell->GetPresContext();
}
}
nsEventDispatcher::Dispatch(handlerElement, pc, &event, nsnull, &status);
return NS_OK;
return DispatchXULKeyCommand(aEvent);
}
// Look for a compiled handler on the element.
@ -458,7 +334,8 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget,
return NS_OK;
nsIScriptContext *boundContext = boundGlobal->GetScriptContext(stID);
if (!boundContext) return NS_OK;
if (!boundContext)
return NS_OK;
nsScriptObjectHolder handler(boundContext);
nsISupports *scriptTarget;
@ -469,26 +346,11 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget,
scriptTarget = aTarget;
}
void *scope = boundGlobal->GetScriptGlobal(stID);
PRUint32 argCount;
const char **argNames;
nsContentUtils::GetEventArgNames(kNameSpaceID_XBL, onEventAtom, &argCount,
&argNames);
nsDependentString handlerText(mHandlerText);
if (handlerText.IsEmpty())
return NS_ERROR_FAILURE;
nsCAutoString bindingURI;
mPrototypeBinding->DocURI()->GetSpec(bindingURI);
rv = boundContext->CompileEventHandler(onEventAtom, argCount, argNames,
handlerText, bindingURI.get(),
mLineNumber, handler);
rv = EnsureEventHandler(boundGlobal, boundContext, onEventAtom, handler);
NS_ENSURE_SUCCESS(rv, rv);
// Temporarily bind it to the bound element
void *scope = boundGlobal->GetScriptGlobal(stID);
rv = boundContext->BindCompiledEventHandler(scriptTarget, scope,
onEventAtom, handler);
NS_ENSURE_SUCCESS(rv, rv);
@ -506,6 +368,203 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget,
return NS_OK;
}
nsresult
nsXBLPrototypeHandler::EnsureEventHandler(nsIScriptGlobalObject* aGlobal,
nsIScriptContext *aBoundContext,
nsIAtom *aName,
nsScriptObjectHolder &aHandler)
{
// Check to see if we've already compiled this
if (mCachedHandler && mGlobalForCachedHandler == aGlobal) {
aHandler.set(mCachedHandler);
if (!aHandler)
return NS_ERROR_FAILURE;
return NS_OK;
}
// Ensure that we have something to compile
nsDependentString handlerText(mHandlerText);
if (handlerText.IsEmpty())
return NS_ERROR_FAILURE;
nsCAutoString bindingURI;
mPrototypeBinding->DocURI()->GetSpec(bindingURI);
PRUint32 argCount;
const char **argNames;
nsContentUtils::GetEventArgNames(kNameSpaceID_XBL, aName, &argCount,
&argNames);
nsresult rv = aBoundContext->CompileEventHandler(aName, argCount, argNames,
handlerText, bindingURI.get(),
mLineNumber, aHandler);
NS_ENSURE_SUCCESS(rv, rv);
mCachedHandler = aHandler;
mGlobalForCachedHandler = aGlobal;
return NS_OK;
}
nsresult
nsXBLPrototypeHandler::DispatchXBLCommand(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent)
{
// This is a special-case optimization to make command handling fast.
// It isn't really a part of XBL, but it helps speed things up.
// See if preventDefault has been set. If so, don't execute.
PRBool preventDefault = PR_FALSE;
nsCOMPtr<nsIDOMNSUIEvent> nsUIEvent(do_QueryInterface(aEvent));
if (nsUIEvent)
nsUIEvent->GetPreventDefault(&preventDefault);
if (preventDefault)
return NS_OK;
nsCOMPtr<nsIPrivateDOMEvent> privateEvent = do_QueryInterface(aEvent);
if (privateEvent) {
PRBool dispatchStopped;
privateEvent->IsDispatchStopped(&dispatchStopped);
if (dispatchStopped)
return NS_OK;
}
// Instead of executing JS, let's get the controller for the bound
// element and call doCommand on it.
nsCOMPtr<nsIController> controller;
nsCOMPtr<nsIFocusController> focusController;
nsCOMPtr<nsPIWindowRoot> windowRoot(do_QueryInterface(aTarget));
if (windowRoot) {
windowRoot->GetFocusController(getter_AddRefs(focusController));
}
else {
nsCOMPtr<nsPIDOMWindow> privateWindow(do_QueryInterface(aTarget));
if (!privateWindow) {
nsCOMPtr<nsIContent> elt(do_QueryInterface(aTarget));
nsCOMPtr<nsIDocument> doc;
// XXXbz sXBL/XBL2 issue -- this should be the "scope doc" or
// something... whatever we use when wrapping DOM nodes
// normally. It's not clear that the owner doc is the right
// thing.
if (elt)
doc = elt->GetOwnerDoc();
if (!doc)
doc = do_QueryInterface(aTarget);
if (!doc)
return NS_ERROR_FAILURE;
privateWindow = do_QueryInterface(doc->GetScriptGlobalObject());
if (!privateWindow)
return NS_ERROR_FAILURE;
}
focusController = privateWindow->GetRootFocusController();
}
NS_LossyConvertUTF16toASCII command(mHandlerText);
if (focusController)
focusController->GetControllerForCommand(command.get(), getter_AddRefs(controller));
else
controller = GetController(aTarget); // We're attached to the receiver possibly.
nsAutoString type;
mEventName->ToString(type);
if (type.EqualsLiteral("keypress") &&
mDetail == nsIDOMKeyEvent::DOM_VK_SPACE &&
mMisc == 1) {
// get the focused element so that we can pageDown only at
// certain times.
nsCOMPtr<nsIDOMElement> focusedElement;
focusController->GetFocusedElement(getter_AddRefs(focusedElement));
PRBool isLink = PR_FALSE;
nsCOMPtr<nsIContent> focusedContent = do_QueryInterface(focusedElement);
nsIContent *content = focusedContent;
// if the focused element is a link then we do want space to
// scroll down. focused element may be an element in a link,
// we need to check the parent node too.
if (focusedContent) {
while (content) {
if (content->Tag() == nsGkAtoms::a &&
content->IsNodeOfType(nsINode::eHTML)) {
isLink = PR_TRUE;
break;
}
if (content->HasAttr(kNameSpaceID_XLink, nsGkAtoms::type)) {
isLink = content->AttrValueIs(kNameSpaceID_XLink, nsGkAtoms::type,
nsGkAtoms::simple, eCaseMatters);
if (isLink) {
break;
}
}
content = content->GetParent();
}
if (!isLink)
return NS_OK;
}
}
// We are the default action for this command.
// Stop any other default action from executing.
aEvent->PreventDefault();
if (controller)
controller->DoCommand(command.get());
return NS_OK;
}
nsresult
nsXBLPrototypeHandler::DispatchXULKeyCommand(nsIDOMEvent* aEvent)
{
nsCOMPtr<nsIContent> handlerElement = GetHandlerElement();
NS_ENSURE_STATE(handlerElement);
if (handlerElement->AttrValueIs(kNameSpaceID_None,
nsGkAtoms::disabled,
nsGkAtoms::_true,
eCaseMatters)) {
// Don't dispatch command events for disabled keys.
return NS_OK;
}
aEvent->PreventDefault();
nsEventStatus status = nsEventStatus_eIgnore;
nsXULCommandEvent event(PR_TRUE, NS_XUL_COMMAND, nsnull);
// Copy the modifiers from the key event.
nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aEvent);
if (!keyEvent) {
NS_ERROR("Trying to execute a key handler for a non-key event!");
return NS_ERROR_FAILURE;
}
keyEvent->GetAltKey(&event.isAlt);
keyEvent->GetCtrlKey(&event.isControl);
keyEvent->GetShiftKey(&event.isShift);
keyEvent->GetMetaKey(&event.isMeta);
nsPresContext *pc = nsnull;
nsIDocument *doc = handlerElement->GetCurrentDoc();
if (doc) {
nsIPresShell *shell = doc->GetPrimaryShell();
if (shell) {
pc = shell->GetPresContext();
}
}
nsEventDispatcher::Dispatch(handlerElement, pc, &event, nsnull, &status);
return NS_OK;
}
already_AddRefed<nsIAtom>
nsXBLPrototypeHandler::GetEventName()
{
@ -814,6 +873,7 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
mMisc = 0;
mKeyMask = 0;
mPhase = NS_PHASE_BUBBLING;
ForgetCachedHandler();
if (aAction)
mHandlerText = ToNewUnicode(nsDependentString(aAction));

31
content/xbl/src/nsXBLPrototypeHandler.h
Просмотреть файл

@ -46,6 +46,9 @@
#include "nsAutoPtr.h"
#include "nsXBLEventHandler.h"
#include "nsIWeakReference.h"
#include "nsIScriptGlobalObject.h"
#include "nsDOMScriptObjectHolder.h"
#include "nsCycleCollectionParticipant.h"
class nsIDOMEvent;
class nsIContent;
@ -80,7 +83,8 @@ public:
const PRUnichar* aClickCount, const PRUnichar* aGroup,
const PRUnichar* aPreventDefault,
const PRUnichar* aAllowUntrusted,
nsXBLPrototypeBinding* aBinding);
nsXBLPrototypeBinding* aBinding,
PRUint32 aLineNumber);
// This constructor is used only by XUL key handlers (e.g., <key>)
nsXBLPrototypeHandler(nsIContent* aKeyElement);
@ -111,10 +115,6 @@ public:
void AppendHandlerText(const nsAString& aText);
void SetLineNumber(PRUint32 aLineNumber) {
mLineNumber = aLineNumber;
}
PRUint8 GetPhase() { return mPhase; }
PRUint8 GetType() { return mType; }
@ -153,6 +153,10 @@ public:
return (mType & NS_HANDLER_ALLOW_UNTRUSTED) != 0;
}
void Traverse(nsCycleCollectionTraversalCallback &cb) const;
void Trace(TraceCallback aCallback, void *aClosure) const;
void Unlink();
public:
static PRUint32 gRefCnt;
@ -172,7 +176,16 @@ protected:
void ReportKeyConflict(const PRUnichar* aKey, const PRUnichar* aModifiers, nsIContent* aElement, const char *aMessageName);
void GetEventType(nsAString& type);
PRBool ModifiersMatchMask(nsIDOMUIEvent* aEvent);
nsresult DispatchXBLCommand(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent);
nsresult DispatchXULKeyCommand(nsIDOMEvent* aEvent);
nsresult EnsureEventHandler(nsIScriptGlobalObject* aGlobal,
nsIScriptContext *aBoundContext, nsIAtom *aName,
nsScriptObjectHolder &aHandler);
void ForgetCachedHandler()
{
mCachedHandler = nsnull;
mGlobalForCachedHandler = nsnull;
}
static PRInt32 KeyToMask(PRInt32 key);
static PRInt32 kAccelKey;
@ -217,8 +230,10 @@ protected:
// The primary filter information for mouse/key events.
PRInt32 mDetail; // For key events, contains a charcode or keycode. For
// mouse events, stores the button info.
// cache a handler to avoid compiling each time
void *mCachedHandler;
nsCOMPtr<nsIScriptGlobalObject> mGlobalForCachedHandler;
// Prototype handlers are chained. We own the next handler in the chain.
nsXBLPrototypeHandler* mNextHandler;