mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 240408 - allow SVG builds to handle SVG content in <html:embed> natively. 

r=dbaron, sr=jst
This commit is contained in:
tor%cs.brown.edu 2004-11-10 19:02:52 +00:00
Родитель 8dce8c33be
Коммит 370b9b1bf0
4 изменённых файлов: 38 добавлений и 202 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -469,7 +469,8 @@ nsObjectFrame::GetSkipSides() const
// #define DO_DIRTY_INTERSECT 1 // enable dirty rect intersection during paint
PRBool nsObjectFrame::IsSupportedImage(nsIContent* aContent)
/* static */ PRBool
nsObjectFrame::IsSupportedImage(nsIContent* aContent)
{
if (!aContent)
return PR_FALSE;
@ -517,7 +518,8 @@ PRBool nsObjectFrame::IsSupportedImage(nsIContent* aContent)
return NS_SUCCEEDED(rv) && supported;
}
PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
/* static */ PRBool
nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
{
nsresult rv;
@ -534,7 +536,13 @@ PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
{
// if we don't have a TYPE= try getting the mime-type via the DATA= url
nsAutoString data;
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data);
// If this is an OBJECT tag, we should look for a DATA attribute.
// If not, it's an EMBED tag, and so we should look for a SRC attribute.
if (aContent->Tag() == nsHTMLAtoms::object)
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data);
else
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, data);
if (rv != NS_CONTENT_ATTR_HAS_VALUE || data.IsEmpty()) {
return PR_FALSE;
}
@ -553,6 +561,13 @@ PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
} else {
CopyUTF16toUTF8(type, typeStr);
}
// only allow browser to handle content of <embed> for svg (bug 240408)
if (aContent->Tag() == nsHTMLAtoms::embed)
#ifdef MOZ_SVG
if (!typeStr.LowerCaseEqualsLiteral("image/svg+xml"))
#endif
return PR_FALSE;
nsXPIDLCString value;
rv = catman->GetCategoryEntry("Gecko-Content-Viewers", typeStr.get(), getter_Copies(value));
@ -630,11 +645,6 @@ nsObjectFrame::Init(nsPresContext* aPresContext,
return rv; // bail at this point
}
// only do the following for the object tag
if (aContent->Tag() != nsHTMLAtoms::object)
return rv;
// for now, we should try to do the same for "document" types and create
// and IFrame-like sub-frame
PRBool bDoc = IsSupportedDocument(aContent);

4
layout/generic/nsObjectFrame.h
Просмотреть файл

@ -118,8 +118,8 @@ public:
PRBool aViewOnly);
nsIURI* GetFullURL() { return mFullURL; }
PRBool IsSupportedImage(nsIContent* aContent);
PRBool IsSupportedDocument(nsIContent* aContent);
static PRBool IsSupportedImage(nsIContent* aContent);
static PRBool IsSupportedDocument(nsIContent* aContent);
// for a given aRoot, this walks the frame tree looking for the next outFrame
static nsIObjectFrame* GetNextObjectFrame(nsPresContext* aPresContext,

26
layout/html/base/src/nsObjectFrame.cpp
Просмотреть файл

@ -469,7 +469,8 @@ nsObjectFrame::GetSkipSides() const
// #define DO_DIRTY_INTERSECT 1 // enable dirty rect intersection during paint
PRBool nsObjectFrame::IsSupportedImage(nsIContent* aContent)
/* static */ PRBool
nsObjectFrame::IsSupportedImage(nsIContent* aContent)
{
if (!aContent)
return PR_FALSE;
@ -517,7 +518,8 @@ PRBool nsObjectFrame::IsSupportedImage(nsIContent* aContent)
return NS_SUCCEEDED(rv) && supported;
}
PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
/* static */ PRBool
nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
{
nsresult rv;
@ -534,7 +536,13 @@ PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
{
// if we don't have a TYPE= try getting the mime-type via the DATA= url
nsAutoString data;
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data);
// If this is an OBJECT tag, we should look for a DATA attribute.
// If not, it's an EMBED tag, and so we should look for a SRC attribute.
if (aContent->Tag() == nsHTMLAtoms::object)
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::data, data);
else
rv = aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::src, data);
if (rv != NS_CONTENT_ATTR_HAS_VALUE || data.IsEmpty()) {
return PR_FALSE;
}
@ -553,6 +561,13 @@ PRBool nsObjectFrame::IsSupportedDocument(nsIContent* aContent)
} else {
CopyUTF16toUTF8(type, typeStr);
}
// only allow browser to handle content of <embed> for svg (bug 240408)
if (aContent->Tag() == nsHTMLAtoms::embed)
#ifdef MOZ_SVG
if (!typeStr.LowerCaseEqualsLiteral("image/svg+xml"))
#endif
return PR_FALSE;
nsXPIDLCString value;
rv = catman->GetCategoryEntry("Gecko-Content-Viewers", typeStr.get(), getter_Copies(value));
@ -630,11 +645,6 @@ nsObjectFrame::Init(nsPresContext* aPresContext,
return rv; // bail at this point
}
// only do the following for the object tag
if (aContent->Tag() != nsHTMLAtoms::object)
return rv;
// for now, we should try to do the same for "document" types and create
// and IFrame-like sub-frame
PRBool bDoc = IsSupportedDocument(aContent);

