mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #22395 - jdm:initial-iframe-size, r=Manishearth
Initialize iframe viewport immediately This is probably a significant cause of unstable test results, and it finally bothered me enough to fix it. The solution isn't great for performance (a sync layout query every time a iframe is added to a document), but performance needs to follow correctness. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #14364 and fix #15689 and fix #15688. - [x] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22395) <!-- Reviewable:end -->
This commit is contained in:
commit
c553c43ba1
19 changed files with 210 additions and 154 deletions
|
@ -4,12 +4,15 @@
|
|||
|
||||
//! Base classes to work with IDL callbacks.
|
||||
|
||||
use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods;
|
||||
use crate::dom::bindings::error::{report_pending_exception, Error, Fallible};
|
||||
use crate::dom::bindings::inheritance::Castable;
|
||||
use crate::dom::bindings::reflector::DomObject;
|
||||
use crate::dom::bindings::root::{Dom, DomRoot};
|
||||
use crate::dom::bindings::settings_stack::{AutoEntryScript, AutoIncumbentScript};
|
||||
use crate::dom::bindings::utils::AsCCharPtrPtr;
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
use crate::dom::window::Window;
|
||||
use js::jsapi::Heap;
|
||||
use js::jsapi::JSAutoCompartment;
|
||||
use js::jsapi::{AddRawValueRoot, IsCallable, JSContext, JSObject};
|
||||
|
@ -242,6 +245,9 @@ impl CallSetup {
|
|||
#[allow(unrooted_must_root)]
|
||||
pub fn new<T: CallbackContainer>(callback: &T, handling: ExceptionHandling) -> CallSetup {
|
||||
let global = unsafe { GlobalScope::from_object(callback.callback()) };
|
||||
if let Some(window) = global.downcast::<Window>() {
|
||||
window.Document().ensure_safe_to_run_script_or_layout();
|
||||
}
|
||||
let cx = global.get_cx();
|
||||
|
||||
let aes = AutoEntryScript::new(&global);
|
||||
|
|
|
@ -49,6 +49,7 @@ use crate::dom::bindings::utils::WindowProxyHandler;
|
|||
use crate::dom::document::PendingRestyle;
|
||||
use crate::dom::htmlimageelement::SourceSet;
|
||||
use crate::dom::htmlmediaelement::MediaFrameRenderer;
|
||||
use crate::task::TaskBox;
|
||||
use crossbeam_channel::{Receiver, Sender};
|
||||
use cssparser::RGBA;
|
||||
use devtools_traits::{CSSError, TimelineMarkerType, WorkerId};
|
||||
|
@ -139,6 +140,8 @@ pub unsafe trait JSTraceable {
|
|||
unsafe fn trace(&self, trc: *mut JSTracer);
|
||||
}
|
||||
|
||||
unsafe_no_jsmanaged_fields!(Box<dyn TaskBox>);
|
||||
|
||||
unsafe_no_jsmanaged_fields!(CSSError);
|
||||
|
||||
unsafe_no_jsmanaged_fields!(&'static Encoding);
|
||||
|
|
|
@ -101,6 +101,7 @@ use crate::dom::windowproxy::WindowProxy;
|
|||
use crate::fetch::FetchCanceller;
|
||||
use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
|
||||
use crate::script_thread::{MainThreadScriptMsg, ScriptThread};
|
||||
use crate::task::TaskBox;
|
||||
use crate::task_source::{TaskSource, TaskSourceName};
|
||||
use crate::timers::OneshotTimerCallback;
|
||||
use devtools_traits::ScriptToDevtoolsControlMsg;
|
||||
|
@ -410,6 +411,11 @@ pub struct Document {
|
|||
responsive_images: DomRefCell<Vec<Dom<HTMLImageElement>>>,
|
||||
/// Number of redirects for the document load
|
||||
redirect_count: Cell<u16>,
|
||||
/// Number of outstanding requests to prevent JS or layout from running.
|
||||
script_and_layout_blockers: Cell<u32>,
|
||||
/// List of tasks to execute as soon as last script/layout blocker is removed.
|
||||
#[ignore_malloc_size_of = "Measuring trait objects is hard"]
|
||||
delayed_tasks: DomRefCell<Vec<Box<dyn TaskBox>>>,
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
|
@ -2695,9 +2701,51 @@ impl Document {
|
|||
fired_unload: Cell::new(false),
|
||||
responsive_images: Default::default(),
|
||||
redirect_count: Cell::new(0),
|
||||
script_and_layout_blockers: Cell::new(0),
|
||||
delayed_tasks: Default::default(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Prevent any JS or layout from running until the corresponding call to
|
||||
/// `remove_script_and_layout_blocker`. Used to isolate periods in which
|
||||
/// the DOM is in an unstable state and should not be exposed to arbitrary
|
||||
/// web content. Any attempts to invoke content JS or query layout during
|
||||
/// that time will trigger a panic. `add_delayed_task` will cause the
|
||||
/// provided task to be executed as soon as the last blocker is removed.
|
||||
pub fn add_script_and_layout_blocker(&self) {
|
||||
self.script_and_layout_blockers
|
||||
.set(self.script_and_layout_blockers.get() + 1);
|
||||
}
|
||||
|
||||
/// Terminate the period in which JS or layout is disallowed from running.
|
||||
/// If no further blockers remain, any delayed tasks in the queue will
|
||||
/// be executed in queue order until the queue is empty.
|
||||
pub fn remove_script_and_layout_blocker(&self) {
|
||||
assert!(self.script_and_layout_blockers.get() > 0);
|
||||
self.script_and_layout_blockers
|
||||
.set(self.script_and_layout_blockers.get() - 1);
|
||||
while self.script_and_layout_blockers.get() == 0 && !self.delayed_tasks.borrow().is_empty()
|
||||
{
|
||||
let task = self.delayed_tasks.borrow_mut().remove(0);
|
||||
task.run_box();
|
||||
}
|
||||
}
|
||||
|
||||
/// Enqueue a task to run as soon as any JS and layout blockers are removed.
|
||||
pub fn add_delayed_task<T: 'static + TaskBox>(&self, task: T) {
|
||||
self.delayed_tasks.borrow_mut().push(Box::new(task));
|
||||
}
|
||||
|
||||
/// Assert that the DOM is in a state that will allow running content JS or
|
||||
/// performing a layout operation.
|
||||
pub fn ensure_safe_to_run_script_or_layout(&self) {
|
||||
assert_eq!(
|
||||
self.script_and_layout_blockers.get(),
|
||||
0,
|
||||
"Attempt to use script or layout while DOM not in a stable state"
|
||||
);
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-document-document
|
||||
pub fn Constructor(window: &Window) -> Fallible<DomRoot<Document>> {
|
||||
let doc = window.Document();
|
||||
|
@ -2806,17 +2854,11 @@ impl Document {
|
|||
///
|
||||
/// FIXME(emilio): This really needs to be somehow more in sync with layout.
|
||||
/// Feels like a hack.
|
||||
///
|
||||
/// Also, shouldn't return an option, I'm quite sure.
|
||||
pub fn device(&self) -> Option<Device> {
|
||||
let window_size = self.window().window_size()?;
|
||||
pub fn device(&self) -> Device {
|
||||
let window_size = self.window().window_size();
|
||||
let viewport_size = window_size.initial_viewport;
|
||||
let device_pixel_ratio = window_size.device_pixel_ratio;
|
||||
Some(Device::new(
|
||||
MediaType::screen(),
|
||||
viewport_size,
|
||||
device_pixel_ratio,
|
||||
))
|
||||
Device::new(MediaType::screen(), viewport_size, device_pixel_ratio)
|
||||
}
|
||||
|
||||
/// Remove a stylesheet owned by `owner` from the list of document sheets.
|
||||
|
@ -4183,7 +4225,7 @@ impl DocumentMethods for Document {
|
|||
let y = *y as f32;
|
||||
let point = &Point2D::new(x, y);
|
||||
let window = window_from_node(self);
|
||||
let viewport = window.window_size()?.initial_viewport;
|
||||
let viewport = window.window_size().initial_viewport;
|
||||
|
||||
if self.browsing_context().is_none() {
|
||||
return None;
|
||||
|
@ -4218,10 +4260,7 @@ impl DocumentMethods for Document {
|
|||
let y = *y as f32;
|
||||
let point = &Point2D::new(x, y);
|
||||
let window = window_from_node(self);
|
||||
let viewport = match window.window_size() {
|
||||
Some(size) => size.initial_viewport,
|
||||
None => return vec![],
|
||||
};
|
||||
let viewport = window.window_size().initial_viewport;
|
||||
|
||||
if self.browsing_context().is_none() {
|
||||
return vec![];
|
||||
|
|
|
@ -26,6 +26,7 @@ use crate::dom::windowproxy::WindowProxy;
|
|||
use crate::script_thread::ScriptThread;
|
||||
use crate::task_source::TaskSource;
|
||||
use dom_struct::dom_struct;
|
||||
use euclid::TypedSize2D;
|
||||
use html5ever::{LocalName, Prefix};
|
||||
use ipc_channel::ipc;
|
||||
use msg::constellation_msg::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId};
|
||||
|
@ -34,6 +35,7 @@ use script_layout_interface::message::ReflowGoal;
|
|||
use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
|
||||
use script_traits::{
|
||||
IFrameLoadInfo, IFrameLoadInfoWithData, JsEvalResult, LoadData, UpdatePipelineIdReason,
|
||||
WindowSizeData,
|
||||
};
|
||||
use script_traits::{NewLayoutInfo, ScriptMsg};
|
||||
use servo_config::prefs::PREFS;
|
||||
|
@ -192,7 +194,16 @@ impl HTMLIFrameElement {
|
|||
load_data: load_data.unwrap(),
|
||||
pipeline_port: pipeline_receiver,
|
||||
content_process_shutdown_chan: None,
|
||||
window_size: None,
|
||||
window_size: WindowSizeData {
|
||||
initial_viewport: {
|
||||
let rect = self.upcast::<Node>().bounding_content_box_or_zero();
|
||||
TypedSize2D::new(
|
||||
rect.size.width.to_f32_px(),
|
||||
rect.size.height.to_f32_px(),
|
||||
)
|
||||
},
|
||||
device_pixel_ratio: window.device_pixel_ratio(),
|
||||
},
|
||||
layout_threads: PREFS.get("layout.threads").as_u64().expect("count") as usize,
|
||||
};
|
||||
|
||||
|
@ -612,18 +623,22 @@ impl VirtualMethods for HTMLIFrameElement {
|
|||
s.bind_to_tree(tree_in_doc);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#the-iframe-element
|
||||
// "When an iframe element is inserted into a document that has
|
||||
// a browsing context, the user agent must create a new
|
||||
// browsing context, set the element's nested browsing context
|
||||
// to the newly-created browsing context, and then process the
|
||||
// iframe attributes for the "first time"."
|
||||
if self.upcast::<Node>().is_in_doc_with_browsing_context() {
|
||||
debug!("iframe bound to browsing context.");
|
||||
debug_assert!(tree_in_doc, "is_in_doc_with_bc, but not tree_in_doc");
|
||||
self.create_nested_browsing_context();
|
||||
self.process_the_iframe_attributes(ProcessingMode::FirstTime);
|
||||
}
|
||||
let iframe = Trusted::new(self);
|
||||
document_from_node(self).add_delayed_task(task!(IFrameDelayedInitialize: move || {
|
||||
let this = iframe.root();
|
||||
// https://html.spec.whatwg.org/multipage/#the-iframe-element
|
||||
// "When an iframe element is inserted into a document that has
|
||||
// a browsing context, the user agent must create a new
|
||||
// browsing context, set the element's nested browsing context
|
||||
// to the newly-created browsing context, and then process the
|
||||
// iframe attributes for the "first time"."
|
||||
if this.upcast::<Node>().is_in_doc_with_browsing_context() {
|
||||
debug!("iframe bound to browsing context.");
|
||||
debug_assert!(tree_in_doc, "is_in_doc_with_bc, but not tree_in_doc");
|
||||
this.create_nested_browsing_context();
|
||||
this.process_the_iframe_attributes(ProcessingMode::FirstTime);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
fn unbind_from_tree(&self, context: &UnbindContext) {
|
||||
|
|
|
@ -634,21 +634,14 @@ impl HTMLImageElement {
|
|||
) -> Au {
|
||||
let document = document_from_node(self);
|
||||
let device = document.device();
|
||||
if !device.is_some() {
|
||||
return Au(1);
|
||||
}
|
||||
let quirks_mode = document.quirks_mode();
|
||||
//FIXME https://github.com/whatwg/html/issues/3832
|
||||
source_size_list.evaluate(&device.unwrap(), quirks_mode)
|
||||
source_size_list.evaluate(&device, quirks_mode)
|
||||
}
|
||||
|
||||
/// https://html.spec.whatwg.org/multipage/#matches-the-environment
|
||||
fn matches_environment(&self, media_query: String) -> bool {
|
||||
let document = document_from_node(self);
|
||||
let device = match document.device() {
|
||||
Some(device) => device,
|
||||
None => return false,
|
||||
};
|
||||
let quirks_mode = document.quirks_mode();
|
||||
let document_url = &document.url();
|
||||
// FIXME(emilio): This should do the same that we do for other media
|
||||
|
@ -668,7 +661,7 @@ impl HTMLImageElement {
|
|||
let mut parserInput = ParserInput::new(&media_query);
|
||||
let mut parser = Parser::new(&mut parserInput);
|
||||
let media_list = MediaList::parse(&context, &mut parser);
|
||||
media_list.evaluate(&device, quirks_mode)
|
||||
media_list.evaluate(&document.device(), quirks_mode)
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#normalise-the-source-densities>
|
||||
|
@ -740,13 +733,11 @@ impl HTMLImageElement {
|
|||
// Step 5
|
||||
let mut best_candidate = max;
|
||||
let device = document_from_node(self).device();
|
||||
if let Some(device) = device {
|
||||
let device_den = device.device_pixel_ratio().get() as f64;
|
||||
for (index, image_source) in img_sources.iter().enumerate() {
|
||||
let current_den = image_source.descriptor.den.unwrap();
|
||||
if current_den < best_candidate.0 && current_den >= device_den {
|
||||
best_candidate = (current_den, index);
|
||||
}
|
||||
let device_den = device.device_pixel_ratio().get() as f64;
|
||||
for (index, image_source) in img_sources.iter().enumerate() {
|
||||
let current_den = image_source.descriptor.den.unwrap();
|
||||
if current_den < best_candidate.0 && current_den >= device_den {
|
||||
best_candidate = (current_den, index);
|
||||
}
|
||||
}
|
||||
let selected_source = img_sources.remove(best_candidate.1).clone();
|
||||
|
|
|
@ -777,7 +777,10 @@ impl VirtualMethods for HTMLScriptElement {
|
|||
}
|
||||
|
||||
if tree_in_doc && !self.parser_inserted.get() {
|
||||
self.prepare();
|
||||
let script = Trusted::new(self);
|
||||
document_from_node(self).add_delayed_task(task!(ScriptDelayedInitialize: move || {
|
||||
script.root().prepare();
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -69,10 +69,8 @@ impl MediaQueryList {
|
|||
}
|
||||
|
||||
pub fn evaluate(&self) -> bool {
|
||||
self.document.device().map_or(false, |device| {
|
||||
self.media_query_list
|
||||
.evaluate(&device, self.document.quirks_mode())
|
||||
})
|
||||
self.media_query_list
|
||||
.evaluate(&self.document.device(), self.document.quirks_mode())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1504,8 +1504,11 @@ impl Node {
|
|||
|
||||
// https://dom.spec.whatwg.org/#concept-node-adopt
|
||||
pub fn adopt(node: &Node, document: &Document) {
|
||||
document.add_script_and_layout_blocker();
|
||||
|
||||
// Step 1.
|
||||
let old_doc = node.owner_doc();
|
||||
old_doc.add_script_and_layout_blocker();
|
||||
// Step 2.
|
||||
node.remove_self();
|
||||
// Step 3.
|
||||
|
@ -1530,6 +1533,9 @@ impl Node {
|
|||
vtable_for(&descendant).adopting_steps(&old_doc);
|
||||
}
|
||||
}
|
||||
|
||||
old_doc.remove_script_and_layout_blocker();
|
||||
document.remove_script_and_layout_blocker();
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#concept-node-ensure-pre-insertion-validity
|
||||
|
@ -1685,6 +1691,7 @@ impl Node {
|
|||
child: Option<&Node>,
|
||||
suppress_observers: SuppressObserver,
|
||||
) {
|
||||
node.owner_doc().add_script_and_layout_blocker();
|
||||
debug_assert!(&*node.owner_doc() == &*parent.owner_doc());
|
||||
debug_assert!(child.map_or(true, |child| Some(parent) == child.GetParentNode().r()));
|
||||
|
||||
|
@ -1774,10 +1781,12 @@ impl Node {
|
|||
};
|
||||
MutationObserver::queue_a_mutation_record(&parent, mutation);
|
||||
}
|
||||
node.owner_doc().remove_script_and_layout_blocker();
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#concept-node-replace-all
|
||||
pub fn replace_all(node: Option<&Node>, parent: &Node) {
|
||||
parent.owner_doc().add_script_and_layout_blocker();
|
||||
// Step 1.
|
||||
if let Some(node) = node {
|
||||
Node::adopt(node, &*parent.owner_doc());
|
||||
|
@ -1819,6 +1828,7 @@ impl Node {
|
|||
};
|
||||
MutationObserver::queue_a_mutation_record(&parent, mutation);
|
||||
}
|
||||
parent.owner_doc().remove_script_and_layout_blocker();
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#concept-node-pre-remove
|
||||
|
@ -1839,6 +1849,7 @@ impl Node {
|
|||
|
||||
// https://dom.spec.whatwg.org/#concept-node-remove
|
||||
fn remove(node: &Node, parent: &Node, suppress_observers: SuppressObserver) {
|
||||
parent.owner_doc().add_script_and_layout_blocker();
|
||||
assert!(
|
||||
node.GetParentNode()
|
||||
.map_or(false, |node_parent| &*node_parent == parent)
|
||||
|
@ -1884,6 +1895,7 @@ impl Node {
|
|||
};
|
||||
MutationObserver::queue_a_mutation_record(&parent, mutation);
|
||||
}
|
||||
parent.owner_doc().remove_script_and_layout_blocker();
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#concept-node-clone
|
||||
|
|
|
@ -216,7 +216,7 @@ pub struct Window {
|
|||
layout_rpc: Box<LayoutRPC + Send + 'static>,
|
||||
|
||||
/// The current size of the window, in pixels.
|
||||
window_size: Cell<Option<WindowSizeData>>,
|
||||
window_size: Cell<WindowSizeData>,
|
||||
|
||||
/// A handle for communicating messages to the bluetooth thread.
|
||||
#[ignore_malloc_size_of = "channels are hard"]
|
||||
|
@ -958,7 +958,9 @@ impl WindowMethods for Window {
|
|||
fn InnerHeight(&self) -> i32 {
|
||||
self.window_size
|
||||
.get()
|
||||
.and_then(|e| e.initial_viewport.height.to_i32())
|
||||
.initial_viewport
|
||||
.height
|
||||
.to_i32()
|
||||
.unwrap_or(0)
|
||||
}
|
||||
|
||||
|
@ -967,7 +969,9 @@ impl WindowMethods for Window {
|
|||
fn InnerWidth(&self) -> i32 {
|
||||
self.window_size
|
||||
.get()
|
||||
.and_then(|e| e.initial_viewport.width.to_i32())
|
||||
.initial_viewport
|
||||
.width
|
||||
.to_i32()
|
||||
.unwrap_or(0)
|
||||
}
|
||||
|
||||
|
@ -1245,10 +1249,7 @@ impl Window {
|
|||
let xfinite = if x_.is_finite() { x_ } else { 0.0f64 };
|
||||
let yfinite = if y_.is_finite() { y_ } else { 0.0f64 };
|
||||
|
||||
// Step 4
|
||||
if self.window_size.get().is_none() {
|
||||
return;
|
||||
}
|
||||
// TODO Step 4 - determine if a window has a viewport
|
||||
|
||||
// Step 5
|
||||
//TODO remove scrollbar width
|
||||
|
@ -1322,9 +1323,7 @@ impl Window {
|
|||
}
|
||||
|
||||
pub fn device_pixel_ratio(&self) -> TypedScale<f32, CSSPixel, DevicePixel> {
|
||||
self.window_size
|
||||
.get()
|
||||
.map_or(TypedScale::new(1.0), |data| data.device_pixel_ratio)
|
||||
self.window_size.get().device_pixel_ratio
|
||||
}
|
||||
|
||||
fn client_window(&self) -> (TypedSize2D<u32, CSSPixel>, TypedPoint2D<i32, CSSPixel>) {
|
||||
|
@ -1362,6 +1361,7 @@ impl Window {
|
|||
/// Returns true if layout actually happened, false otherwise.
|
||||
#[allow(unsafe_code)]
|
||||
pub fn force_reflow(&self, reflow_goal: ReflowGoal, reason: ReflowReason) -> bool {
|
||||
self.Document().ensure_safe_to_run_script_or_layout();
|
||||
// Check if we need to unsuppress reflow. Note that this needs to be
|
||||
// *before* any early bailouts, or reflow might never be unsuppresed!
|
||||
match reason {
|
||||
|
@ -1369,12 +1369,6 @@ impl Window {
|
|||
_ => (),
|
||||
}
|
||||
|
||||
// If there is no window size, we have nothing to do.
|
||||
let window_size = match self.window_size.get() {
|
||||
Some(window_size) => window_size,
|
||||
None => return false,
|
||||
};
|
||||
|
||||
let for_display = reflow_goal == ReflowGoal::Full;
|
||||
if for_display && self.suppress_reflow.get() {
|
||||
debug!(
|
||||
|
@ -1417,7 +1411,7 @@ impl Window {
|
|||
},
|
||||
document: self.Document().upcast::<Node>().to_trusted_node_address(),
|
||||
stylesheets_changed,
|
||||
window_size,
|
||||
window_size: self.window_size.get(),
|
||||
reflow_goal,
|
||||
script_join_chan: join_chan,
|
||||
dom_count: self.Document().dom_count(),
|
||||
|
@ -1504,19 +1498,18 @@ impl Window {
|
|||
/// may happen in the only case a query reflow may bail out, that is, if the
|
||||
/// viewport size is not present). See #11223 for an example of that.
|
||||
pub fn reflow(&self, reflow_goal: ReflowGoal, reason: ReflowReason) -> bool {
|
||||
self.Document().ensure_safe_to_run_script_or_layout();
|
||||
let for_display = reflow_goal == ReflowGoal::Full;
|
||||
|
||||
let mut issued_reflow = false;
|
||||
if !for_display || self.Document().needs_reflow() {
|
||||
issued_reflow = self.force_reflow(reflow_goal, reason);
|
||||
|
||||
// If window_size is `None`, we don't reflow, so the document stays
|
||||
// dirty. Otherwise, we shouldn't need a reflow immediately after a
|
||||
// We shouldn't need a reflow immediately after a
|
||||
// reflow, except if we're waiting for a deferred paint.
|
||||
assert!(
|
||||
!self.Document().needs_reflow() ||
|
||||
(!for_display && self.Document().needs_paint()) ||
|
||||
self.window_size.get().is_none() ||
|
||||
self.suppress_reflow.get()
|
||||
);
|
||||
} else {
|
||||
|
@ -1801,10 +1794,10 @@ impl Window {
|
|||
}
|
||||
|
||||
pub fn set_window_size(&self, size: WindowSizeData) {
|
||||
self.window_size.set(Some(size));
|
||||
self.window_size.set(size);
|
||||
}
|
||||
|
||||
pub fn window_size(&self) -> Option<WindowSizeData> {
|
||||
pub fn window_size(&self) -> WindowSizeData {
|
||||
self.window_size.get()
|
||||
}
|
||||
|
||||
|
@ -2021,7 +2014,7 @@ impl Window {
|
|||
layout_chan: Sender<Msg>,
|
||||
pipelineid: PipelineId,
|
||||
parent_info: Option<PipelineId>,
|
||||
window_size: Option<WindowSizeData>,
|
||||
window_size: WindowSizeData,
|
||||
origin: MutableOrigin,
|
||||
navigation_start: u64,
|
||||
navigation_start_precise: u64,
|
||||
|
|
|
@ -289,7 +289,7 @@ impl WindowProxy {
|
|||
load_data: load_data,
|
||||
pipeline_port: pipeline_receiver,
|
||||
content_process_shutdown_chan: None,
|
||||
window_size: None,
|
||||
window_size: window.window_size(),
|
||||
layout_threads: PREFS.get("layout.threads").as_u64().expect("count") as usize,
|
||||
};
|
||||
let constellation_msg = ScriptMsg::ScriptNewAuxiliary(load_info, pipeline_sender);
|
||||
|
|
|
@ -182,7 +182,7 @@ struct InProgressLoad {
|
|||
/// The opener, if this is an auxiliary.
|
||||
opener: Option<BrowsingContextId>,
|
||||
/// The current window size associated with this pipeline.
|
||||
window_size: Option<WindowSizeData>,
|
||||
window_size: WindowSizeData,
|
||||
/// Channel to the layout thread associated with this pipeline.
|
||||
layout_chan: Sender<message::Msg>,
|
||||
/// The activity level of the document (inactive, active or fully active).
|
||||
|
@ -210,7 +210,7 @@ impl InProgressLoad {
|
|||
parent_info: Option<PipelineId>,
|
||||
opener: Option<BrowsingContextId>,
|
||||
layout_chan: Sender<message::Msg>,
|
||||
window_size: Option<WindowSizeData>,
|
||||
window_size: WindowSizeData,
|
||||
url: ServoUrl,
|
||||
origin: MutableOrigin,
|
||||
) -> InProgressLoad {
|
||||
|
@ -1852,7 +1852,7 @@ impl ScriptThread {
|
|||
}
|
||||
let mut loads = self.incomplete_loads.borrow_mut();
|
||||
if let Some(ref mut load) = loads.iter_mut().find(|load| load.pipeline_id == id) {
|
||||
load.window_size = Some(size);
|
||||
load.window_size = size;
|
||||
return;
|
||||
}
|
||||
warn!("resize sent to nonexistent pipeline");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue