r=edburns
Author: Ron Capelli
These changes make webclient run with Mozilla 1.4.
Summary of changes:
src_moz/rdf_util.cpp
reason: API change to RDFServiceImpl::GetResource()
src_moz/RDFActionEvents.cpp
reason: API change to RDFServiceImpl::GetUnicodeResource()
src_moz/wsRDFObserver.cpp
reason: member name changes to inherited nsIRDFObserver
src_moz/CBrowserContainer.cpp
reasons:
- replaced obsolete/deleted nsFileSpec.h with nsCRT.h
(to access only required/referenced function)
- added new SetBlurSuppression and GetBlurSuppression methods
required by change to inherited nsIBaseWindow (implementation
copied from mozilla/xpfe/appshell/src/nsXULWindow.cpp).
src_moz/CBrowserContainer.h
reason: added mBlurSuppressionLevel member variable for
SetBlurSuppression and GetBlurSuppression methods.
The changes were relatively straightforward to identify from errors
attempting to build with Mozilla 1.4. Testing so far indicates no
new problems have been introduced...
git-svn-id: svn://10.0.0.236/trunk@144789 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
#include "prprf.h" // for PR_snprintf
|
||||
#include "nsReadableUtils.h"
|
||||
#include "nsXPIDLString.h"
|
||||
#include "nsFileSpec.h" // for nsAutoCString
|
||||
#include "nsCRT.h"
|
||||
|
||||
#include "dom_util.h"
|
||||
|
||||
@@ -56,7 +56,8 @@ CBrowserContainer::CBrowserContainer(nsIWebBrowser *pOwner, JNIEnv *env,
|
||||
m_pOwner(pOwner), mJNIEnv(env), mInitContext(yourInitContext),
|
||||
mDocTarget(nsnull), mMouseTarget(nsnull), mPrompt(nsnull),
|
||||
mDomEventTarget(nsnull), inverseDepth(-1),
|
||||
properties(nsnull), currentDOMEvent(nsnull)
|
||||
properties(nsnull), currentDOMEvent(nsnull),
|
||||
mBlurSuppressionLevel(0)
|
||||
{
|
||||
NS_INIT_ISUPPORTS();
|
||||
// initialize the string constants (including properties keys)
|
||||
@@ -1165,6 +1166,28 @@ CBrowserContainer::SetTitle(const PRUnichar * aTitle)
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CBrowserContainer::SetBlurSuppression(PRBool aBlurSuppression)
|
||||
{
|
||||
if (aBlurSuppression)
|
||||
++mBlurSuppressionLevel;
|
||||
else
|
||||
{
|
||||
NS_ASSERTION(mBlurSuppressionLevel > 0, "blur over-allowed");
|
||||
if (mBlurSuppressionLevel > 0)
|
||||
--mBlurSuppressionLevel;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CBrowserContainer::GetBlurSuppression(PRBool *aBlurSuppression)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aBlurSuppression);
|
||||
*aBlurSuppression = (mBlurSuppressionLevel > 0);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// nsIWebBrowserChrome implementation
|
||||
|
||||
Reference in New Issue
Block a user