| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * | 10 * |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 } | 46 } |
| 47 | 47 |
| 48 PageOverlayList::~PageOverlayList() | 48 PageOverlayList::~PageOverlayList() |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 bool PageOverlayList::add(WebPageOverlay* overlay, int zOrder) | 52 bool PageOverlayList::add(WebPageOverlay* overlay, int zOrder) |
| 53 { | 53 { |
| 54 bool added = false; | 54 bool added = false; |
| 55 size_t index = find(overlay); | 55 size_t index = find(overlay); |
| 56 if (index == WTF::notFound) { | 56 if (index == WTF::kNotFound) { |
| 57 OwnPtr<PageOverlay> pageOverlay = PageOverlay::create(m_viewImpl, overla
y); | 57 OwnPtr<PageOverlay> pageOverlay = PageOverlay::create(m_viewImpl, overla
y); |
| 58 m_pageOverlays.append(pageOverlay.release()); | 58 m_pageOverlays.append(pageOverlay.release()); |
| 59 index = m_pageOverlays.size() - 1; | 59 index = m_pageOverlays.size() - 1; |
| 60 added = true; | 60 added = true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 PageOverlay* pageOverlay = m_pageOverlays[index].get(); | 63 PageOverlay* pageOverlay = m_pageOverlays[index].get(); |
| 64 pageOverlay->setZOrder(zOrder); | 64 pageOverlay->setZOrder(zOrder); |
| 65 | 65 |
| 66 // Adjust page overlay list order based on their z-order numbers. We first | 66 // Adjust page overlay list order based on their z-order numbers. We first |
| (...skipping 24 matching lines...) Expand all Loading... |
| 91 update(); | 91 update(); |
| 92 } else | 92 } else |
| 93 pageOverlay->update(); | 93 pageOverlay->update(); |
| 94 | 94 |
| 95 return added; | 95 return added; |
| 96 } | 96 } |
| 97 | 97 |
| 98 bool PageOverlayList::remove(WebPageOverlay* overlay) | 98 bool PageOverlayList::remove(WebPageOverlay* overlay) |
| 99 { | 99 { |
| 100 size_t index = find(overlay); | 100 size_t index = find(overlay); |
| 101 if (index == WTF::notFound) | 101 if (index == WTF::kNotFound) |
| 102 return false; | 102 return false; |
| 103 | 103 |
| 104 m_pageOverlays[index]->clear(); | 104 m_pageOverlays[index]->clear(); |
| 105 m_pageOverlays.remove(index); | 105 m_pageOverlays.remove(index); |
| 106 return true; | 106 return true; |
| 107 } | 107 } |
| 108 | 108 |
| 109 void PageOverlayList::update() | 109 void PageOverlayList::update() |
| 110 { | 110 { |
| 111 for (size_t i = 0; i < m_pageOverlays.size(); ++i) | 111 for (size_t i = 0; i < m_pageOverlays.size(); ++i) |
| 112 m_pageOverlays[i]->update(); | 112 m_pageOverlays[i]->update(); |
| 113 } | 113 } |
| 114 | 114 |
| 115 void PageOverlayList::paintWebFrame(WebCore::GraphicsContext& gc) | 115 void PageOverlayList::paintWebFrame(WebCore::GraphicsContext& gc) |
| 116 { | 116 { |
| 117 for (size_t i = 0; i < m_pageOverlays.size(); ++i) | 117 for (size_t i = 0; i < m_pageOverlays.size(); ++i) |
| 118 m_pageOverlays[i]->paintWebFrame(gc); | 118 m_pageOverlays[i]->paintWebFrame(gc); |
| 119 } | 119 } |
| 120 | 120 |
| 121 size_t PageOverlayList::find(WebPageOverlay* overlay) | 121 size_t PageOverlayList::find(WebPageOverlay* overlay) |
| 122 { | 122 { |
| 123 for (size_t i = 0; i < m_pageOverlays.size(); ++i) { | 123 for (size_t i = 0; i < m_pageOverlays.size(); ++i) { |
| 124 if (m_pageOverlays[i]->overlay() == overlay) | 124 if (m_pageOverlays[i]->overlay() == overlay) |
| 125 return i; | 125 return i; |
| 126 } | 126 } |
| 127 return WTF::notFound; | 127 return WTF::kNotFound; |
| 128 } | 128 } |
| 129 | 129 |
| 130 size_t PageOverlayList::findGraphicsLayer(WebCore::GraphicsLayer* layer) | 130 size_t PageOverlayList::findGraphicsLayer(WebCore::GraphicsLayer* layer) |
| 131 { | 131 { |
| 132 for (size_t i = 0; i < m_pageOverlays.size(); ++i) { | 132 for (size_t i = 0; i < m_pageOverlays.size(); ++i) { |
| 133 if (m_pageOverlays[i]->graphicsLayer() == layer) | 133 if (m_pageOverlays[i]->graphicsLayer() == layer) |
| 134 return i; | 134 return i; |
| 135 } | 135 } |
| 136 return WTF::notFound; | 136 return WTF::kNotFound; |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace WebKit | 139 } // namespace WebKit |
| OLD | NEW |