Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 #include "platform/Logging.h" | 33 #include "platform/Logging.h" |
| 34 #include "platform/RuntimeEnabledFeatures.h" | 34 #include "platform/RuntimeEnabledFeatures.h" |
| 35 #include "platform/SharedBuffer.h" | 35 #include "platform/SharedBuffer.h" |
| 36 #include "platform/TraceEvent.h" | 36 #include "platform/TraceEvent.h" |
| 37 #include "platform/graphics/BitmapImage.h" | 37 #include "platform/graphics/BitmapImage.h" |
| 38 #include "public/platform/Platform.h" | 38 #include "public/platform/Platform.h" |
| 39 #include "public/platform/WebCachePolicy.h" | 39 #include "public/platform/WebCachePolicy.h" |
| 40 #include "wtf/CurrentTime.h" | 40 #include "wtf/CurrentTime.h" |
| 41 #include "wtf/StdLibExtras.h" | 41 #include "wtf/StdLibExtras.h" |
| 42 #include <memory> | 42 #include <memory> |
| 43 #include <v8/include/v8.h> | |
|
haraken
2016/08/12 07:05:09
We normally include <v8.h>
keishi
2016/08/15 08:57:01
Done.
| |
| 43 | 44 |
| 44 namespace blink { | 45 namespace blink { |
| 45 | 46 |
| 46 using ImageResourceObserverWalker = ResourceClientOrObserverWalker<ImageResource Observer, ImageResourceObserver>; | 47 using ImageResourceObserverWalker = ResourceClientOrObserverWalker<ImageResource Observer, ImageResourceObserver>; |
| 47 | 48 |
| 48 ImageResource* ImageResource::fetch(FetchRequest& request, ResourceFetcher* fetc her) | 49 ImageResource* ImageResource::fetch(FetchRequest& request, ResourceFetcher* fetc her) |
| 49 { | 50 { |
| 50 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified) | 51 if (request.resourceRequest().requestContext() == WebURLRequest::RequestCont extUnspecified) |
| 51 request.mutableResourceRequest().setRequestContext(WebURLRequest::Reques tContextImage); | 52 request.mutableResourceRequest().setRequestContext(WebURLRequest::Reques tContextImage); |
| 52 if (fetcher->context().pageDismissalEventBeingDispatched()) { | 53 if (fetcher->context().pageDismissalEventBeingDispatched()) { |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 240 { | 241 { |
| 241 if (m_data) | 242 if (m_data) |
| 242 return m_data.get(); | 243 return m_data.get(); |
| 243 if (m_image) | 244 if (m_image) |
| 244 return m_image->data(); | 245 return m_image->data(); |
| 245 return nullptr; | 246 return nullptr; |
| 246 } | 247 } |
| 247 | 248 |
| 248 void ImageResource::appendData(const char* data, size_t length) | 249 void ImageResource::appendData(const char* data, size_t length) |
| 249 { | 250 { |
| 251 v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(length); | |
| 250 if (m_multipartParser) { | 252 if (m_multipartParser) { |
| 251 m_multipartParser->appendData(data, length); | 253 m_multipartParser->appendData(data, length); |
| 252 } else { | 254 } else { |
| 253 Resource::appendData(data, length); | 255 Resource::appendData(data, length); |
| 254 updateImage(false); | 256 updateImage(false); |
| 255 } | 257 } |
| 256 } | 258 } |
| 257 | 259 |
| 258 std::pair<blink::Image*, float> ImageResource::brokenImage(float deviceScaleFact or) | 260 std::pair<blink::Image*, float> ImageResource::brokenImage(float deviceScaleFact or) |
| 259 { | 261 { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 362 m_image = SVGImage::create(this); | 364 m_image = SVGImage::create(this); |
| 363 } else { | 365 } else { |
| 364 m_image = BitmapImage::create(this); | 366 m_image = BitmapImage::create(this); |
| 365 } | 367 } |
| 366 } | 368 } |
| 367 | 369 |
| 368 inline void ImageResource::clearImage() | 370 inline void ImageResource::clearImage() |
| 369 { | 371 { |
| 370 if (!m_image) | 372 if (!m_image) |
| 371 return; | 373 return; |
| 374 size_t length = m_image->data() ? m_image->data()->size() : 0; | |
| 375 v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(-length); | |
| 372 | 376 |
| 373 // If our Image has an observer, it's always us so we need to clear the back pointer | 377 // If our Image has an observer, it's always us so we need to clear the back pointer |
| 374 // before dropping our reference. | 378 // before dropping our reference. |
| 375 m_image->clearImageObserver(); | 379 m_image->clearImageObserver(); |
| 376 m_image.clear(); | 380 m_image.clear(); |
| 377 } | 381 } |
| 378 | 382 |
| 379 void ImageResource::updateImage(bool allDataReceived) | 383 void ImageResource::updateImage(bool allDataReceived) |
| 380 { | 384 { |
| 381 TRACE_EVENT0("blink", "ImageResource::updateImage"); | 385 TRACE_EVENT0("blink", "ImageResource::updateImage"); |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 594 if (response().wasFetchedViaServiceWorker()) | 598 if (response().wasFetchedViaServiceWorker()) |
| 595 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque; | 599 return response().serviceWorkerResponseType() != WebServiceWorkerRespons eTypeOpaque; |
| 596 if (!getImage()->currentFrameHasSingleSecurityOrigin()) | 600 if (!getImage()->currentFrameHasSingleSecurityOrigin()) |
| 597 return false; | 601 return false; |
| 598 if (passesAccessControlCheck(securityOrigin)) | 602 if (passesAccessControlCheck(securityOrigin)) |
| 599 return true; | 603 return true; |
| 600 return !securityOrigin->taintsCanvas(response().url()); | 604 return !securityOrigin->taintsCanvas(response().url()); |
| 601 } | 605 } |
| 602 | 606 |
| 603 } // namespace blink | 607 } // namespace blink |
| OLD | NEW |