mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:53:04 +00:00
b5510c02ea
- Bug 1230413 (part 1) - Pass a DrawTarget to several PaintFocus functions(). r=mattwoodrow. (5df91490ae)
- Bug 1230413 (part 2) - Change CallbackData::mContext to a DrawTarget.… r=jfkthame. (07ee11cdd3)
- Bug 1211867 - Use the font's NBSP glyph (if present) rather than rendering NBSP using the standard <space> glyph. r=jdaggett (481384c1a3)
- Bug 1230413 (part 3) - Remove unused gfxContext argument from SetSpaceGlyphIfSimple(). r=jfkthame. (6f9194709d)
- Bug 1230413 (part 4) - Remove unused nsRenderingContext argument from ForceBreak() and OptionallyBreak(). r=mattwoodrow. (8d517a64c3)
- Bug 1230413 (part 5) - Pass a DrawTarget to Draw{Dashed,SolidBorder}Segment(). r=mattwoodrow. (0ec1212b6e)
- Bug 1122788 - patch 1 - nsMultiplexInputStream should not use Tell() in debug builds, r=bz (f92a138bc7)
- iBug 1122788 - patch 2 - nsMultiplexInputStream should not use Tell() in debug builds, r=bz (afadbc68ee)
- Bug 1105044: update XULRunner stub path finding to match the updated Mac app package signing requirements. r=bsmedberg (241e69e234)
- Bug 1151506 - move nsIInterfaceInfo::isMainProcessScriptable to the end of the interface's vtable; r=dbaron (a763bdbeb5)
- Bug 1123323 - Ensure that xptiTypelibGuts cannot have a vtable; r=froydnj (c68a87f37d)
- Bug 1223142 - make XPIDL set default nullptrs for optional out parameters, r=bz (a67cafedba)
- Bug 1219246 - use UniquePtr instead of nsAuto*Ptr in xpcom/; r=erahm (c0a9c817ca)
- Bug 1217047 - try harder in IsContractIDRegistered to return a reasonable answer; r=bsmedberg,f=yury (25f42064c0)
- more of Bug 1101651 - Part 2 (bb82515cb6)
- Bug 1159302 - handle ftell errors in nsINIParser::InitFromFile; r=erahm (252bf762da)
- Bug 1159304 - silence Coverity warning about implicit conversion issues in ReadAheadLib; r=erahm (f6ae3d7af0)
- Bug 1233176 - Scalar Replacement: Initialize properties with the default value of the template object. r=shu (5ae139b872)
- Bug 1223023 - Ensure that we have enough ballast space for allocating MoveGroups in BacktrackingAllocator::resolveControlFlow. r=bhackett (ad486853ad)
- Bug 1231575 - "JitSpew: RegAlloc: dump buffer is too small for a kraken spew". r=bhackett (5042256569)
- Bug 1231581 - "IonMonkey: MOZ_CRASH() in BacktrackingAllocator.cpp:LiveRange::toString() might be unreachable." r=bhackett1024 (8453cfdb5a)
- Bug 1231581 - fix C4018 warning in WinXP. r=bhackett1024 (03ae92e018)
- Bug 1228404 - Add OOM test for module parsing and fix a couple of bugs r=shu (a71b84e9a9)
- Bug 1228579 - BacktrackingAllocator: Pack the LUse::Policy next to the LUse pointer of UsePosition. r=bhackett (91b12c5da8)
- Bug 1225203 - Make backtracking register allocator spew / dump output threadsafe r=bhackett (c44f0a04f1)
- Bug 1202784 - Part 1: Refactor SuperElemOperations for use with emitElemOperands. (r=jandem) (44adc3abf1)
- Bug 1202784 -Part 2: Seperate RequireCoercible check from JSOP_TOID. (r=jandem) (531f3e7543)
- Bug 1225026 - Remove support for atomics on Uint8ClampedArray. r=nbp (29c1dd5bc3)
- Bug 1232022 - Part 1: Mark self-hosted intrinsics for later checking. (r=till) (f49b4de863)
- Bug 1232022 - Part 2: Implement JSOP_DEBUGCHECKSELFHOSTED, and use it to check self-hosted callFunction()s. (r=till, r=h4writer) (c9cbb13f0c)
- Bug 1232113 - "Make the format specifiers in JS_snprintf() invocations more portable". r=shu (1c6d9d4cb5)
- Bug 1135377 - Part 1: Implement RegExp unicode flag. r=till, f=anba (afbcec4095)
- Bug 1220457 - Show deprecation warning for non-standard RegExp.multiline. r=till (175aaa139c)
- Bug 1135377 - Part 2: Parse RegExp unicode character in non-CharacterClass. r=till, f=anba (492f380bbb)
- Bug 1135377 - Part 3: Parse RegExp unicode character in CharacterClass. r=till, f=anba (71bba378d2)
- Bug 1135377 - Part 4: Support everything Atom in RegExp with unicode flag. r=till, f=anba (7a25bc6cd6)
- Bug 1135377 - Part 5: Support CharacterClassEscape in RegExp with unicode flag. r=till, f=anba (f368c54be5)
- Bug 1135377 - Part 6: Support ignoreCase for BMP in RegExp with unicode flag. r=till, f=anba (7c7e89b0bd)
- Bug 1135377 - Part 7: Support ignoreCase for non-BMP in RegExp with unicode flag. r=till, f=anba (6841ae2cd6)
- Bug 1135377 - Part 8: Disallow extended pattern in RegExp with unicode flag. r=till, f=anba (a12155c034)
- Bug 1135377 - Part 9: Use RegExp unicode flag in String.prototype.{match,replace,split}. r=till, f=anba (92f310d912)
- Bug 1135377 - Part 10: Decrement index when it points trail surrogate that has corresponding lead surrogate. r=till, f=anba (61ef65c7b2)
- Bug 1135377 - Part 11: Support back reference with unicode flag. r=till, f=anba (777aa5be56)
- Bug 1232113 - "Make the format specifiers in JS_snprintf() invocations more portable". r=n.nethercote (b7a402773b)
- Bug 1232113 - "Make the format specifiers in JS_snprintf() invocations more portable". r=nbp (b3d16188b4)
- Bug 1231386 - Change debugger to use RuntimeAllocPolicy for all its hash tables r=terrence (800f98186f)
- Bug 1231170: TraceLogger - Use size in debugger instead of the current id to track last logged item, r=bbouvier (a0ea950299)
- Bug 1226217 - Use less verbose cycle collection macros for mozilla::devtools::HeapSnapshot; r=bz (36ca65581d)
- Bug 1231763 - Extract breakdown parsing from JS::ubi::Census. r=jimb (698e7f5c2e)
- reapply bit of 1259403 (d6259f391e)
- Bug 1232113 - "Make the format specifiers in JS_snprintf() invocations more portable". r=jdemooij (edb4735fc5)
- Bug 1230747 - Fix element id generation rule for bytecode documentation. r=jwalden (392a974079)
- Bug 1231900 - "API Document for JS_snprintf() is non-consistent with the Implementation". r=jcoppeard (b669cf0291)
- Bug 1231883 - Implement HeapSnapshot.describeNode; r=mrbkap (515a6c4d1e)
- Bug 1232814 - Part 1: Fix a missing early return in NoteWeakEdge; r=sfink (e56620fb5d)
- Bug 1232814 - Part 2: Move LazyScript finalization to the background finalization thread; r=jonco (bb17b5a10d)
- Bug 1234106 - Avoid symbolic links in various directories used by the build system. r=gps (d150b03192)
207 lines
7.6 KiB
C++
207 lines
7.6 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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/. */
|
|
#include "nsSelectsAreaFrame.h"
|
|
#include "nsIContent.h"
|
|
#include "nsListControlFrame.h"
|
|
#include "nsDisplayList.h"
|
|
#include "WritingModes.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
nsContainerFrame*
|
|
NS_NewSelectsAreaFrame(nsIPresShell* aShell, nsStyleContext* aContext, nsFrameState aFlags)
|
|
{
|
|
nsSelectsAreaFrame* it = new (aShell) nsSelectsAreaFrame(aContext);
|
|
|
|
// We need NS_BLOCK_FLOAT_MGR to ensure that the options inside the select
|
|
// aren't expanded by right floats outside the select.
|
|
it->SetFlags(aFlags | NS_BLOCK_FLOAT_MGR);
|
|
|
|
return it;
|
|
}
|
|
|
|
NS_IMPL_FRAMEARENA_HELPERS(nsSelectsAreaFrame)
|
|
|
|
//---------------------------------------------------------
|
|
/**
|
|
* This wrapper class lets us redirect mouse hits from the child frame of
|
|
* an option element to the element's own frame.
|
|
* REVIEW: This is what nsSelectsAreaFrame::GetFrameForPoint used to do
|
|
*/
|
|
class nsDisplayOptionEventGrabber : public nsDisplayWrapList {
|
|
public:
|
|
nsDisplayOptionEventGrabber(nsDisplayListBuilder* aBuilder,
|
|
nsIFrame* aFrame, nsDisplayItem* aItem)
|
|
: nsDisplayWrapList(aBuilder, aFrame, aItem) {}
|
|
nsDisplayOptionEventGrabber(nsDisplayListBuilder* aBuilder,
|
|
nsIFrame* aFrame, nsDisplayList* aList)
|
|
: nsDisplayWrapList(aBuilder, aFrame, aList) {}
|
|
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
|
|
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) override;
|
|
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override {
|
|
return false;
|
|
}
|
|
NS_DISPLAY_DECL_NAME("OptionEventGrabber", TYPE_OPTION_EVENT_GRABBER)
|
|
};
|
|
|
|
void nsDisplayOptionEventGrabber::HitTest(nsDisplayListBuilder* aBuilder,
|
|
const nsRect& aRect, HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
|
|
{
|
|
nsTArray<nsIFrame*> outFrames;
|
|
mList.HitTest(aBuilder, aRect, aState, &outFrames);
|
|
|
|
for (uint32_t i = 0; i < outFrames.Length(); i++) {
|
|
nsIFrame* selectedFrame = outFrames.ElementAt(i);
|
|
while (selectedFrame &&
|
|
!(selectedFrame->GetContent() &&
|
|
selectedFrame->GetContent()->IsHTMLElement(nsGkAtoms::option))) {
|
|
selectedFrame = selectedFrame->GetParent();
|
|
}
|
|
if (selectedFrame) {
|
|
aOutFrames->AppendElement(selectedFrame);
|
|
} else {
|
|
// keep the original result, which could be this frame
|
|
aOutFrames->AppendElement(outFrames.ElementAt(i));
|
|
}
|
|
}
|
|
}
|
|
|
|
class nsOptionEventGrabberWrapper : public nsDisplayWrapper
|
|
{
|
|
public:
|
|
nsOptionEventGrabberWrapper() {}
|
|
virtual nsDisplayItem* WrapList(nsDisplayListBuilder* aBuilder,
|
|
nsIFrame* aFrame, nsDisplayList* aList) {
|
|
return new (aBuilder) nsDisplayOptionEventGrabber(aBuilder, aFrame, aList);
|
|
}
|
|
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
|
|
nsDisplayItem* aItem) {
|
|
return new (aBuilder) nsDisplayOptionEventGrabber(aBuilder, aItem->Frame(), aItem);
|
|
}
|
|
};
|
|
|
|
static nsListControlFrame* GetEnclosingListFrame(nsIFrame* aSelectsAreaFrame)
|
|
{
|
|
nsIFrame* frame = aSelectsAreaFrame->GetParent();
|
|
while (frame) {
|
|
if (frame->GetType() == nsGkAtoms::listControlFrame)
|
|
return static_cast<nsListControlFrame*>(frame);
|
|
frame = frame->GetParent();
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
class nsDisplayListFocus : public nsDisplayItem {
|
|
public:
|
|
nsDisplayListFocus(nsDisplayListBuilder* aBuilder,
|
|
nsSelectsAreaFrame* aFrame) :
|
|
nsDisplayItem(aBuilder, aFrame) {
|
|
MOZ_COUNT_CTOR(nsDisplayListFocus);
|
|
}
|
|
#ifdef NS_BUILD_REFCNT_LOGGING
|
|
virtual ~nsDisplayListFocus() {
|
|
MOZ_COUNT_DTOR(nsDisplayListFocus);
|
|
}
|
|
#endif
|
|
|
|
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) override {
|
|
*aSnap = false;
|
|
// override bounds because the list item focus ring may extend outside
|
|
// the nsSelectsAreaFrame
|
|
nsListControlFrame* listFrame = GetEnclosingListFrame(Frame());
|
|
return listFrame->GetVisualOverflowRectRelativeToSelf() +
|
|
listFrame->GetOffsetToCrossDoc(ReferenceFrame());
|
|
}
|
|
virtual void Paint(nsDisplayListBuilder* aBuilder,
|
|
nsRenderingContext* aCtx) override {
|
|
nsListControlFrame* listFrame = GetEnclosingListFrame(Frame());
|
|
// listFrame must be non-null or we wouldn't get called.
|
|
listFrame->PaintFocus(aCtx->GetDrawTarget(),
|
|
aBuilder->ToReferenceFrame(listFrame));
|
|
}
|
|
NS_DISPLAY_DECL_NAME("ListFocus", TYPE_LIST_FOCUS)
|
|
};
|
|
|
|
void
|
|
nsSelectsAreaFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|
const nsRect& aDirtyRect,
|
|
const nsDisplayListSet& aLists)
|
|
{
|
|
if (!aBuilder->IsForEventDelivery()) {
|
|
BuildDisplayListInternal(aBuilder, aDirtyRect, aLists);
|
|
return;
|
|
}
|
|
|
|
nsDisplayListCollection set;
|
|
BuildDisplayListInternal(aBuilder, aDirtyRect, set);
|
|
|
|
nsOptionEventGrabberWrapper wrapper;
|
|
wrapper.WrapLists(aBuilder, this, set, aLists);
|
|
}
|
|
|
|
void
|
|
nsSelectsAreaFrame::BuildDisplayListInternal(nsDisplayListBuilder* aBuilder,
|
|
const nsRect& aDirtyRect,
|
|
const nsDisplayListSet& aLists)
|
|
{
|
|
nsBlockFrame::BuildDisplayList(aBuilder, aDirtyRect, aLists);
|
|
|
|
nsListControlFrame* listFrame = GetEnclosingListFrame(this);
|
|
if (listFrame && listFrame->IsFocused()) {
|
|
// we can't just associate the display item with the list frame,
|
|
// because then the list's scrollframe won't clip it (the scrollframe
|
|
// only clips contained descendants).
|
|
aLists.Outlines()->AppendNewToTop(new (aBuilder)
|
|
nsDisplayListFocus(aBuilder, this));
|
|
}
|
|
}
|
|
|
|
void
|
|
nsSelectsAreaFrame::Reflow(nsPresContext* aPresContext,
|
|
nsHTMLReflowMetrics& aDesiredSize,
|
|
const nsHTMLReflowState& aReflowState,
|
|
nsReflowStatus& aStatus)
|
|
{
|
|
nsListControlFrame* list = GetEnclosingListFrame(this);
|
|
NS_ASSERTION(list,
|
|
"Must have an nsListControlFrame! Frame constructor is "
|
|
"broken");
|
|
|
|
bool isInDropdownMode = list->IsInDropDownMode();
|
|
|
|
// See similar logic in nsListControlFrame::Reflow and
|
|
// nsListControlFrame::ReflowAsDropdown. We need to match it here.
|
|
WritingMode wm = aReflowState.GetWritingMode();
|
|
nscoord oldBSize;
|
|
if (isInDropdownMode) {
|
|
// Store the block size now in case it changes during
|
|
// nsBlockFrame::Reflow for some odd reason.
|
|
if (!(GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
|
|
oldBSize = BSize(wm);
|
|
} else {
|
|
oldBSize = NS_UNCONSTRAINEDSIZE;
|
|
}
|
|
}
|
|
|
|
nsBlockFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
|
|
|
|
// Check whether we need to suppress scrollbar updates. We want to do
|
|
// that if we're in a possible first pass and our block size of a row
|
|
// has changed.
|
|
if (list->MightNeedSecondPass()) {
|
|
nscoord newBSizeOfARow = list->CalcBSizeOfARow();
|
|
// We'll need a second pass if our block size of a row changed. For
|
|
// comboboxes, we'll also need it if our block size changed. If
|
|
// we're going to do a second pass, suppress scrollbar updates for
|
|
// this pass.
|
|
if (newBSizeOfARow != mBSizeOfARow ||
|
|
(isInDropdownMode && (oldBSize != aDesiredSize.BSize(wm) ||
|
|
oldBSize != BSize(wm)))) {
|
|
mBSizeOfARow = newBSizeOfARow;
|
|
list->SetSuppressScrollbarUpdate(true);
|
|
}
|
|
}
|
|
}
|