mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 03:05:34 +00:00
Merge mozilla-central to inbound. a=merge CLOSED TREE
This commit is contained in:
commit
aa9e00e0d6
@ -132,6 +132,10 @@ public:
|
||||
// even when its buffer is still being used.
|
||||
virtual void WaitForBufferOwnership() {}
|
||||
|
||||
// Returns true if the buffer is available.
|
||||
// You can call WaitForBufferOwnership to wait for availability.
|
||||
virtual bool IsBufferAvailable() const { return true; }
|
||||
|
||||
// For use when AttachType is correct.
|
||||
virtual GLenum ProdTextureTarget() const {
|
||||
MOZ_ASSERT(mAttachType == AttachmentType::GLTexture);
|
||||
|
@ -272,6 +272,11 @@ SharedSurface_SurfaceTexture::WaitForBufferOwnership()
|
||||
mSurface->SetAvailable(true);
|
||||
}
|
||||
|
||||
bool
|
||||
SharedSurface_SurfaceTexture::IsBufferAvailable() const {
|
||||
return mSurface->GetAvailable();
|
||||
}
|
||||
|
||||
bool
|
||||
SharedSurface_SurfaceTexture::ToSurfaceDescriptor(layers::SurfaceDescriptor* const out_descriptor)
|
||||
{
|
||||
|
@ -174,6 +174,8 @@ public:
|
||||
virtual void Commit() override;
|
||||
|
||||
virtual void WaitForBufferOwnership() override;
|
||||
|
||||
virtual bool IsBufferAvailable() const override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -429,6 +429,11 @@ CanvasClientSharedSurface::UpdateRenderer(gfx::IntSize aSize, Renderer& aRendere
|
||||
|
||||
SharedSurface* surf = mShSurfClient->Surf();
|
||||
|
||||
if (!surf->IsBufferAvailable()) {
|
||||
NS_WARNING("SharedSurface buffer not available, skip update");
|
||||
return;
|
||||
}
|
||||
|
||||
// Readback if needed.
|
||||
mReadbackClient = nullptr;
|
||||
|
||||
|
@ -258,6 +258,12 @@ class GeckoViewContent extends GeckoViewModule {
|
||||
aCallback = undefined;
|
||||
}
|
||||
},
|
||||
|
||||
onCurrentSelection() {
|
||||
},
|
||||
|
||||
onHighlightFinished() {
|
||||
},
|
||||
};
|
||||
|
||||
finder.caseSensitive = !!aData.matchCase;
|
||||
@ -301,21 +307,18 @@ class GeckoViewContent extends GeckoViewModule {
|
||||
}
|
||||
|
||||
this._matchDisplayOptions = aData;
|
||||
finder.onHighlightAllChange(!!aData.highlightAll);
|
||||
finder.onModalHighlightChange(!!aData.dimPage);
|
||||
finder.onHighlightAllChange(!!aData.highlightAll);
|
||||
|
||||
if (!finder.searchString) {
|
||||
return;
|
||||
}
|
||||
if (!aData.highlightAll && !aData.dimPage && !aData.drawOutline) {
|
||||
finder.highlighter.highlight(false);
|
||||
if (!aData.highlightAll && !aData.dimPage) {
|
||||
finder.highlight(false);
|
||||
return;
|
||||
}
|
||||
const linksOnly = this._finderListener &&
|
||||
this._finderListener.response.linksOnly;
|
||||
finder.highlighter.highlight(true,
|
||||
finder.searchString,
|
||||
linksOnly,
|
||||
!!aData.drawOutline);
|
||||
finder.highlight(true, finder.searchString, linksOnly, !!aData.drawOutline);
|
||||
}
|
||||
}
|
||||
|
@ -24,6 +24,7 @@ job-defaults:
|
||||
implementation: treescript
|
||||
tags: ['buildN']
|
||||
bump: false
|
||||
dontbuild: true
|
||||
push:
|
||||
by-project:
|
||||
mozilla-beta: true
|
||||
|
@ -587,6 +587,7 @@ task_description_schema = Schema({
|
||||
Required('bump'): bool,
|
||||
Optional('bump-files'): [basestring],
|
||||
Optional('repo-param-prefix'): basestring,
|
||||
Optional('dontbuild'): bool,
|
||||
Required('force-dry-run', default=True): bool,
|
||||
Required('push', default=False): bool
|
||||
}),
|
||||
@ -1215,6 +1216,9 @@ def build_treescript_payload(config, task, task_def):
|
||||
if worker.get('force-dry-run'):
|
||||
task_def['payload']['dry_run'] = True
|
||||
|
||||
if worker.get('dontbuild'):
|
||||
task_def['payload']['dont_build'] = True
|
||||
|
||||
|
||||
@payload_builder('invalid')
|
||||
def build_invalid_payload(config, task, task_def):
|
||||
|
Loading…
Reference in New Issue
Block a user