184
layout/html/base/src/nsObjectFrame.h
Просмотреть файл

@ -1,184 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsObjectFrame_h___
#define nsObjectFrame_h___
#include "nsHTMLParts.h"
#include "nsHTMLContainerFrame.h"
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIPluginHost.h"
#include "nsplugin.h"
#include "nsIWidget.h"
#include "nsIObjectFrame.h"
#ifdef ACCESSIBILITY
class nsIAccessible;
#endif
class nsPluginInstanceOwner;
#define nsObjectFrameSuper nsHTMLContainerFrame
class nsObjectFrame : public nsObjectFrameSuper, public nsIObjectFrame {
public:
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD SetInitialChildList(nsPresContext* aPresContext,
nsIAtom* aListName,
nsIFrame* aChildList);
NS_IMETHOD Init(nsPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD DidReflow(nsPresContext* aPresContext,
const nsHTMLReflowState* aReflowState,
nsDidReflowStatus aStatus);
NS_IMETHOD Paint(nsPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
virtual nsIAtom* GetType() const;
virtual PRBool SupportsVisibilityHidden() { return PR_FALSE; }
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD Destroy(nsPresContext* aPresContext);
NS_IMETHOD GetPluginInstance(nsIPluginInstance*& aPluginInstance);
/* fail on any requests to get a cursor from us because plugins set their own! see bug 118877 */
NS_IMETHOD GetCursor(nsPresContext* aPresContext, nsPoint& aPoint, PRInt32& aCursor)
{ return NS_ERROR_NOT_IMPLEMENTED; };
//i18n helper
nsresult MakeAbsoluteURL(nsIURI* *aFullURI,
nsString aSrc,
nsIURI* aBaseURI);
// accessibility support
#ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
#ifdef XP_WIN
NS_IMETHOD GetPluginPort(HWND *aPort);
#endif
#endif
//local methods
nsresult CreateWidget(nsPresContext* aPresContext,
nscoord aWidth,
nscoord aHeight,
PRBool aViewOnly);
nsIURI* GetFullURL() { return mFullURL; }
PRBool IsSupportedImage(nsIContent* aContent);
PRBool IsSupportedDocument(nsIContent* aContent);
// for a given aRoot, this walks the frame tree looking for the next outFrame
static nsIObjectFrame* GetNextObjectFrame(nsPresContext* aPresContext,
nsIFrame* aRoot);
void FixUpURLS(const nsString &name, nsAString &value);
protected:
// nsISupports
NS_IMETHOD_(nsrefcnt) AddRef(void);
NS_IMETHOD_(nsrefcnt) Release(void);
virtual ~nsObjectFrame();
virtual PRIntn GetSkipSides() const;
// NOTE: This frame class does not inherit from |nsLeafFrame|, so
// this is not a virtual method implementation.
void GetDesiredSize(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsHTMLReflowMetrics& aDesiredSize);
nsresult InstantiateWidget(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
nsCID aWidgetCID);
nsresult InstantiatePlugin(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
nsIPluginHost* aPluginHost,
const char* aMimetype,
nsIURI* aURL);
nsresult ReinstantiatePlugin(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState);
nsresult HandleChild(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus,
nsIFrame* child);
// check attributes and optionally CSS to see if we should display anything
PRBool IsHidden(PRBool aCheckVisibilityStyle = PR_TRUE) const;
void NotifyContentObjectWrapper();
nsPoint GetWindowOriginInPixels(PRBool aWindowless);
friend class nsPluginInstanceOwner;
private:
nsPluginInstanceOwner *mInstanceOwner;
nsCOMPtr<nsIURI> mFullURL;
nsIFrame *mFirstChild;
nsCOMPtr<nsIWidget> mWidget;
nsRect mWindowlessRect;
};
#endif /* nsObjectFrame_h___ */