mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 1192330 - move static text change data from HyperTextAccessibleWrap to ia2AccessibleText r=surkov
This will enable us to remove the virtual function GetModifiedText().
This commit is contained in:
parent
ae892e0614
commit
a91563ffa5
@ -13,9 +13,16 @@
|
||||
#include "HyperTextAccessibleWrap.h"
|
||||
#include "HyperTextAccessible-inl.h"
|
||||
#include "ProxyWrappers.h"
|
||||
#include "mozilla/ClearOnShutdown.h"
|
||||
|
||||
using namespace mozilla::a11y;
|
||||
|
||||
StaticRefPtr<Accessible> ia2AccessibleText::sLastTextChangeAcc;
|
||||
StaticAutoPtr<nsString> ia2AccessibleText::sLastTextChangeString;
|
||||
uint32_t ia2AccessibleText::sLastTextChangeStart = 0;
|
||||
uint32_t ia2AccessibleText::sLastTextChangeEnd = 0;
|
||||
bool ia2AccessibleText::sLastTextChangeWasInsert = false;
|
||||
|
||||
// IAccessibleText
|
||||
|
||||
STDMETHODIMP
|
||||
@ -608,3 +615,9 @@ ia2AccessibleText::GetGeckoTextBoundary(enum IA2TextBoundaryType aBoundaryType)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ia2AccessibleText::InitTextChangeData()
|
||||
{
|
||||
ClearOnShutdown(&sLastTextChangeAcc);
|
||||
ClearOnShutdown(&sLastTextChangeString);
|
||||
}
|
||||
|
@ -113,11 +113,19 @@ public:
|
||||
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_oldText(
|
||||
/* [retval][out] */ IA2TextSegment *oldText);
|
||||
|
||||
static void InitTextChangeData();
|
||||
|
||||
protected:
|
||||
virtual nsresult GetModifiedText(bool aGetInsertedText, nsAString& aText,
|
||||
uint32_t *aStartOffset,
|
||||
uint32_t *aEndOffset) = 0;
|
||||
|
||||
static StaticRefPtr<Accessible> sLastTextChangeAcc;
|
||||
static StaticAutoPtr<nsString> sLastTextChangeString;
|
||||
static bool sLastTextChangeWasInsert;
|
||||
static uint32_t sLastTextChangeStart;
|
||||
static uint32_t sLastTextChangeEnd;
|
||||
|
||||
private:
|
||||
HRESULT GetModifiedText(bool aGetInsertedText, IA2TextSegment *aNewText);
|
||||
AccessibleTextBoundary GetGeckoTextBoundary(enum IA2TextBoundaryType coordinateType);
|
||||
|
@ -15,12 +15,6 @@
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::a11y;
|
||||
|
||||
StaticRefPtr<Accessible> HyperTextAccessibleWrap::sLastTextChangeAcc;
|
||||
StaticAutoPtr<nsString> HyperTextAccessibleWrap::sLastTextChangeString;
|
||||
uint32_t HyperTextAccessibleWrap::sLastTextChangeStart = 0;
|
||||
uint32_t HyperTextAccessibleWrap::sLastTextChangeEnd = 0;
|
||||
bool HyperTextAccessibleWrap::sLastTextChangeWasInsert = false;
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessibleWrap,
|
||||
HyperTextAccessible)
|
||||
|
||||
|
@ -42,14 +42,6 @@ protected:
|
||||
virtual nsresult GetModifiedText(bool aGetInsertedText, nsAString& aText,
|
||||
uint32_t *aStartOffset,
|
||||
uint32_t *aEndOffset);
|
||||
|
||||
static StaticRefPtr<Accessible> sLastTextChangeAcc;
|
||||
static StaticAutoPtr<nsString> sLastTextChangeString;
|
||||
static bool sLastTextChangeWasInsert;
|
||||
static uint32_t sLastTextChangeStart;
|
||||
static uint32_t sLastTextChangeEnd;
|
||||
|
||||
friend void PlatformInit();
|
||||
};
|
||||
|
||||
} // namespace a11y
|
||||
|
@ -9,12 +9,11 @@
|
||||
#include "AccEvent.h"
|
||||
#include "Compatibility.h"
|
||||
#include "HyperTextAccessibleWrap.h"
|
||||
#include "ia2AccessibleText.h"
|
||||
#include "nsWinUtils.h"
|
||||
#include "mozilla/a11y/ProxyAccessible.h"
|
||||
#include "ProxyWrappers.h"
|
||||
|
||||
#include "mozilla/ClearOnShutdown.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::a11y;
|
||||
|
||||
@ -24,8 +23,7 @@ a11y::PlatformInit()
|
||||
Compatibility::Init();
|
||||
|
||||
nsWinUtils::MaybeStartWindowEmulation();
|
||||
ClearOnShutdown(&HyperTextAccessibleWrap::sLastTextChangeAcc);
|
||||
ClearOnShutdown(&HyperTextAccessibleWrap::sLastTextChangeString);
|
||||
ia2AccessibleText::InitTextChangeData();
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user