author | Ms2ger <ms2ger@gmail.com> |
Wed, 18 Jul 2012 12:36:08 +0200 | |
changeset 99520 | dc4e1fe03e92b6523b6c27435b69cb7ab581a77c |
parent 99519 | dcca069277d0deb5d5a7ff1ba354aad57a78fb72 |
child 99521 | 1d636b78f5f7b77e1544280e43cea5fc964b1242 |
push id | 23139 |
push user | Ms2ger@gmail.com |
push date | Wed, 18 Jul 2012 10:37:46 +0000 |
treeherder | mozilla-central@bf09f11b69d8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | smaug |
bugs | 771933 |
milestone | 17.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
content/events/src/nsDOMEvent.cpp | file | annotate | diff | comparison | revisions | |
content/events/src/nsDOMEvent.h | file | annotate | diff | comparison | revisions |
--- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -519,23 +519,22 @@ nsDOMEvent::PreventDefault() mEvent->flags |= NS_EVENT_FLAG_NO_DEFAULT_CALLED_IN_CONTENT; } } } return NS_OK; } -nsresult +void nsDOMEvent::SetEventType(const nsAString& aEventTypeArg) { mEvent->userType = nsContentUtils::GetEventIdAndAtom(aEventTypeArg, mEvent->eventStructType, &(mEvent->message)); - return NS_OK; } NS_IMETHODIMP nsDOMEvent::InitEvent(const nsAString& aEventTypeArg, bool aCanBubbleArg, bool aCancelableArg) { // Make sure this event isn't already being dispatched. NS_ENSURE_TRUE(!NS_IS_EVENT_IN_DISPATCH(mEvent), NS_ERROR_INVALID_ARG); @@ -546,17 +545,17 @@ nsDOMEvent::InitEvent(const nsAString& a nsContentUtils::GetSecurityManager()-> IsCapabilityEnabled("UniversalXPConnect", &enabled); if (!enabled) { SetTrusted(false); } } - NS_ENSURE_SUCCESS(SetEventType(aEventTypeArg), NS_ERROR_FAILURE); + SetEventType(aEventTypeArg); if (aCanBubbleArg) { mEvent->flags &= ~NS_EVENT_FLAG_CANT_BUBBLE; } else { mEvent->flags |= NS_EVENT_FLAG_CANT_BUBBLE; } if (aCancelableArg) {
--- a/content/events/src/nsDOMEvent.h +++ b/content/events/src/nsDOMEvent.h @@ -219,17 +219,17 @@ public: nsIntPoint aPoint, nsIntPoint aDefaultPoint); static nsIntPoint GetScreenCoords(nsPresContext* aPresContext, nsEvent* aEvent, nsIntPoint aPoint); protected: // Internal helper functions - nsresult SetEventType(const nsAString& aEventTypeArg); + void SetEventType(const nsAString& aEventTypeArg); already_AddRefed<nsIContent> GetTargetFromFrame(); nsEvent* mEvent; nsRefPtr<nsPresContext> mPresContext; nsCOMPtr<nsIDOMEventTarget> mExplicitOriginalTarget; nsString mCachedType; bool mEventIsInternal; bool mPrivateDataDuplicated;