| Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
|
| index 0bdff49f1331f63040140de8bc366ab59044b990..cd68d35461496ccdb87e3cb7fede416b638914d7 100644
|
| --- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
|
| @@ -734,53 +734,53 @@ Image::SizeAvailability SVGImage::DataChanged(bool all_data_received) {
|
| page->GetSettings().SetDefaultFixedFontSize(
|
| default_settings.GetDefaultFixedFontSize());
|
| }
|
| - }
|
| + }
|
|
|
| - LocalFrame* frame = nullptr;
|
| - {
|
| - TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame");
|
| - DCHECK(!frame_client_);
|
| - frame_client_ = new SVGImageLocalFrameClient(this);
|
| - frame = LocalFrame::Create(frame_client_, *page, 0);
|
| - frame->SetView(LocalFrameView::Create(*frame));
|
| - frame->Init();
|
| - }
|
| + LocalFrame* frame = nullptr;
|
| + {
|
| + TRACE_EVENT0("blink", "SVGImage::dataChanged::createFrame");
|
| + DCHECK(!frame_client_);
|
| + frame_client_ = new SVGImageLocalFrameClient(this);
|
| + frame = LocalFrame::Create(frame_client_, *page, 0);
|
| + frame->SetView(LocalFrameView::Create(*frame));
|
| + 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"), KURL(), 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();
|
| - 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"), KURL(), 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;
|
| + DCHECK(page_);
|
| + switch (load_state_) {
|
| + case kInDataChanged:
|
| + load_state_ = kWaitingForAsyncLoadCompletion;
|
| + return kSizeAvailableAndLoadingAsynchronously;
|
| +
|
| + case kLoadCompleted:
|
| + return kSizeAvailable;
|
| +
|
| + case kDataChangedNotStarted:
|
| + case kWaitingForAsyncLoadCompletion:
|
| + CHECK(false);
|
| + break;
|
| }
|
|
|
| NOTREACHED();
|
|
|