Commit d481c9cd authored by Fredrik Söderquist's avatar Fredrik Söderquist Committed by Commit Bot

Fix indentation in SVGImage::DataChanged

Change-Id: If895e92065d23e3da4f5d659c114abf024038b38
Reviewed-on: https://chromium-review.googlesource.com/663537
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#501319}
parent 0d133634
...@@ -767,54 +767,53 @@ Image::SizeAvailability SVGImage::DataChanged(bool all_data_received) { ...@@ -767,54 +767,53 @@ Image::SizeAvailability SVGImage::DataChanged(bool all_data_received) {
page->GetSettings().SetDefaultFixedFontSize( page->GetSettings().SetDefaultFixedFontSize(
default_settings.GetDefaultFixedFontSize()); default_settings.GetDefaultFixedFontSize());
} }
} }
LocalFrame* frame = nullptr; LocalFrame* frame = nullptr;
{ {
TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame"); TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame");
DCHECK(!frame_client_); DCHECK(!frame_client_);
frame_client_ = new SVGImageLocalFrameClient(this); frame_client_ = new SVGImageLocalFrameClient(this);
frame = LocalFrame::Create(frame_client_, *page, 0); frame = LocalFrame::Create(frame_client_, *page, 0);
frame->SetView(LocalFrameView::Create(*frame)); frame->SetView(LocalFrameView::Create(*frame));
frame->Init(); frame->Init();
} }
FrameLoader& loader = frame->Loader();
loader.ForceSandboxFlags(kSandboxAll);
frame->View()->SetScrollbarsSuppressed(true);
// SVG Images will always synthesize a viewBox, if it's not available, and
// thus never see scrollbars.
frame->View()->SetCanHaveScrollbars(false);
// SVG Images are transparent.
frame->View()->SetBaseBackgroundColor(Color::kTransparent);
page_ = page;
TRACE_EVENT0("blink", "SVGImage::dataChanged::load");
loader.Load(FrameLoadRequest(
0, ResourceRequest(BlankURL()),
SubstituteData(Data(), AtomicString("image/svg+xml"),
AtomicString("UTF-8"), NullURL(), kForceSynchronousLoad)));
// Set the concrete object size before a container size is available.
intrinsic_size_ = RoundedIntSize(ConcreteObjectSize(FloatSize(
LayoutReplaced::kDefaultWidth, LayoutReplaced::kDefaultHeight)));
FrameLoader& loader = frame->Loader(); DCHECK(page_);
loader.ForceSandboxFlags(kSandboxAll); switch (load_state_) {
case kInDataChanged:
frame->View()->SetScrollbarsSuppressed(true); load_state_ = kWaitingForAsyncLoadCompletion;
// SVG Images will always synthesize a viewBox, if it's not available, and return kSizeAvailableAndLoadingAsynchronously;
// thus never see scrollbars.
frame->View()->SetCanHaveScrollbars(false); case kLoadCompleted:
// SVG Images are transparent. return kSizeAvailable;
frame->View()->SetBaseBackgroundColor(Color::kTransparent);
case kDataChangedNotStarted:
page_ = page; case kWaitingForAsyncLoadCompletion:
CHECK(false);
TRACE_EVENT0("blink", "SVGImage::dataChanged::load"); break;
loader.Load(
FrameLoadRequest(0, ResourceRequest(BlankURL()),
SubstituteData(Data(), AtomicString("image/svg+xml"),
AtomicString("UTF-8"), NullURL(),
kForceSynchronousLoad)));
// Set the concrete object size before a container size is available.
intrinsic_size_ = RoundedIntSize(ConcreteObjectSize(FloatSize(
LayoutReplaced::kDefaultWidth, LayoutReplaced::kDefaultHeight)));
DCHECK(page_);
switch (load_state_) {
case kInDataChanged:
load_state_ = kWaitingForAsyncLoadCompletion;
return kSizeAvailableAndLoadingAsynchronously;
case kLoadCompleted:
return kSizeAvailable;
case kDataChangedNotStarted:
case kWaitingForAsyncLoadCompletion:
CHECK(false);
break;
} }
NOTREACHED(); NOTREACHED();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment