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 1192330 - add ia2AccessibleText::UpdateTextChangeData r=surkov

Browse Source 
Soon we will need to be able to update the text change event data from both
 HandleAccEvent() and ProxyTextChangeEvent(), so separate out the logic to do
 that into a function.
This commit is contained in:
Trevor Saunders 2015-08-06 16:57:31 -04:00
parent e43b77bce9
commit 2b5f6116ed
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
accessible/windows/ia2/ia2AccessibleText.cpp
View File

@ -622,3 +622,18 @@ ia2AccessibleText::InitTextChangeData()
ClearOnShutdown(&sLastTextChangeAcc); ClearOnShutdown(&sLastTextChangeAcc);
ClearOnShutdown(&sLastTextChangeString); ClearOnShutdown(&sLastTextChangeString);
} }
void
ia2AccessibleText::UpdateTextChangeData(HyperTextAccessibleWrap* aAcc,
bool aInsert, const nsString& aStr,
int32_t aStart, uint32_t aLen)
{
if (!sLastTextChangeString)
sLastTextChangeString = new nsString();
sLastTextChangeAcc = aAcc;
sLastTextChangeStart = aStart;
sLastTextChangeEnd = aStart + aLen;
sLastTextChangeWasInsert = aInsert;
*sLastTextChangeString = aStr;
}

3
accessible/windows/ia2/ia2AccessibleText.h
View File

@ -115,6 +115,9 @@ public:
/* [retval][out] */ IA2TextSegment *oldText); /* [retval][out] */ IA2TextSegment *oldText);
static void InitTextChangeData(); static void InitTextChangeData();
static void UpdateTextChangeData(HyperTextAccessibleWrap* aAcc, bool aInsert,
const nsString& aStr, int32_t aStart,
uint32_t aLen);
protected: protected:
static StaticRefPtr<HyperTextAccessibleWrap> sLastTextChangeAcc; static StaticRefPtr<HyperTextAccessibleWrap> sLastTextChangeAcc;

15
accessible/windows/msaa/HyperTextAccessibleWrap.cpp
View File

@ -53,16 +53,13 @@ HyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
eventType == nsIAccessibleEvent::EVENT_TEXT_INSERTED) { eventType == nsIAccessibleEvent::EVENT_TEXT_INSERTED) {
Accessible* accessible = aEvent->GetAccessible(); Accessible* accessible = aEvent->GetAccessible();
if (accessible && accessible->IsHyperText()) { if (accessible && accessible->IsHyperText()) {
sLastTextChangeAcc =
static_cast<HyperTextAccessibleWrap*>(accessible->AsHyperText());
if (!sLastTextChangeString)
sLastTextChangeString = new nsString();
AccTextChangeEvent* event = downcast_accEvent(aEvent); AccTextChangeEvent* event = downcast_accEvent(aEvent);
event->GetModifiedText(*sLastTextChangeString); HyperTextAccessibleWrap* text =
sLastTextChangeStart = event->GetStartOffset(); static_cast<HyperTextAccessibleWrap*>(accessible->AsHyperText());
sLastTextChangeEnd = sLastTextChangeStart + event->GetLength(); ia2AccessibleText::UpdateTextChangeData(text, event->IsTextInserted(),
sLastTextChangeWasInsert = event->IsTextInserted(); event->ModifiedText(),
event->GetStartOffset(),
event->GetLength());
} }
} }