Bug 1161372 - Add EventRegions on LayerScope. r=dglastonbury

This commit is contained in:
Boris Chiou 2015-05-27 03:18:00 +02:00
parent b918351d59
commit 70d62b1439
4 changed files with 437 additions and 23 deletions

View File

@ -1716,6 +1716,25 @@ Layer::DumpPacket(layerscope::LayersPacket* aPacket, const void* aParent)
if (!mVisibleRegion.IsEmpty()) {
DumpRegion(layer->mutable_vregion(), mVisibleRegion);
}
// EventRegions
if (!mEventRegions.IsEmpty()) {
const EventRegions &e = mEventRegions;
if (!e.mHitRegion.IsEmpty()) {
DumpRegion(layer->mutable_hitregion(), e.mHitRegion);
}
if (!e.mDispatchToContentHitRegion.IsEmpty()) {
DumpRegion(layer->mutable_dispatchregion(), e.mDispatchToContentHitRegion);
}
if (!e.mNoActionRegion.IsEmpty()) {
DumpRegion(layer->mutable_noactionregion(), e.mNoActionRegion);
}
if (!e.mHorizontalPanRegion.IsEmpty()) {
DumpRegion(layer->mutable_hpanregion(), e.mHorizontalPanRegion);
}
if (!e.mVerticalPanRegion.IsEmpty()) {
DumpRegion(layer->mutable_vpanregion(), e.mVerticalPanRegion);
}
}
// Opacity
layer->set_opacity(mOpacity);
// Content opaque

View File

