зеркало из https://github.com/mozilla/pjs.git
Bug 312788. Crash when exposing plugins with width or height of 0. r=parente, sr=bryner
This commit is contained in:
Родитель
f0d80c29cd
Коммит
57b27c0830
|
@ -718,6 +718,10 @@ nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
|
||||||
nsIFrame *frame;
|
nsIFrame *frame;
|
||||||
GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
|
GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
|
||||||
|
|
||||||
|
*aAccessible = nsnull;
|
||||||
|
if (!frame || frame->GetRect().IsEmpty()) {
|
||||||
|
return NS_ERROR_FAILURE;
|
||||||
|
}
|
||||||
// 1) for object elements containing either HTML or TXT documents
|
// 1) for object elements containing either HTML or TXT documents
|
||||||
nsCOMPtr<nsIDOMDocument> domDoc;
|
nsCOMPtr<nsIDOMDocument> domDoc;
|
||||||
nsCOMPtr<nsIDOMHTMLObjectElement> obj(do_QueryInterface(node));
|
nsCOMPtr<nsIDOMHTMLObjectElement> obj(do_QueryInterface(node));
|
||||||
|
|
|
@ -85,7 +85,7 @@ NS_IMETHODIMP nsHTMLWin32ObjectOwnerAccessible::GetChildCount(PRInt32 *aChildCou
|
||||||
}
|
}
|
||||||
|
|
||||||
nsHTMLWin32ObjectAccessible::nsHTMLWin32ObjectAccessible(void* aHwnd):
|
nsHTMLWin32ObjectAccessible::nsHTMLWin32ObjectAccessible(void* aHwnd):
|
||||||
nsAccessibleWrap(nsnull, nsnull)
|
nsLeafAccessible(nsnull, nsnull)
|
||||||
{
|
{
|
||||||
mHwnd = aHwnd;
|
mHwnd = aHwnd;
|
||||||
if (mHwnd) {
|
if (mHwnd) {
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
#define _nsHTMLWin32ObjectAccessible_H_
|
#define _nsHTMLWin32ObjectAccessible_H_
|
||||||
|
|
||||||
#include "nsIAccessibleWin32Object.h"
|
#include "nsIAccessibleWin32Object.h"
|
||||||
#include "nsAccessibleWrap.h"
|
#include "nsBaseWidgetAccessible.h"
|
||||||
|
|
||||||
struct IAccessible;
|
struct IAccessible;
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ protected:
|
||||||
* object returned by us in Accessible::NewAccessible() that gets the IAccessible
|
* object returned by us in Accessible::NewAccessible() that gets the IAccessible
|
||||||
* from the windows system from the window handle.
|
* from the windows system from the window handle.
|
||||||
*/
|
*/
|
||||||
class nsHTMLWin32ObjectAccessible : public nsAccessibleWrap,
|
class nsHTMLWin32ObjectAccessible : public nsLeafAccessible,
|
||||||
public nsIAccessibleWin32Object
|
public nsIAccessibleWin32Object
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче