mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
b0cbe263c6
- Bug 1238964 Part 1: Hold new printable page sizes in print nsIPrintSettingsWin. r=jimm (b5e4d012ba) - Bug 1238964 Part 2: Move separate DEVMODE to nsIPrintSettings copying into nsPrintSettingsWin. r=jimm (cb7bb66037) - Bug 1218029 - Adds SRICheckDataVerifier for progressing data handling. r=francois (8331afc1a7) - Bug 1218029 - Implements progressive Unicode chars decoding in nsScriptLoader. r=djvj (2c32ca259a) - Bug 1237201 part 1 - Use MOZ_ALWAYS_TRUE in nsScriptLoadHandler::TryDecodeRawData. r=yury (8f7496be23) - Bug 1237201 part 2 - Handle Vector OOM in gfx/. r=jrmuizel,kats (d5e8bd3383) - Bug 1237201 part 3 - Handle Vector OOM in StreamingLexer. r=njn (be383e35b4) - Bug 1237201 part 4 - Handle Vector OOM in ipc/. r=billm (fe9a3bf25a) - Bug 1237201 part 5 - Ignore Vector OOM in JSMainRuntimeCompartmentsReporter. r=njn (d0070c0636) - Bug 1237201 part 6 - Handle Vector OOM in media/webrtc/. r=jesup (eab4e00735) - Bug 1186491 - Splitting nsIPerformanceStats in two;r=froydnj (006b578345) - Bug 1186491 - An API for watching slow performance alerts (xpcom-level);r=froydnj (4fcefd66f5) - Bug 1237201 part 7 - Handle Vector OOM in nsPerformanceStats, telemetry. r=Yoric (6021b583ff) - Bug 1237201 part 8 - Make fallible Vector methods MOZ_WARN_UNUSED_RESULT. r=jwalden (90144c2d35) - Bug 1237201 part 9 - Fix remaining issues. r=nfroyd (25b86adb6d) - Bug 1186491 - An API for watching slow performance alerts (js-level); r=felipe (f04d277c80) - Bug 1200172 - AddonWatcher now discards data if the system is apparently too busy/just back from hibernation. r=mossop (66a3840b73) - Bug 1205840 - Typo fixes in AddonWatcher.jsm. r=felipe (760df6764c) - Bug 1186491 - Reworking AddonWatcher to use low-level performance watch API;r=mossop (81cc64263e) - Bug 1200169 - Making the slow add-on watcher more tolerant;r=Felipe (fcf988d985) - Bug 1157009 - Redesign about:performance. r=felipe (cacc590716) - Bug 1189513 - Get rid of separation between e10s and non-e10s probes; r=felipe (7a6d996c93) - Bug 1191327 - Recapitulates alerts in about:performance now. r=felipe (53ecc02da9) - Bug 1189799 - Make sure that about:performance displays each add-on only once (front-end);r=felipe (1ee53a0410) - Bug 1208747 - Move most of Stopwatch-related code to XPCOM-land (JS-level);r=felipe (84af14c20e) - Bug 1229519: Fix miscellaneous parts of toolkit to pass eslint checks. r=MattN (00ce3585c5) - Bug 1230735 - AddonWatcher.alerts is now a map;r=Felipe (81bbafbbd4) - Bug 1241838 - Removing erroneous CPOW suffix, reworking buggy jank suffix;r=Felipe (020d6928e6) - Bug 1175098 - Fix double-loading of PerformanceStats content script. r=mconley (fb1c499343) - Bug 1189799 - Make sure that about:performance displays each add-on only once (back-end);r=felipe (1eac8258df) - Bug 1221761 - Probe.prototype.release() now swallows NS_ERROR_NOT_AVAILABLE. r=felipe (ba1d0032a9) - Bug 1142937 - AddonWatcher now communicates through nsIObserverService. r=felipe (ea2e7ccdaa) - Bug 967873 - Test changes for async removeTab (r=Gijs) (dae5cbf835) - more missing parts of Bug 1132072 - Tab switch refactoring (r=mconley) (dc5e310537) - Bug 1191460 Rebased patch and added userContextId to origin attributes. (r=tanvi,r=sicking) (723999e7fa) - Bug 1239040 - Cleanup of DrawTargetSkia GetBitmapForSurface to use installPixels. r=jrmuizel (4016f4d734) - Bug 1239040 - Cleanup of DrawTargetSkia Mask and MaskSurface. r=jrmuizel (908a44d47e) - Bug 1239040 - Implement PushLayer for DrawTargetSkia. r=Bas (ae74697559) - Bug 1246756 - part 1 - fix moz2d Skia usage for Skia m49 update. r=jrmuizel (5e4b0f41e3) - Bug 1239040 - Allow usage of SkCanvas::getTopDevice in Skia. r=jrmuizel (19bdd2cecb) - Bug 1239040 - Fix DrawTargetCairo/DrawTargetSkia LockBits and BorrowedXlibDrawable to work inside PushLayer. r=jrmuizel (b9ba04009b) - Bug 1239040 - Cleanup of DrawTargetSkia CopySurface to avoid accessing bottom layer directly. r=jrmuizel (6690702507) - Bug 1240437: Implement PushLayer and PopLayer for DrawTargetRecording. r=bas (22673a1b52) - Bug 1220629 - Part 1: Add PushLayer/PopLayer API to DrawTarget baseclass. r=jrmuizel (c4b4315749) - Bug 1220629 - Part 2: Prepare DrawTargetD2D1 for the possibilities of layers existing inside it. r=jrmuizel (f2a74151a8) - Bug 1220629 - Part 3: Implement PushLayer/PopLayer API in cairo. r=jrmuizel (9a52965141) - Bug 1220629 - Part 4: Allow gfxContext to use the native pushlayer implementations based on a pref. r=jrmuizel (f13b773ff3) - Bug 1220629 - Part 5: Implement PushLayer/PopLayer API for Direct2D 1.1. r=jrmuizel (8a040648a2) - Bug 1220629 - Part 6: Implement PushLayer/PopLayer API in several wrapper DT types. r=jrmuizel (cf76723216) - Bug 1220629 - Part 7: Mark several reftests fuzzy. r=jrmuizel (a6deab2300) - Bug 1220629 - Part 8: Enable native PushLayer/PopLayer by default on Windows and Linux. r=jrmuizel (eef18e1e3e) - Bug 1234494 - part 1 - don't build in Skia GPU code if support is disabled, r=jrmuizel (4c74813077) - Bug 1234494 - part 2 - disable Skia GPU support by default on certain *BSDs, r=glandium (6184133b33) - Bug 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel (e0cf4ab953) - Bug 1244454 - Fixed skia compilation on mingw. r=lsalzman (064a56e56e) - Bug 1242044 - "layout/reftests/css-gradients/linear-zero-length-1 fails under Skia content". r=jmuizelaar (bee8f76e72) - Bug 1242751 - fix assertion in SkLinearGradient. r=jmuizelaar (f5df5ed88f) - Bug 1238795 - Fix SkGpuDevice::drawBitmapRect to always update clips. r=jrmuizel (05a9a6b10a) - Bug 1230096 - fix GrAAConvexTessellator assertion. r=jrmuizel (18aef9bdcc) - Bug 1237983 - Investigate and remove the Bagheera Client Implementation. r=gfritzsche (6de39c0e32) - Bug 1246756 - part 3 - update Skia to m49 branch. r=jrmuizel (a02a53e368) - Bug 1234526 - Remove services/healthreport. r=gfritzsche (bb0c567255) - Bug 1234522 - Remove services/datareporting. r=gfritzsche (c7bfec7784) - Bug 1211166 - Use AppConstants in SessionRecorder.jsm r=ted (4434996c34) - Bug 1246756 - Cross compilation fixup. r=upstream (99e3e40ba1) - Bug 1248228 - Build fix for SkOSFile_stdio on OpenBSD. r=jmuizelaar (bbb1eb7ac0) - Bug 1250196 - Part 1: Import mozilla::Forward and mozilla::UniqePtr into the std namespace in a way that is compatible with libc++; r=lsalzman (ffeebcc133) - Bug 1248851 part 4 - Mark UniquePtr::release() MOZ_WARN_UNUSED_RESULT. r=Waldo (f43cced74c) - Bug 1250196 - Part 2: Rename UniquePtr::getDeleter() to get_deleter() in order to make it compatible with std::unique_ptr; r=froydnj (f8aeabfc9a) - Bug 1248851 part 3 - Fix a potential double-free issue in indexedDB. r=sicking (4d13f5047b) - Bug 1248851 part 2 - Remove redundant release() calls in indexedDB code. r=sicking (86d67ffad8) - Bug 1239702 - Fix SK_ARM_HAS_NEON build config r=lsalzman (4233a57122) - Bug 1245979 - make mfbt Function reference-counted so that it can be cheaply copied for compatibility with Skia. r=froydnj (bd69e9c07b) - Bug 1245055 - Remove gfx/skia/Makefile.in. r=mshal (bf2c611f38) - Bug 1232694 - fix typo in Compiler.h; r=botond (2b5abb9d2d) - Bug 1228641 - Rename begin/size to aBegin/aSize to avoid shadow warnings; r=botond (9222809505) - Bug 1248784 - Rename the existing AddRefTraits to ConstRemovingRefPtrTraits. r=froydnj (99d7b0ae1f) - Bug 1248784 - Extract the AddRef/Release calls into a non-inner helper trait. r=froydnj (37243b6235) - Bug 1248784 - Followup to add requested comment. r=froydnj DONTBUILD (0e870b586b) - Bug 1242794 - make SkGrPixelRef::deepCopy preserve alpha type. r=jmuizelaar (0fb454c326) - Bug 1201037 - (Linux) squash network-change events during 1000ms, r=mcmanus (087f57c44d) - Bug 1235509 - Link monitor should not fire link change events for the refresh of the ipv6 lifetime. r=bagder (c507a319c4) - Bug 1234548 - Don't send network change events if routes are changed. r=mcmanus, r=bagder (5cd0bc582e) - Bug 1234548 - Remove unused variables. r=bustage (42df135fbf) - Bug 1240515 - change allocator for addr and localaddr from malloc to new, since the smart pointer that is used uses delete operator. r=dragana (02f5d5433c) - Bug 1241901 part 1 - Remove nsAutoPtr uses in nsNotifyAddrListener on Linux. r=bagder (f8696ad190) - Bug 1241901 part 2 - Use intptr_t to pass bluetooth service class instead of a pointer to heap. r=shawnjohnjr (5c86a164fa) - Bug 1241901 part 3 - Add IsMemberPointer and IsScalar type traits. r=froydnj (80747268bd) - Bug 1243876 - fix ConvertibleTester to not cause incomplete type errors with UniquePtr and Skia. r=nfroyd (c5588dd270) - Bug 1234736 - IonMonkey: Recover Math.imul as an int32 operation. r=h4writer (459b92c618) - Bug 1228571 - Fix GenerateSeed to not leave seed uninitialized if reading from /dev/urandom fails. r=cpeterson (3be0a2816b) - Bug 1233302: Don't crash if we can't open /dev/urandom; just fall back to PRMJ_Now. (d83ae5540a) - Bug 1167248 - Call RtlGenRandom() instead of rand_s() to workaround crashes from injected third-party hooks. r=jandem (678e7a0056) - Bug 1236619 Fix compilation failure with warnings-as-errors with some compilers. r=njn (043956881d) - Bug 1167248 - Cross compilation fixup. (f4a34fb229)
415 lines
14 KiB
C++
415 lines
14 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
/**
|
|
* StreamingLexer is a lexing framework designed to make it simple to write
|
|
* image decoders without worrying about the details of how the data is arriving
|
|
* from the network.
|
|
*/
|
|
|
|
#ifndef mozilla_image_StreamingLexer_h
|
|
#define mozilla_image_StreamingLexer_h
|
|
|
|
#include <algorithm>
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/Variant.h"
|
|
#include "mozilla/Vector.h"
|
|
|
|
namespace mozilla {
|
|
namespace image {
|
|
|
|
/// Buffering behaviors for StreamingLexer transitions.
|
|
enum class BufferingStrategy
|
|
{
|
|
BUFFERED, // Data will be buffered and processed in one chunk.
|
|
UNBUFFERED // Data will be processed as it arrives, in multiple chunks.
|
|
};
|
|
|
|
/// The result of a call to StreamingLexer::Lex().
|
|
enum class TerminalState
|
|
{
|
|
SUCCESS,
|
|
FAILURE
|
|
};
|
|
|
|
/**
|
|
* LexerTransition is a type used to give commands to the lexing framework.
|
|
* Code that uses StreamingLexer can create LexerTransition values using the
|
|
* static methods on Transition, and then return them to the lexing framework
|
|
* for execution.
|
|
*/
|
|
template <typename State>
|
|
class LexerTransition
|
|
{
|
|
public:
|
|
// This is implicit so that Terminate{Success,Failure}() can return a
|
|
// TerminalState and have it implicitly converted to a
|
|
// LexerTransition<State>, which avoids the need for a "<State>"
|
|
// qualification to the Terminate{Success,Failure}() callsite.
|
|
MOZ_IMPLICIT LexerTransition(TerminalState aFinalState)
|
|
: mNextState(aFinalState)
|
|
{}
|
|
|
|
bool NextStateIsTerminal() const
|
|
{
|
|
return mNextState.template is<TerminalState>();
|
|
}
|
|
|
|
TerminalState NextStateAsTerminal() const
|
|
{
|
|
return mNextState.template as<TerminalState>();
|
|
}
|
|
|
|
State NextState() const
|
|
{
|
|
return mNextState.template as<NonTerminalState>().mState;
|
|
}
|
|
|
|
State UnbufferedState() const
|
|
{
|
|
return *mNextState.template as<NonTerminalState>().mUnbufferedState;
|
|
}
|
|
|
|
size_t Size() const
|
|
{
|
|
return mNextState.template as<NonTerminalState>().mSize;
|
|
}
|
|
|
|
BufferingStrategy Buffering() const
|
|
{
|
|
return mNextState.template as<NonTerminalState>().mBufferingStrategy;
|
|
}
|
|
|
|
private:
|
|
friend struct Transition;
|
|
|
|
LexerTransition(State aNextState,
|
|
const Maybe<State>& aUnbufferedState,
|
|
size_t aSize,
|
|
BufferingStrategy aBufferingStrategy)
|
|
: mNextState(NonTerminalState(aNextState, aUnbufferedState, aSize,
|
|
aBufferingStrategy))
|
|
{}
|
|
|
|
struct NonTerminalState
|
|
{
|
|
State mState;
|
|
Maybe<State> mUnbufferedState;
|
|
size_t mSize;
|
|
BufferingStrategy mBufferingStrategy;
|
|
|
|
NonTerminalState(State aState,
|
|
const Maybe<State>& aUnbufferedState,
|
|
size_t aSize,
|
|
BufferingStrategy aBufferingStrategy)
|
|
: mState(aState)
|
|
, mUnbufferedState(aUnbufferedState)
|
|
, mSize(aSize)
|
|
, mBufferingStrategy(aBufferingStrategy)
|
|
{
|
|
MOZ_ASSERT_IF(mBufferingStrategy == BufferingStrategy::UNBUFFERED,
|
|
mUnbufferedState);
|
|
MOZ_ASSERT_IF(mUnbufferedState,
|
|
mBufferingStrategy == BufferingStrategy::UNBUFFERED);
|
|
}
|
|
};
|
|
Variant<NonTerminalState, TerminalState> mNextState;
|
|
};
|
|
|
|
struct Transition
|
|
{
|
|
/// Transition to @aNextState, buffering @aSize bytes of data.
|
|
template <typename State>
|
|
static LexerTransition<State>
|
|
To(const State& aNextState, size_t aSize)
|
|
{
|
|
return LexerTransition<State>(aNextState, Nothing(), aSize,
|
|
BufferingStrategy::BUFFERED);
|
|
}
|
|
|
|
/**
|
|
* Transition to @aNextState via @aUnbufferedState, reading @aSize bytes of
|
|
* data unbuffered.
|
|
*
|
|
* The unbuffered data will be delivered in state @aUnbufferedState, which may
|
|
* be invoked repeatedly until all @aSize bytes have been delivered. Then,
|
|
* @aNextState will be invoked with no data. No state transitions are allowed
|
|
* from @aUnbufferedState except for transitions to a terminal state, so
|
|
* @aNextState will always be reached unless lexing terminates early.
|
|
*/
|
|
template <typename State>
|
|
static LexerTransition<State>
|
|
ToUnbuffered(const State& aNextState,
|
|
const State& aUnbufferedState,
|
|
size_t aSize)
|
|
{
|
|
return LexerTransition<State>(aNextState, Some(aUnbufferedState), aSize,
|
|
BufferingStrategy::UNBUFFERED);
|
|
}
|
|
|
|
/**
|
|
* Continue receiving unbuffered data. @aUnbufferedState should be the same
|
|
* state as the @aUnbufferedState specified in the preceding call to
|
|
* ToUnbuffered().
|
|
*
|
|
* This should be used during an unbuffered read initiated by ToUnbuffered().
|
|
*/
|
|
template <typename State>
|
|
static LexerTransition<State>
|
|
ContinueUnbuffered(const State& aUnbufferedState)
|
|
{
|
|
return LexerTransition<State>(aUnbufferedState, Nothing(), 0,
|
|
BufferingStrategy::BUFFERED);
|
|
}
|
|
|
|
/**
|
|
* Terminate lexing, ending up in terminal state SUCCESS. (The implicit
|
|
* LexerTransition constructor will convert the result to a LexerTransition
|
|
* as needed.)
|
|
*
|
|
* No more data will be delivered after this function is used.
|
|
*/
|
|
static TerminalState
|
|
TerminateSuccess()
|
|
{
|
|
return TerminalState::SUCCESS;
|
|
}
|
|
|
|
/**
|
|
* Terminate lexing, ending up in terminal state FAILURE. (The implicit
|
|
* LexerTransition constructor will convert the result to a LexerTransition
|
|
* as needed.)
|
|
*
|
|
* No more data will be delivered after this function is used.
|
|
*/
|
|
static TerminalState
|
|
TerminateFailure()
|
|
{
|
|
return TerminalState::FAILURE;
|
|
}
|
|
|
|
private:
|
|
Transition();
|
|
};
|
|
|
|
/**
|
|
* StreamingLexer is a lexing framework designed to make it simple to write
|
|
* image decoders without worrying about the details of how the data is arriving
|
|
* from the network.
|
|
*
|
|
* To use StreamingLexer:
|
|
*
|
|
* - Create a State type. This should be an |enum class| listing all of the
|
|
* states that you can be in while lexing the image format you're trying to
|
|
* read.
|
|
*
|
|
* - Add an instance of StreamingLexer<State> to your decoder class. Initialize
|
|
* it with a Transition::To() the state that you want to start lexing in.
|
|
*
|
|
* - In your decoder's WriteInternal method(), call Lex(), passing in the input
|
|
* data and length that are passed to WriteInternal(). You also need to pass
|
|
* a lambda which dispatches to lexing code for each state based on the State
|
|
* value that's passed in. The lambda generally should just continue a
|
|
* |switch| statement that calls different methods for each State value. Each
|
|
* method should return a LexerTransition<State>, which the lambda should
|
|
* return in turn.
|
|
*
|
|
* - Write the methods that actually implement lexing for your image format.
|
|
* These methods should return either Transition::To(), to move on to another
|
|
* state, or Transition::Terminate{Success,Failure}(), if lexing has
|
|
* terminated in either success or failure. (There are also additional
|
|
* transitions for unbuffered reads; see below.)
|
|
*
|
|
* That's all there is to it. The StreamingLexer will track your position in the
|
|
* input and buffer enough data so that your lexing methods can process
|
|
* everything in one pass. Lex() returns Nothing() if more data is needed, in
|
|
* which case you should just return from WriteInternal(). If lexing reaches a
|
|
* terminal state, Lex() returns Some(State::SUCCESS) or Some(State::FAILURE),
|
|
* and you can check which one to determine if lexing succeeded or failed and do
|
|
* any necessary cleanup.
|
|
*
|
|
* There's one more wrinkle: some lexers may want to *avoid* buffering in some
|
|
* cases, and just process the data as it comes in. This is useful if, for
|
|
* example, you just want to skip over a large section of data; there's no point
|
|
* in buffering data you're just going to ignore.
|
|
*
|
|
* You can begin an unbuffered read with Transition::ToUnbuffered(). This works
|
|
* a little differently than Transition::To() in that you specify *two* states.
|
|
* The @aUnbufferedState argument specifies a state that will be called
|
|
* repeatedly with unbuffered data, as soon as it arrives. The implementation
|
|
* for that state should return either a transition to a terminal state, or
|
|
* Transition::ContinueUnbuffered(). Once the amount of data requested in the
|
|
* original call to Transition::ToUnbuffered() has been delivered, Lex() will
|
|
* transition to the @aNextState state specified via Transition::ToUnbuffered().
|
|
* That state will be invoked with *no* data; it's just called to signal that
|
|
* the unbuffered read is over.
|
|
*
|
|
* XXX(seth): We should be able to get of the |State| stuff totally once bug
|
|
* 1198451 lands, since we can then just return a function representing the next
|
|
* state directly.
|
|
*/
|
|
template <typename State, size_t InlineBufferSize = 16>
|
|
class StreamingLexer
|
|
{
|
|
public:
|
|
explicit StreamingLexer(LexerTransition<State> aStartState)
|
|
: mTransition(aStartState)
|
|
, mToReadUnbuffered(0)
|
|
{ }
|
|
|
|
template <typename Func>
|
|
Maybe<TerminalState> Lex(const char* aInput, size_t aLength, Func aFunc)
|
|
{
|
|
if (mTransition.NextStateIsTerminal()) {
|
|
// We've already reached a terminal state. We never deliver any more data
|
|
// in this case; just return the terminal state again immediately.
|
|
return Some(mTransition.NextStateAsTerminal());
|
|
}
|
|
|
|
if (mToReadUnbuffered > 0) {
|
|
// We're continuing an unbuffered read.
|
|
|
|
MOZ_ASSERT(mBuffer.empty(),
|
|
"Shouldn't be continuing an unbuffered read and a buffered "
|
|
"read at the same time");
|
|
|
|
size_t toRead = std::min(mToReadUnbuffered, aLength);
|
|
|
|
// Call aFunc with the unbuffered state to indicate that we're in the
|
|
// middle of an unbuffered read. We enforce that any state transition
|
|
// passed back to us is either a terminal state or takes us back to the
|
|
// unbuffered state.
|
|
LexerTransition<State> unbufferedTransition =
|
|
aFunc(mTransition.UnbufferedState(), aInput, toRead);
|
|
if (unbufferedTransition.NextStateIsTerminal()) {
|
|
mTransition = unbufferedTransition;
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
MOZ_ASSERT(mTransition.UnbufferedState() ==
|
|
unbufferedTransition.NextState());
|
|
|
|
aInput += toRead;
|
|
aLength -= toRead;
|
|
mToReadUnbuffered -= toRead;
|
|
if (mToReadUnbuffered != 0) {
|
|
return Nothing(); // Need more input.
|
|
}
|
|
|
|
// We're done with the unbuffered read, so transition to the next state.
|
|
mTransition = aFunc(mTransition.NextState(), nullptr, 0);
|
|
if (mTransition.NextStateIsTerminal()) {
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
} else if (0 < mBuffer.length()) {
|
|
// We're continuing a buffered read.
|
|
|
|
MOZ_ASSERT(mToReadUnbuffered == 0,
|
|
"Shouldn't be continuing an unbuffered read and a buffered "
|
|
"read at the same time");
|
|
MOZ_ASSERT(mBuffer.length() < mTransition.Size(),
|
|
"Buffered more than we needed?");
|
|
|
|
size_t toRead = std::min(aLength, mTransition.Size() - mBuffer.length());
|
|
|
|
if (!mBuffer.append(aInput, toRead)) {
|
|
return Some(TerminalState::FAILURE);
|
|
}
|
|
aInput += toRead;
|
|
aLength -= toRead;
|
|
if (mBuffer.length() != mTransition.Size()) {
|
|
return Nothing(); // Need more input.
|
|
}
|
|
|
|
// We've buffered everything, so transition to the next state.
|
|
mTransition =
|
|
aFunc(mTransition.NextState(), mBuffer.begin(), mBuffer.length());
|
|
mBuffer.clear();
|
|
if (mTransition.NextStateIsTerminal()) {
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
}
|
|
|
|
MOZ_ASSERT(mToReadUnbuffered == 0);
|
|
MOZ_ASSERT(mBuffer.empty());
|
|
|
|
// Process states as long as we continue to have enough input to do so.
|
|
while (mTransition.Size() <= aLength) {
|
|
size_t toRead = mTransition.Size();
|
|
|
|
if (mTransition.Buffering() == BufferingStrategy::BUFFERED) {
|
|
mTransition = aFunc(mTransition.NextState(), aInput, toRead);
|
|
} else {
|
|
MOZ_ASSERT(mTransition.Buffering() == BufferingStrategy::UNBUFFERED);
|
|
|
|
// Call aFunc with the unbuffered state to indicate that we're in the
|
|
// middle of an unbuffered read. We enforce that any state transition
|
|
// passed back to us is either a terminal state or takes us back to the
|
|
// unbuffered state.
|
|
LexerTransition<State> unbufferedTransition =
|
|
aFunc(mTransition.UnbufferedState(), aInput, toRead);
|
|
if (unbufferedTransition.NextStateIsTerminal()) {
|
|
mTransition = unbufferedTransition;
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
MOZ_ASSERT(mTransition.UnbufferedState() ==
|
|
unbufferedTransition.NextState());
|
|
|
|
// We're done with the unbuffered read, so transition to the next state.
|
|
mTransition = aFunc(mTransition.NextState(), nullptr, 0);
|
|
}
|
|
|
|
aInput += toRead;
|
|
aLength -= toRead;
|
|
|
|
if (mTransition.NextStateIsTerminal()) {
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
}
|
|
|
|
if (aLength == 0) {
|
|
// We finished right at a transition point. Just wait for more data.
|
|
return Nothing();
|
|
}
|
|
|
|
// If the next state is unbuffered, deliver what we can and then wait.
|
|
if (mTransition.Buffering() == BufferingStrategy::UNBUFFERED) {
|
|
LexerTransition<State> unbufferedTransition =
|
|
aFunc(mTransition.UnbufferedState(), aInput, aLength);
|
|
if (unbufferedTransition.NextStateIsTerminal()) {
|
|
mTransition = unbufferedTransition;
|
|
return Some(mTransition.NextStateAsTerminal()); // Done!
|
|
}
|
|
MOZ_ASSERT(mTransition.UnbufferedState() ==
|
|
unbufferedTransition.NextState());
|
|
|
|
mToReadUnbuffered = mTransition.Size() - aLength;
|
|
return Nothing(); // Need more input.
|
|
}
|
|
|
|
// If the next state is buffered, buffer what we can and then wait.
|
|
MOZ_ASSERT(mTransition.Buffering() == BufferingStrategy::BUFFERED);
|
|
if (!mBuffer.reserve(mTransition.Size())) {
|
|
return Some(TerminalState::FAILURE); // Done due to allocation failure.
|
|
}
|
|
if (!mBuffer.append(aInput, aLength)) {
|
|
return Some(TerminalState::FAILURE);
|
|
}
|
|
return Nothing(); // Need more input.
|
|
}
|
|
|
|
private:
|
|
Vector<char, InlineBufferSize> mBuffer;
|
|
LexerTransition<State> mTransition;
|
|
size_t mToReadUnbuffered;
|
|
};
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_image_StreamingLexer_h
|