diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 31a0598b2f2f..dfae77b7f9a7 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -88,7 +88,6 @@ #include "nsIJSContextStack.h" #include "nsIScriptObjectPrincipal.h" #include "nsDocumentCharsetInfoCID.h" -#include "nsICanvasFrame.h" #include "nsIScrollableFrame.h" #include "nsContentPolicyUtils.h" // NS_CheckContentLoadPolicy(...) #include "nsICategoryManager.h" diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ad292cefb041..12dfe2e85995 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -82,7 +82,7 @@ // Interfaces Needed #include "nsIFrame.h" -#include "nsICanvasFrame.h" +#include "nsCanvasFrame.h" #include "nsIWidget.h" #include "nsIBaseWindow.h" #include "nsIAccelerometer.h" @@ -6887,11 +6887,11 @@ nsGlobalWindow::FireHashchange() PR_FALSE, PR_FALSE); } -// Find an nsICanvasFrame under aFrame. Only search the principal +// Find an nsCanvasFrame under aFrame. Only search the principal // child lists. aFrame must be non-null. -static nsICanvasFrame* FindCanvasFrame(nsIFrame* aFrame) +static nsCanvasFrame* FindCanvasFrame(nsIFrame* aFrame) { - nsICanvasFrame* canvasFrame = do_QueryFrame(aFrame); + nsCanvasFrame* canvasFrame = do_QueryFrame(aFrame); if (canvasFrame) { return canvasFrame; } @@ -6939,7 +6939,7 @@ nsGlobalWindow::UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent) nsIFrame* frame = presShell->GetPrimaryFrameFor(rootContent); if (frame) { frame = frame->GetParent(); - nsICanvasFrame* canvasFrame = do_QueryFrame(frame); + nsCanvasFrame* canvasFrame = do_QueryFrame(frame); if (canvasFrame) { canvasFrame->SetHasFocus(mHasFocus && rootContent == aNewContent); } @@ -6949,7 +6949,7 @@ nsGlobalWindow::UpdateCanvasFocus(PRBool aFocusChanged, nsIContent* aNewContent) // Look for the frame the hard way nsIFrame* frame = presShell->GetRootFrame(); if (frame) { - nsICanvasFrame* canvasFrame = FindCanvasFrame(frame); + nsCanvasFrame* canvasFrame = FindCanvasFrame(frame); if (canvasFrame) { canvasFrame->SetHasFocus(PR_FALSE); } diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 3f7cf0e6ad95..ed191b333bc7 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -2726,14 +2726,14 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) ViewportFrame [fixed-cb] nsHTMLScrollFrame - CanvasFrame [abs-cb] + nsCanvasFrame [abs-cb] root element frame (nsBlockFrame, nsSVGOuterSVGFrame, nsTableOuterFrame, nsPlaceholderFrame) Galley presentation, non-XUL, without scrolling (i.e. a frameset): ViewportFrame [fixed-cb] - CanvasFrame [abs-cb] + nsCanvasFrame [abs-cb] root element frame (nsBlockFrame) Galley presentation, XUL @@ -2748,7 +2748,7 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) nsSimplePageSequenceFrame nsPageFrame [fixed-cb] nsPageContentFrame - CanvasFrame [abs-cb] + nsCanvasFrame [abs-cb] root element frame (nsBlockFrame, nsSVGOuterSVGFrame, nsTableOuterFrame, nsPlaceholderFrame) @@ -2759,7 +2759,7 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) nsSimplePageSequenceFrame nsPageFrame [fixed-cb] nsPageContentFrame - CanvasFrame [abs-cb] + nsCanvasFrame [abs-cb] root element frame (nsBlockFrame, nsSVGOuterSVGFrame, nsTableOuterFrame, nsPlaceholderFrame) @@ -2771,7 +2771,7 @@ nsCSSFrameConstructor::SetUpDocElementContainingBlock(nsIContent* aDocElement) mRootElementFrame is "root element frame". This is the primary frame for the root element. mDocElementContainingBlock is the parent of mRootElementFrame - (i.e. CanvasFrame or nsRootBoxFrame) + (i.e. nsCanvasFrame or nsRootBoxFrame) mFixedContainingBlock is the [fixed-cb] mGfxScrollFrame is the nsHTMLScrollFrame mentioned above, or null if there isn't one mPageSequenceFrame is the nsSimplePageSequenceFrame, or null if there isn't one diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index ce0f79794196..851170c5790e 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -197,7 +197,7 @@ #endif #include "nsPlaceholderFrame.h" -#include "nsHTMLFrame.h" +#include "nsCanvasFrame.h" // Content viewer interfaces #include "nsIContentViewer.h" @@ -5312,7 +5312,7 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags, rect.MoveBy(-pos); builder.SetIgnoreScrollFrame(rootScrollFrame); - CanvasFrame* canvasFrame = + nsCanvasFrame* canvasFrame = do_QueryFrame(rootScrollableFrame->GetScrolledFrame()); if (canvasFrame) { canvasArea = diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 09e31b27bb32..06ef242ade29 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -54,11 +54,11 @@ LIBXUL_LIBRARY = 1 EXPORTS = \ nsQueryFrame.h \ nsFrameList.h \ + nsCanvasFrame.h \ nsHTMLParts.h \ nsHTMLReflowMetrics.h \ nsHTMLReflowState.h \ nsIAnonymousContentCreator.h \ - nsICanvasFrame.h \ nsIFrame.h \ nsIFrameFrame.h \ nsIFrameUtil.h \ @@ -98,7 +98,7 @@ CPPSRCS = \ nsGfxScrollFrame.cpp \ nsHTMLCanvasFrame.cpp \ nsHTMLContainerFrame.cpp \ - nsHTMLFrame.cpp \ + nsCanvasFrame.cpp \ nsHTMLReflowState.cpp \ nsImageFrame.cpp \ nsImageMap.cpp \ diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsCanvasFrame.cpp similarity index 90% rename from layout/generic/nsHTMLFrame.cpp rename to layout/generic/nsCanvasFrame.cpp index 88aa5f4c6640..1de5683efb6b 100644 --- a/layout/generic/nsHTMLFrame.cpp +++ b/layout/generic/nsCanvasFrame.cpp @@ -37,7 +37,7 @@ /* rendering object that goes directly inside the document's scrollbars */ -#include "nsHTMLFrame.h" +#include "nsCanvasFrame.h" #include "nsIServiceManager.h" #include "nsHTMLParts.h" #include "nsHTMLContainerFrame.h" @@ -63,7 +63,6 @@ #include "nsIScrollableFrame.h" #include "nsIScrollableView.h" #include "nsIDocShell.h" -#include "nsICanvasFrame.h" #ifdef DEBUG_rods //#define DEBUG_CANVAS_FOCUS @@ -75,20 +74,19 @@ nsIFrame* NS_NewCanvasFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) { - return new (aPresShell) CanvasFrame(aContext); + return new (aPresShell) nsCanvasFrame(aContext); } -NS_IMPL_FRAMEARENA_HELPERS(CanvasFrame) +NS_IMPL_FRAMEARENA_HELPERS(nsCanvasFrame) -NS_IMPL_QUERY_INTERFACE1(CanvasFrame, nsIScrollPositionListener) +NS_IMPL_QUERY_INTERFACE1(nsCanvasFrame, nsIScrollPositionListener) -NS_QUERYFRAME_HEAD(CanvasFrame) - NS_QUERYFRAME_ENTRY(CanvasFrame) - NS_QUERYFRAME_ENTRY(nsICanvasFrame) +NS_QUERYFRAME_HEAD(nsCanvasFrame) + NS_QUERYFRAME_ENTRY(nsCanvasFrame) NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame) NS_IMETHODIMP -CanvasFrame::Init(nsIContent* aContent, +nsCanvasFrame::Init(nsIContent* aContent, nsIFrame* aParent, nsIFrame* aPrevInFlow) { @@ -106,7 +104,7 @@ CanvasFrame::Init(nsIContent* aContent, } void -CanvasFrame::Destroy() +nsCanvasFrame::Destroy() { mAbsoluteContainer.DestroyFrames(this); @@ -120,7 +118,7 @@ CanvasFrame::Destroy() } NS_IMETHODIMP -CanvasFrame::ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY) +nsCanvasFrame::ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY) { #ifdef DEBUG_CANVAS_FOCUS { @@ -148,13 +146,13 @@ CanvasFrame::ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX } NS_IMETHODIMP -CanvasFrame::ScrollPositionDidChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY) +nsCanvasFrame::ScrollPositionDidChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY) { return NS_OK; } NS_IMETHODIMP -CanvasFrame::SetHasFocus(PRBool aHasFocus) +nsCanvasFrame::SetHasFocus(PRBool aHasFocus) { if (mDoPaintFocus != aHasFocus) { mDoPaintFocus = aHasFocus; @@ -164,7 +162,7 @@ CanvasFrame::SetHasFocus(PRBool aHasFocus) } NS_IMETHODIMP -CanvasFrame::SetInitialChildList(nsIAtom* aListName, +nsCanvasFrame::SetInitialChildList(nsIAtom* aListName, nsFrameList& aChildList) { if (nsGkAtoms::absoluteList == aListName) @@ -176,7 +174,7 @@ CanvasFrame::SetInitialChildList(nsIAtom* aListName, } NS_IMETHODIMP -CanvasFrame::AppendFrames(nsIAtom* aListName, +nsCanvasFrame::AppendFrames(nsIAtom* aListName, nsFrameList& aFrameList) { nsresult rv; @@ -212,7 +210,7 @@ CanvasFrame::AppendFrames(nsIAtom* aListName, } NS_IMETHODIMP -CanvasFrame::InsertFrames(nsIAtom* aListName, +nsCanvasFrame::InsertFrames(nsIAtom* aListName, nsIFrame* aPrevFrame, nsFrameList& aFrameList) { @@ -234,7 +232,7 @@ CanvasFrame::InsertFrames(nsIAtom* aListName, } NS_IMETHODIMP -CanvasFrame::RemoveFrame(nsIAtom* aListName, +nsCanvasFrame::RemoveFrame(nsIAtom* aListName, nsIFrame* aOldFrame) { nsresult rv; @@ -270,7 +268,7 @@ CanvasFrame::RemoveFrame(nsIAtom* aListName, } nsIAtom* -CanvasFrame::GetAdditionalChildListName(PRInt32 aIndex) const +nsCanvasFrame::GetAdditionalChildListName(PRInt32 aIndex) const { if (CANVAS_ABS_POS_CHILD_LIST == aIndex) return nsGkAtoms::absoluteList; @@ -279,7 +277,7 @@ CanvasFrame::GetAdditionalChildListName(PRInt32 aIndex) const } nsFrameList -CanvasFrame::GetChildList(nsIAtom* aListName) const +nsCanvasFrame::GetChildList(nsIAtom* aListName) const { if (nsGkAtoms::absoluteList == aListName) return mAbsoluteContainer.GetChildList(); @@ -287,7 +285,7 @@ CanvasFrame::GetChildList(nsIAtom* aListName) const return nsHTMLContainerFrame::GetChildList(aListName); } -nsRect CanvasFrame::CanvasArea() const +nsRect nsCanvasFrame::CanvasArea() const { nsRect result(GetOverflowRect()); @@ -313,14 +311,14 @@ public: virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) { - CanvasFrame* frame = static_cast(mFrame); + nsCanvasFrame* frame = static_cast(mFrame); return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame); } virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) { - CanvasFrame* frame = static_cast(mFrame); + nsCanvasFrame* frame = static_cast(mFrame); nsPoint offset = aBuilder->ToReferenceFrame(mFrame); nsRect bgClipRect = frame->CanvasArea() + offset; nsCSSRendering::PaintBackground(mFrame->PresContext(), *aCtx, mFrame, @@ -340,7 +338,7 @@ public: */ class nsDisplayCanvasFocus : public nsDisplayItem { public: - nsDisplayCanvasFocus(CanvasFrame *aFrame) + nsDisplayCanvasFocus(nsCanvasFrame *aFrame) : nsDisplayItem(aFrame) { } @@ -348,14 +346,14 @@ public: virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) { // This is an overestimate, but that's not a problem. - CanvasFrame* frame = static_cast(mFrame); + nsCanvasFrame* frame = static_cast(mFrame); return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame); } virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx) { - CanvasFrame* frame = static_cast(mFrame); + nsCanvasFrame* frame = static_cast(mFrame); frame->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(mFrame)); } @@ -363,7 +361,7 @@ public: }; NS_IMETHODIMP -CanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, +nsCanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists) { @@ -408,7 +406,7 @@ CanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsCOMPtr docShell(do_QueryInterface(container)); if (docShell) { docShell->GetHasFocus(&hasFocus); - printf("%p - CanvasFrame::Paint R:%d,%d,%d,%d DR: %d,%d,%d,%d\n", this, + printf("%p - nsCanvasFrame::Paint R:%d,%d,%d,%d DR: %d,%d,%d,%d\n", this, mRect.x, mRect.y, mRect.width, mRect.height, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height); } @@ -427,7 +425,7 @@ CanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, } void -CanvasFrame::PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt) +nsCanvasFrame::PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt) { nsRect focusRect(aPt, GetSize()); @@ -459,7 +457,7 @@ CanvasFrame::PaintFocus(nsIRenderingContext& aRenderingContext, nsPoint aPt) } /* virtual */ nscoord -CanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext) +nsCanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext) { nscoord result; DISPLAY_MIN_WIDTH(this, result); @@ -471,7 +469,7 @@ CanvasFrame::GetMinWidth(nsIRenderingContext *aRenderingContext) } /* virtual */ nscoord -CanvasFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext) +nsCanvasFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext) { nscoord result; DISPLAY_PREF_WIDTH(this, result); @@ -483,19 +481,19 @@ CanvasFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext) } NS_IMETHODIMP -CanvasFrame::Reflow(nsPresContext* aPresContext, +nsCanvasFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) { - DO_GLOBAL_REFLOW_COUNT("CanvasFrame"); + DO_GLOBAL_REFLOW_COUNT("nsCanvasFrame"); DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); - NS_FRAME_TRACE_REFLOW_IN("CanvasFrame::Reflow"); + NS_FRAME_TRACE_REFLOW_IN("nsCanvasFrame::Reflow"); // Initialize OUT parameter aStatus = NS_FRAME_COMPLETE; - CanvasFrame* prevCanvasFrame = static_cast + nsCanvasFrame* prevCanvasFrame = static_cast (GetPrevInFlow()); if (prevCanvasFrame) { nsAutoPtr overflow(prevCanvasFrame->StealOverflowFrames()); @@ -632,25 +630,25 @@ CanvasFrame::Reflow(nsPresContext* aPresContext, FinishAndStoreOverflow(&aDesiredSize); - NS_FRAME_TRACE_REFLOW_OUT("CanvasFrame::Reflow", aStatus); + NS_FRAME_TRACE_REFLOW_OUT("nsCanvasFrame::Reflow", aStatus); NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); return NS_OK; } PRIntn -CanvasFrame::GetSkipSides() const +nsCanvasFrame::GetSkipSides() const { return 0; } nsIAtom* -CanvasFrame::GetType() const +nsCanvasFrame::GetType() const { return nsGkAtoms::canvasFrame; } NS_IMETHODIMP -CanvasFrame::GetContentForEvent(nsPresContext* aPresContext, +nsCanvasFrame::GetContentForEvent(nsPresContext* aPresContext, nsEvent* aEvent, nsIContent** aContent) { @@ -672,7 +670,7 @@ CanvasFrame::GetContentForEvent(nsPresContext* aPresContext, #ifdef DEBUG NS_IMETHODIMP -CanvasFrame::GetFrameName(nsAString& aResult) const +nsCanvasFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Canvas"), aResult); } diff --git a/layout/generic/nsHTMLFrame.h b/layout/generic/nsCanvasFrame.h similarity index 92% rename from layout/generic/nsHTMLFrame.h rename to layout/generic/nsCanvasFrame.h index 2110bbd9cb0a..56737d02f0b3 100644 --- a/layout/generic/nsHTMLFrame.h +++ b/layout/generic/nsCanvasFrame.h @@ -37,8 +37,8 @@ /* rendering object that goes directly inside the document's scrollbars */ -#ifndef nsHTMLFrame_h___ -#define nsHTMLFrame_h___ +#ifndef nsCanvasFrame_h___ +#define nsCanvasFrame_h___ #include "nsHTMLContainerFrame.h" @@ -55,7 +55,6 @@ // for focus #include "nsIScrollableView.h" -#include "nsICanvasFrame.h" /** * Root frame class. @@ -64,15 +63,15 @@ * It only supports having a single child frame which must be an area * frame */ -class CanvasFrame : public nsHTMLContainerFrame, - public nsIScrollPositionListener, - public nsICanvasFrame { +class nsCanvasFrame : public nsHTMLContainerFrame, + public nsIScrollPositionListener +{ public: - CanvasFrame(nsStyleContext* aContext) + nsCanvasFrame(nsStyleContext* aContext) : nsHTMLContainerFrame(aContext), mDoPaintFocus(PR_FALSE), mAbsoluteContainer(nsGkAtoms::absoluteList) {} - NS_DECL_QUERYFRAME_TARGET(CanvasFrame) + NS_DECL_QUERYFRAME_TARGET(nsCanvasFrame) NS_DECL_QUERYFRAME NS_DECL_FRAMEARENA_HELPERS @@ -110,6 +109,11 @@ public: ~(nsIFrame::eCanContainOverflowContainers)); } + /** SetHasFocus tells the CanvasFrame to draw with focus ring + * @param aHasFocus PR_TRUE to show focus ring, PR_FALSE to hide it + */ + NS_IMETHOD SetHasFocus(PRBool aHasFocus); + NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists); @@ -122,9 +126,6 @@ public: nsTArray* aConfigurations) {} NS_IMETHOD ScrollPositionDidChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY); - // nsICanvasFrame - NS_IMETHOD SetHasFocus(PRBool aHasFocus); - /** * Get the "type" of the frame * @@ -138,7 +139,7 @@ public: { NS_ASSERTION(!aForceNormal, "No-one should be passing this in here"); - // CanvasFrame keeps overflow container continuations of its child + // nsCanvasFrame keeps overflow container continuations of its child // frame in main child list nsresult rv = nsContainerFrame::StealFrame(aPresContext, aChild, PR_TRUE); if (NS_FAILED(rv)) { @@ -169,4 +170,4 @@ private: NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; } }; -#endif /* nsHTMLFrame_h___ */ +#endif /* nsCanvasFrame_h___ */ diff --git a/layout/generic/nsICanvasFrame.h b/layout/generic/nsICanvasFrame.h deleted file mode 100644 index 2a57a72f5eb3..000000000000 --- a/layout/generic/nsICanvasFrame.h +++ /dev/null @@ -1,58 +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 ***** */ - -/* interface to rendering object that lives inside the document scrollbars */ - -#ifndef nsICanvasFrame_h__ -#define nsICanvasFrame_h__ - -#include "nsQueryFrame.h" - -class nsICanvasFrame -{ -public: - NS_DECL_QUERYFRAME_TARGET(nsICanvasFrame) - - /** SetHasFocus tells the CanvasFrame to draw with focus ring - * @param aHasFocus PR_TRUE to show focus ring, PR_FALSE to hide it - */ - NS_IMETHOD SetHasFocus(PRBool aHasFocus) = 0; - -}; - -#endif // nsICanvasFrame_h__ - diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h index 93521406f1ca..f593ae340597 100644 --- a/layout/generic/nsQueryFrame.h +++ b/layout/generic/nsQueryFrame.h @@ -74,7 +74,6 @@ class nsQueryFrame public: enum FrameIID { BRFrame_id, - CanvasFrame_id, nsAutoRepeatBoxFrame_id, nsBCTableCellFrame_id, nsBlockFrame_id, @@ -82,6 +81,7 @@ public: nsBoxFrame_id, nsBulletFrame_id, nsButtonBoxFrame_id, + nsCanvasFrame_id, nsColumnSetFrame_id, nsComboboxControlFrame_id, nsComboboxDisplayFrame_id, @@ -111,7 +111,6 @@ public: nsHTMLScrollFrame_id, nsIAnonymousContentCreator_id, nsICSSPseudoComparator_id, - nsICanvasFrame_id, nsICheckboxControlFrame_id, nsIComboboxControlFrame_id, nsIFormControlFrame_id,