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

Bug 806996 part.1 Remove nsTextStateManager::mDestroying r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2012-11-09 17:40:39 +09:00
parent bd227d01e5
commit 6f952a8e02
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
content/events/src/nsIMEStateManager.cpp
View File

@ -68,7 +68,6 @@ public:
nsCOMPtr<nsISelection> mSel;
nsCOMPtr<nsIContent> mRootContent;
nsCOMPtr<nsINode> mEditableNode;
bool mDestroying;
private:
void NotifyContentAdded(nsINode* aContainer, int32_t aStart, int32_t aEnd);
@ -668,7 +667,6 @@ nsIMEStateManager::NotifyIME(NotificationToIME aNotification,
nsTextStateManager::nsTextStateManager()
{
mDestroying = false;
}
nsresult
@ -755,9 +753,8 @@ bool
nsTextStateManager::IsManaging(nsPresContext* aPresContext,
nsIContent* aContent)
{
return !mDestroying &&
mEditableNode == nsIMEStateManager::GetRootEditableNode(aPresContext,
aContent);
return mEditableNode == nsIMEStateManager::GetRootEditableNode(aPresContext,
aContent);
}
NS_IMPL_ISUPPORTS2(nsTextStateManager,
@ -968,13 +965,13 @@ nsIMEStateManager::IsEditableIMEState(nsIWidget* aWidget)
void
nsIMEStateManager::DestroyTextStateManager()
{
if (!sTextStateObserver || sTextStateObserver->mDestroying) {
if (!sTextStateObserver) {
return;
}
sTextStateObserver->mDestroying = true;
sTextStateObserver->Destroy();
NS_RELEASE(sTextStateObserver);
nsRefPtr<nsTextStateManager> tsm;
tsm.swap(sTextStateObserver);
tsm->Destroy();
}
void
@ -1018,10 +1015,8 @@ nsIMEStateManager::CreateTextStateManager()
return;
}
sTextStateObserver->mDestroying = true;
sTextStateObserver->Destroy();
NS_RELEASE(sTextStateObserver);
widget->OnIMEFocusChange(false);
DestroyTextStateManager();
}
nsresult