@ -2115,6 +2115,11 @@ const int LayersPacket_Layer::kCAlphaFieldNumber;
const int LayersPacket_Layer::kDirectFieldNumber;
const int LayersPacket_Layer::kBarIDFieldNumber;
const int LayersPacket_Layer::kMaskFieldNumber;
const int LayersPacket_Layer::kHitRegionFieldNumber;
const int LayersPacket_Layer::kDispatchRegionFieldNumber;
const int LayersPacket_Layer::kNoActionRegionFieldNumber;
const int LayersPacket_Layer::kHPanRegionFieldNumber;
const int LayersPacket_Layer::kVPanRegionFieldNumber;
const int LayersPacket_Layer::kValidFieldNumber;
const int LayersPacket_Layer::kColorFieldNumber;
const int LayersPacket_Layer::kFilterFieldNumber;
@ -2132,6 +2137,11 @@ void LayersPacket_Layer::InitAsDefaultInstance() {
transform_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Matrix*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Matrix::default_instance());
vregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
shadow_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Shadow*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Shadow::default_instance());
hitregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
dispatchregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
noactionregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
hpanregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
vpanregion_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
valid_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Region*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Region::default_instance());
size_ = const_cast< ::mozilla::layers::layerscope::LayersPacket_Layer_Size*>(&::mozilla::layers::layerscope::LayersPacket_Layer_Size::default_instance());
}
@ -2157,6 +2167,11 @@ void LayersPacket_Layer::SharedCtor() {
direct_ = 1;
barid_ = GOOGLE_ULONGLONG(0);
mask_ = GOOGLE_ULONGLONG(0);
hitregion_ = NULL;
dispatchregion_ = NULL;
noactionregion_ = NULL;
hpanregion_ = NULL;
vpanregion_ = NULL;
valid_ = NULL;
color_ = 0u;
filter_ = 0;
@ -2175,6 +2190,11 @@ void LayersPacket_Layer::SharedDtor() {
delete transform_;
delete vregion_;
delete shadow_;
delete hitregion_;
delete dispatchregion_;
delete noactionregion_;
delete hpanregion_;
delete vpanregion_;
delete valid_;
delete size_;
}
@ -2220,13 +2240,28 @@ void LayersPacket_Layer::Clear() {
direct_ = 1;
barid_ = GOOGLE_ULONGLONG(0);
mask_ = GOOGLE_ULONGLONG(0);
if (has_hitregion()) {
if (hitregion_ != NULL) hitregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
if (has_dispatchregion()) {
if (dispatchregion_ != NULL) dispatchregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
if (has_noactionregion()) {
if (noactionregion_ != NULL) noactionregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
}
if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
if (has_hpanregion()) {
if (hpanregion_ != NULL) hpanregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
if (has_vpanregion()) {
if (vpanregion_ != NULL) vpanregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
if (has_valid()) {
if (valid_ != NULL) valid_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
}
color_ = 0u;
filter_ = 0;
}
if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
refid_ = GOOGLE_ULONGLONG(0);
if (has_size()) {
if (size_ != NULL) size_->::mozilla::layers::layerscope::LayersPacket_Layer_Size::Clear();
@ -2442,6 +2477,76 @@ bool LayersPacket_Layer::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(162)) goto parse_hitRegion;
break;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hitRegion = 20;
case 20: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_hitRegion:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_hitregion()));
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(170)) goto parse_dispatchRegion;
break;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region dispatchRegion = 21;
case 21: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_dispatchRegion:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_dispatchregion()));
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(178)) goto parse_noActionRegion;
break;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region noActionRegion = 22;
case 22: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_noActionRegion:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_noactionregion()));
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(186)) goto parse_hPanRegion;
break;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hPanRegion = 23;
case 23: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_hPanRegion:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_hpanregion()));
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(194)) goto parse_vPanRegion;
break;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region vPanRegion = 24;
case 24: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_vPanRegion:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_vpanregion()));
} else {
goto handle_uninterpreted;
}
if (input->ExpectTag(802)) goto parse_valid;
break;
}
@ -2613,6 +2718,36 @@ void LayersPacket_Layer::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteUInt64(19, this->mask(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hitRegion = 20;
if (has_hitregion()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
20, this->hitregion(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region dispatchRegion = 21;
if (has_dispatchregion()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
21, this->dispatchregion(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region noActionRegion = 22;
if (has_noactionregion()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
22, this->noactionregion(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hPanRegion = 23;
if (has_hpanregion()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
23, this->hpanregion(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region vPanRegion = 24;
if (has_vpanregion()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
24, this->vpanregion(), output);
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region valid = 100;
if (has_valid()) {
::google::protobuf::internal::WireFormatLite::WriteMessage(
@ -2732,6 +2867,43 @@ int LayersPacket_Layer::ByteSize() const {
this->mask());
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hitRegion = 20;
if (has_hitregion()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->hitregion());
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region dispatchRegion = 21;
if (has_dispatchregion()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->dispatchregion());
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region noActionRegion = 22;
if (has_noactionregion()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->noactionregion());
}
}
if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hPanRegion = 23;
if (has_hpanregion()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->hpanregion());
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region vPanRegion = 24;
if (has_vpanregion()) {
total_size += 2 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->vpanregion());
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region valid = 100;
if (has_valid()) {
total_size += 2 +
@ -2752,8 +2924,6 @@ int LayersPacket_Layer::ByteSize() const {
::google::protobuf::internal::WireFormatLite::EnumSize(this->filter());
}
}
if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
// optional uint64 refID = 103;
if (has_refid()) {
total_size += 2 +
@ -2824,6 +2994,23 @@ void LayersPacket_Layer::MergeFrom(const LayersPacket_Layer& from) {
if (from.has_mask()) {
set_mask(from.mask());
}
if (from.has_hitregion()) {
mutable_hitregion()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.hitregion());
}
if (from.has_dispatchregion()) {
mutable_dispatchregion()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.dispatchregion());
}
if (from.has_noactionregion()) {
mutable_noactionregion()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.noactionregion());
}
}
if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
if (from.has_hpanregion()) {
mutable_hpanregion()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.hpanregion());
}
if (from.has_vpanregion()) {
mutable_vpanregion()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.vpanregion());
}
if (from.has_valid()) {
mutable_valid()->::mozilla::layers::layerscope::LayersPacket_Layer_Region::MergeFrom(from.valid());
}
@ -2833,8 +3020,6 @@ void LayersPacket_Layer::MergeFrom(const LayersPacket_Layer& from) {
if (from.has_filter()) {
set_filter(from.filter());
}
}
if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
if (from.has_refid()) {
set_refid(from.refid());
}
@ -2871,6 +3056,11 @@ void LayersPacket_Layer::Swap(LayersPacket_Layer* other) {
std::swap(direct_, other->direct_);
std::swap(barid_, other->barid_);
std::swap(mask_, other->mask_);
std::swap(hitregion_, other->hitregion_);
std::swap(dispatchregion_, other->dispatchregion_);
std::swap(noactionregion_, other->noactionregion_);
std::swap(hpanregion_, other->hpanregion_);
std::swap(vpanregion_, other->vpanregion_);
std::swap(valid_, other->valid_);
std::swap(color_, other->color_);
std::swap(filter_, other->filter_);

View File

@ -1064,6 +1064,46 @@ class LayersPacket_Layer : public ::google::protobuf::MessageLite {
inline ::google::protobuf::uint64 mask() const;
inline void set_mask(::google::protobuf::uint64 value);
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hitRegion = 20;
inline bool has_hitregion() const;
inline void clear_hitregion();
static const int kHitRegionFieldNumber = 20;
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& hitregion() const;
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* mutable_hitregion();
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* release_hitregion();
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region dispatchRegion = 21;
inline bool has_dispatchregion() const;
inline void clear_dispatchregion();
static const int kDispatchRegionFieldNumber = 21;
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& dispatchregion() const;
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* mutable_dispatchregion();
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* release_dispatchregion();
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region noActionRegion = 22;
inline bool has_noactionregion() const;
inline void clear_noactionregion();
static const int kNoActionRegionFieldNumber = 22;
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& noactionregion() const;
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* mutable_noactionregion();
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* release_noactionregion();
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hPanRegion = 23;
inline bool has_hpanregion() const;
inline void clear_hpanregion();
static const int kHPanRegionFieldNumber = 23;
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& hpanregion() const;
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* mutable_hpanregion();
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* release_hpanregion();
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region vPanRegion = 24;
inline bool has_vpanregion() const;
inline void clear_vpanregion();
static const int kVPanRegionFieldNumber = 24;
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& vpanregion() const;
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* mutable_vpanregion();
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* release_vpanregion();
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region valid = 100;
inline bool has_valid() const;
inline void clear_valid();
@ -1129,6 +1169,16 @@ class LayersPacket_Layer : public ::google::protobuf::MessageLite {
inline void clear_has_barid();
inline void set_has_mask();
inline void clear_has_mask();
inline void set_has_hitregion();
inline void clear_has_hitregion();
inline void set_has_dispatchregion();
inline void clear_has_dispatchregion();
inline void set_has_noactionregion();
inline void clear_has_noactionregion();
inline void set_has_hpanregion();
inline void clear_has_hpanregion();
inline void set_has_vpanregion();
inline void clear_has_vpanregion();
inline void set_has_valid();
inline void clear_has_valid();
inline void set_has_color();
@ -1153,6 +1203,11 @@ class LayersPacket_Layer : public ::google::protobuf::MessageLite {
int direct_;
::google::protobuf::uint64 barid_;
::google::protobuf::uint64 mask_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* hitregion_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* dispatchregion_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* noactionregion_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* hpanregion_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* vpanregion_;
::mozilla::layers::layerscope::LayersPacket_Layer_Region* valid_;
::google::protobuf::uint32 color_;
int filter_;
@ -1160,7 +1215,7 @@ class LayersPacket_Layer : public ::google::protobuf::MessageLite {
::mozilla::layers::layerscope::LayersPacket_Layer_Size* size_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(18 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(23 + 31) / 32];
friend void protobuf_AddDesc_LayerScopePacket_2eproto();
friend void protobuf_AssignDesc_LayerScopePacket_2eproto();
@ -2796,16 +2851,161 @@ inline void LayersPacket_Layer::set_mask(::google::protobuf::uint64 value) {
mask_ = value;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region valid = 100;
inline bool LayersPacket_Layer::has_valid() const {
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hitRegion = 20;
inline bool LayersPacket_Layer::has_hitregion() const {
return (_has_bits_[0] & 0x00002000u) != 0;
}
inline void LayersPacket_Layer::set_has_valid() {
inline void LayersPacket_Layer::set_has_hitregion() {
_has_bits_[0] |= 0x00002000u;
}
inline void LayersPacket_Layer::clear_has_valid() {
inline void LayersPacket_Layer::clear_has_hitregion() {
_has_bits_[0] &= ~0x00002000u;
}
inline void LayersPacket_Layer::clear_hitregion() {
if (hitregion_ != NULL) hitregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_hitregion();
}
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& LayersPacket_Layer::hitregion() const {
return hitregion_ != NULL ? *hitregion_ : *default_instance_->hitregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::mutable_hitregion() {
set_has_hitregion();
if (hitregion_ == NULL) hitregion_ = new ::mozilla::layers::layerscope::LayersPacket_Layer_Region;
return hitregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::release_hitregion() {
clear_has_hitregion();
::mozilla::layers::layerscope::LayersPacket_Layer_Region* temp = hitregion_;
hitregion_ = NULL;
return temp;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region dispatchRegion = 21;
inline bool LayersPacket_Layer::has_dispatchregion() const {
return (_has_bits_[0] & 0x00004000u) != 0;
}
inline void LayersPacket_Layer::set_has_dispatchregion() {
_has_bits_[0] |= 0x00004000u;
}
inline void LayersPacket_Layer::clear_has_dispatchregion() {
_has_bits_[0] &= ~0x00004000u;
}
inline void LayersPacket_Layer::clear_dispatchregion() {
if (dispatchregion_ != NULL) dispatchregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_dispatchregion();
}
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& LayersPacket_Layer::dispatchregion() const {
return dispatchregion_ != NULL ? *dispatchregion_ : *default_instance_->dispatchregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::mutable_dispatchregion() {
set_has_dispatchregion();
if (dispatchregion_ == NULL) dispatchregion_ = new ::mozilla::layers::layerscope::LayersPacket_Layer_Region;
return dispatchregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::release_dispatchregion() {
clear_has_dispatchregion();
::mozilla::layers::layerscope::LayersPacket_Layer_Region* temp = dispatchregion_;
dispatchregion_ = NULL;
return temp;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region noActionRegion = 22;
inline bool LayersPacket_Layer::has_noactionregion() const {
return (_has_bits_[0] & 0x00008000u) != 0;
}
inline void LayersPacket_Layer::set_has_noactionregion() {
_has_bits_[0] |= 0x00008000u;
}
inline void LayersPacket_Layer::clear_has_noactionregion() {
_has_bits_[0] &= ~0x00008000u;
}
inline void LayersPacket_Layer::clear_noactionregion() {
if (noactionregion_ != NULL) noactionregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_noactionregion();
}
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& LayersPacket_Layer::noactionregion() const {
return noactionregion_ != NULL ? *noactionregion_ : *default_instance_->noactionregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::mutable_noactionregion() {
set_has_noactionregion();
if (noactionregion_ == NULL) noactionregion_ = new ::mozilla::layers::layerscope::LayersPacket_Layer_Region;
return noactionregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::release_noactionregion() {
clear_has_noactionregion();
::mozilla::layers::layerscope::LayersPacket_Layer_Region* temp = noactionregion_;
noactionregion_ = NULL;
return temp;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region hPanRegion = 23;
inline bool LayersPacket_Layer::has_hpanregion() const {
return (_has_bits_[0] & 0x00010000u) != 0;
}
inline void LayersPacket_Layer::set_has_hpanregion() {
_has_bits_[0] |= 0x00010000u;
}
inline void LayersPacket_Layer::clear_has_hpanregion() {
_has_bits_[0] &= ~0x00010000u;
}
inline void LayersPacket_Layer::clear_hpanregion() {
if (hpanregion_ != NULL) hpanregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_hpanregion();
}
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& LayersPacket_Layer::hpanregion() const {
return hpanregion_ != NULL ? *hpanregion_ : *default_instance_->hpanregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::mutable_hpanregion() {
set_has_hpanregion();
if (hpanregion_ == NULL) hpanregion_ = new ::mozilla::layers::layerscope::LayersPacket_Layer_Region;
return hpanregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::release_hpanregion() {
clear_has_hpanregion();
::mozilla::layers::layerscope::LayersPacket_Layer_Region* temp = hpanregion_;
hpanregion_ = NULL;
return temp;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region vPanRegion = 24;
inline bool LayersPacket_Layer::has_vpanregion() const {
return (_has_bits_[0] & 0x00020000u) != 0;
}
inline void LayersPacket_Layer::set_has_vpanregion() {
_has_bits_[0] |= 0x00020000u;
}
inline void LayersPacket_Layer::clear_has_vpanregion() {
_has_bits_[0] &= ~0x00020000u;
}
inline void LayersPacket_Layer::clear_vpanregion() {
if (vpanregion_ != NULL) vpanregion_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_vpanregion();
}
inline const ::mozilla::layers::layerscope::LayersPacket_Layer_Region& LayersPacket_Layer::vpanregion() const {
return vpanregion_ != NULL ? *vpanregion_ : *default_instance_->vpanregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::mutable_vpanregion() {
set_has_vpanregion();
if (vpanregion_ == NULL) vpanregion_ = new ::mozilla::layers::layerscope::LayersPacket_Layer_Region;
return vpanregion_;
}
inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_Layer::release_vpanregion() {
clear_has_vpanregion();
::mozilla::layers::layerscope::LayersPacket_Layer_Region* temp = vpanregion_;
vpanregion_ = NULL;
return temp;
}
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Region valid = 100;
inline bool LayersPacket_Layer::has_valid() const {
return (_has_bits_[0] & 0x00040000u) != 0;
}
inline void LayersPacket_Layer::set_has_valid() {
_has_bits_[0] |= 0x00040000u;
}
inline void LayersPacket_Layer::clear_has_valid() {
_has_bits_[0] &= ~0x00040000u;
}
inline void LayersPacket_Layer::clear_valid() {
if (valid_ != NULL) valid_->::mozilla::layers::layerscope::LayersPacket_Layer_Region::Clear();
clear_has_valid();
@ -2827,13 +3027,13 @@ inline ::mozilla::layers::layerscope::LayersPacket_Layer_Region* LayersPacket_La
// optional uint32 color = 101;
inline bool LayersPacket_Layer::has_color() const {
return (_has_bits_[0] & 0x00004000u) != 0;
return (_has_bits_[0] & 0x00080000u) != 0;
}
inline void LayersPacket_Layer::set_has_color() {
_has_bits_[0] |= 0x00004000u;
_has_bits_[0] |= 0x00080000u;
}
inline void LayersPacket_Layer::clear_has_color() {
_has_bits_[0] &= ~0x00004000u;
_has_bits_[0] &= ~0x00080000u;
}
inline void LayersPacket_Layer::clear_color() {
color_ = 0u;
@ -2849,13 +3049,13 @@ inline void LayersPacket_Layer::set_color(::google::protobuf::uint32 value) {
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Filter filter = 102;
inline bool LayersPacket_Layer::has_filter() const {
return (_has_bits_[0] & 0x00008000u) != 0;
return (_has_bits_[0] & 0x00100000u) != 0;
}
inline void LayersPacket_Layer::set_has_filter() {
_has_bits_[0] |= 0x00008000u;
_has_bits_[0] |= 0x00100000u;
}
inline void LayersPacket_Layer::clear_has_filter() {
_has_bits_[0] &= ~0x00008000u;
_has_bits_[0] &= ~0x00100000u;
}
inline void LayersPacket_Layer::clear_filter() {
filter_ = 0;
@ -2872,13 +3072,13 @@ inline void LayersPacket_Layer::set_filter(::mozilla::layers::layerscope::Layers
// optional uint64 refID = 103;
inline bool LayersPacket_Layer::has_refid() const {
return (_has_bits_[0] & 0x00010000u) != 0;
return (_has_bits_[0] & 0x00200000u) != 0;
}
inline void LayersPacket_Layer::set_has_refid() {
_has_bits_[0] |= 0x00010000u;
_has_bits_[0] |= 0x00200000u;
}
inline void LayersPacket_Layer::clear_has_refid() {
_has_bits_[0] &= ~0x00010000u;
_has_bits_[0] &= ~0x00200000u;
}
inline void LayersPacket_Layer::clear_refid() {
refid_ = GOOGLE_ULONGLONG(0);
@ -2894,13 +3094,13 @@ inline void LayersPacket_Layer::set_refid(::google::protobuf::uint64 value) {
// optional .mozilla.layers.layerscope.LayersPacket.Layer.Size size = 104;
inline bool LayersPacket_Layer::has_size() const {
return (_has_bits_[0] & 0x00020000u) != 0;
return (_has_bits_[0] & 0x00400000u) != 0;
}
inline void LayersPacket_Layer::set_has_size() {
_has_bits_[0] |= 0x00020000u;
_has_bits_[0] |= 0x00400000u;
}
inline void LayersPacket_Layer::clear_has_size() {
_has_bits_[0] &= ~0x00020000u;
_has_bits_[0] &= ~0x00400000u;
}
inline void LayersPacket_Layer::clear_size() {
if (size_ != NULL) size_->::mozilla::layers::layerscope::LayersPacket_Layer_Size::Clear();

View File

@ -97,6 +97,11 @@ message LayersPacket {
optional ScrollingDirect direct = 17;
optional uint64 barID = 18;
optional uint64 mask = 19; // mask layer
optional Region hitRegion = 20;
optional Region dispatchRegion = 21;
optional Region noActionRegion = 22;
optional Region hPanRegion = 23;
optional Region vPanRegion = 24;
// Specific info (100 to max)
// Painted Layer