Emilio Cobos Álvarez
34b249c82e
This also should fix bug 1881942 (placeholder is now scrollable alongside the textarea). This makes nsTextControlFrame a subclass of ScrollContainerFrame (with an inner block), and tweaks layout to match. It lays out the inner content using block layout and align-content, rather than bespoke reflow primitives. This makes field-sizing trivial to implement on top. This is a bit scary, but simpler in most ways. In particular, it needs to teach ScrollContainerFrame of the button, because that goes outside the scrollable area, like scrollbars. That said it needs less special-cases added than those removed, and it should also be faster (needs less frames to layout an input with placeholder etc), and match other browsers better. The general set-up is: <text-control-editing-root/> <placeholder/> <autofill-preview/> text-control-editing-root is always inline-block and always displayed (since it's what grabs the focus / shows the caret). If the autofill-preview or placeholder are displayed, the editing-root is zero-width and clipped (note that for placeholder that's guaranteed because placeholder is only shown with an empty value, but autofill-preview needs it). placeholder and autofill-preview are hidden via `display` rather than visibility. This doesn't make a difference with this patch but it matters for bug 1977176. Caret painting needs an extra hop to paint atop the placeholder (no observable behavior change, but worth calling out). There is one subtle behavior change, which is that single-line inputs never report scrollable overflow in the block axis. This matches other browsers (see the tweak in nsBlockFrame's overflow computation) and is needed to avoid regressing scrollable-overflow-padding-input.html. The changes in window_composition_text_querycontent.xhtml are needed because before this patch, the height of the control editing root was always the height of the whole textarea. The characters you're composing might legitimately be taller than the line. Bump the line height so that that doesn't happen in this test. Differential Revision: https://phabricator.services.mozilla.com/D293666
166 lines
7.5 KiB
C++
166 lines
7.5 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* factory functions for rendering object classes */
|
|
|
|
#ifndef nsHTMLParts_h_
|
|
#define nsHTMLParts_h_
|
|
|
|
#include "nsFrameState.h"
|
|
#include "nsISupports.h"
|
|
#include "nscore.h"
|
|
|
|
class nsAtom;
|
|
class nsCheckboxRadioFrame;
|
|
class nsComboboxControlFrame;
|
|
class nsContainerFrame;
|
|
class nsIChannel;
|
|
class nsIContent;
|
|
class nsIFragmentContentSink;
|
|
class nsIFrame;
|
|
class nsIURI;
|
|
class nsListControlFrame;
|
|
class nsTextControlFrame;
|
|
class nsNodeInfoManager;
|
|
class nsTableColFrame;
|
|
namespace mozilla {
|
|
class ComputedStyle;
|
|
class PresShell;
|
|
class PrintedSheetFrame;
|
|
class ViewportFrame;
|
|
|
|
namespace dom {
|
|
class Document;
|
|
}
|
|
} // namespace mozilla
|
|
|
|
// Factory methods for creating html layout objects
|
|
|
|
// Create a frame that supports "display: block" layout behavior
|
|
class nsBlockFrame;
|
|
nsBlockFrame* NS_NewBlockFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
// Special Generated Content Node. It contains text taken from an
|
|
// attribute of its *grandparent* content node.
|
|
nsresult NS_NewAttributeContent(nsNodeInfoManager* aNodeInfoManager,
|
|
int32_t aNameSpaceID, nsAtom* aAttrName,
|
|
nsAtom* aFallback, nsIContent** aResult);
|
|
|
|
nsIFrame* NS_NewBRFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
nsIFrame* NS_NewCommentFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
// <frame> and <iframe>
|
|
nsIFrame* NS_NewSubDocumentFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
// <frameset>
|
|
nsIFrame* NS_NewHTMLFramesetFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
mozilla::ViewportFrame* NS_NewViewportFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsCanvasFrame;
|
|
nsCanvasFrame* NS_NewCanvasFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewImageFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsInlineFrame;
|
|
nsInlineFrame* NS_NewInlineFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewTextFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewContinuingTextFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewEmptyFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewWBRFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
nsBlockFrame* NS_NewColumnSetWrapperFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle,
|
|
nsFrameState aStateFlags);
|
|
nsContainerFrame* NS_NewColumnSetFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle,
|
|
nsFrameState aStateFlags);
|
|
|
|
class nsPageSequenceFrame;
|
|
nsPageSequenceFrame* NS_NewPageSequenceFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
mozilla::PrintedSheetFrame* NS_NewPrintedSheetFrame(
|
|
mozilla::PresShell* aPresShell, mozilla::ComputedStyle* aStyle);
|
|
|
|
class nsPageFrame;
|
|
nsPageFrame* NS_NewPageFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsPageContentFrame;
|
|
nsPageContentFrame* NS_NewPageContentFrame(
|
|
mozilla::PresShell* aPresShell, mozilla::ComputedStyle* aStyle,
|
|
already_AddRefed<const nsAtom> aPageName);
|
|
nsIFrame* NS_NewPageBreakFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsFirstLetterFrame;
|
|
nsFirstLetterFrame* NS_NewFirstLetterFrame(mozilla::PresShell*,
|
|
mozilla::ComputedStyle*);
|
|
class nsFirstLetterFrame;
|
|
nsFirstLetterFrame* NS_NewFloatingFirstLetterFrame(mozilla::PresShell*,
|
|
mozilla::ComputedStyle*);
|
|
class nsFirstLineFrame;
|
|
nsFirstLineFrame* NS_NewFirstLineFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
// forms
|
|
nsCheckboxRadioFrame* NS_NewCheckboxRadioFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewImageControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsContainerFrame* NS_NewFieldSetFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewFileControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewColorControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsTextControlFrame* NS_NewTextControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsListControlFrame* NS_NewListControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsComboboxControlFrame* NS_NewComboboxControlFrame(
|
|
mozilla::PresShell* aPresShell, mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewProgressFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewMeterFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewRangeFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsIFrame* NS_NewDateTimeControlFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
|
|
// Table frame factories
|
|
class nsTableWrapperFrame;
|
|
nsTableWrapperFrame* NS_NewTableWrapperFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsTableFrame;
|
|
nsTableFrame* NS_NewTableFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
nsTableColFrame* NS_NewTableColFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsTableColGroupFrame;
|
|
nsTableColGroupFrame* NS_NewTableColGroupFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsTableRowFrame;
|
|
nsTableRowFrame* NS_NewTableRowFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsTableRowGroupFrame;
|
|
nsTableRowGroupFrame* NS_NewTableRowGroupFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle);
|
|
class nsTableCellFrame;
|
|
nsTableCellFrame* NS_NewTableCellFrame(mozilla::PresShell* aPresShell,
|
|
mozilla::ComputedStyle* aStyle,
|
|
nsTableFrame* aTableFrame);
|
|
|
|
#endif /* nsHTMLParts_h_ */
|