| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "wtf/Vector.h" | 35 #include "wtf/Vector.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 ResourceLoadPriorityOptimizer* ResourceLoadPriorityOptimizer::resourceLoadPriori
tyOptimizer() | 39 ResourceLoadPriorityOptimizer* ResourceLoadPriorityOptimizer::resourceLoadPriori
tyOptimizer() |
| 40 { | 40 { |
| 41 DEFINE_STATIC_LOCAL(ResourceLoadPriorityOptimizer, s_renderLoadOptimizer, ()
); | 41 DEFINE_STATIC_LOCAL(ResourceLoadPriorityOptimizer, s_renderLoadOptimizer, ()
); |
| 42 return &s_renderLoadOptimizer; | 42 return &s_renderLoadOptimizer; |
| 43 } | 43 } |
| 44 | 44 |
| 45 ResourceLoadPriorityOptimizer::ResourceAndVisibility::ResourceAndVisibility(Imag
eResource* image, VisibilityStatus v) | 45 ResourceLoadPriorityOptimizer::ResourceAndVisibility::ResourceAndVisibility(Imag
eResource* image, VisibilityStatus v, uint32_t s) |
| 46 : imageResource(image) | 46 : imageResource(image) |
| 47 , status(v) | 47 , status(v) |
| 48 , screenArea(s) |
| 48 { | 49 { |
| 49 } | 50 } |
| 50 | 51 |
| 51 ResourceLoadPriorityOptimizer::ResourceAndVisibility::~ResourceAndVisibility() | 52 ResourceLoadPriorityOptimizer::ResourceAndVisibility::~ResourceAndVisibility() |
| 52 { | 53 { |
| 53 } | 54 } |
| 54 | 55 |
| 55 ResourceLoadPriorityOptimizer::ResourceLoadPriorityOptimizer() | 56 ResourceLoadPriorityOptimizer::ResourceLoadPriorityOptimizer() |
| 56 { | 57 { |
| 57 } | 58 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 updateImageResourcesWithLoadPriority(); | 93 updateImageResourcesWithLoadPriority(); |
| 93 } | 94 } |
| 94 | 95 |
| 95 void ResourceLoadPriorityOptimizer::updateImageResourcesWithLoadPriority() | 96 void ResourceLoadPriorityOptimizer::updateImageResourcesWithLoadPriority() |
| 96 { | 97 { |
| 97 for (ImageResourceMap::iterator it = m_imageResources.begin(); it != m_image
Resources.end(); ++it) { | 98 for (ImageResourceMap::iterator it = m_imageResources.begin(); it != m_image
Resources.end(); ++it) { |
| 98 ResourceLoadPriority priority = it->value->status == Visible ? | 99 ResourceLoadPriority priority = it->value->status == Visible ? |
| 99 ResourceLoadPriorityLow : ResourceLoadPriorityVeryLow; | 100 ResourceLoadPriorityLow : ResourceLoadPriorityVeryLow; |
| 100 | 101 |
| 101 if (priority != it->value->imageResource->resourceRequest().priority())
{ | 102 if (priority != it->value->imageResource->resourceRequest().priority())
{ |
| 102 it->value->imageResource->resourceRequest().setPriority(priority); | 103 it->value->imageResource->resourceRequest().setPriority(priority, it
->value->screenArea); |
| 103 it->value->imageResource->didChangePriority(priority); | 104 it->value->imageResource->didChangePriority(priority, it->value->scr
eenArea); |
| 104 } | 105 } |
| 105 } | 106 } |
| 106 m_imageResources.clear(); | 107 m_imageResources.clear(); |
| 107 } | 108 } |
| 108 | 109 |
| 109 void ResourceLoadPriorityOptimizer::notifyImageResourceVisibility(ImageResource*
img, VisibilityStatus status) | 110 void ResourceLoadPriorityOptimizer::notifyImageResourceVisibility(ImageResource*
img, VisibilityStatus status, const LayoutRect& screenRect) |
| 110 { | 111 { |
| 111 if (!img || img->isLoaded()) | 112 if (!img || img->isLoaded()) |
| 112 return; | 113 return; |
| 113 | 114 |
| 114 ImageResourceMap::AddResult result = m_imageResources.add(img->identifier(),
adoptPtr(new ResourceAndVisibility(img, status))); | 115 int screenArea = 0; |
| 115 if (!result.isNewEntry && status == Visible) | 116 if (!screenRect.isEmpty() && status == Visible) |
| 117 screenArea += static_cast<uint32_t>(screenRect.width() * screenRect.heig
ht()); |
| 118 |
| 119 ImageResourceMap::AddResult result = m_imageResources.add(img->identifier(),
adoptPtr(new ResourceAndVisibility(img, status, screenArea))); |
| 120 if (!result.isNewEntry && status == Visible) { |
| 116 result.iterator->value->status = status; | 121 result.iterator->value->status = status; |
| 122 result.iterator->value->screenArea = status; |
| 123 } |
| 117 } | 124 } |
| 118 | 125 |
| 119 } | 126 } |
| OLD | NEW |