Changeset 167006 in webkit
- Timestamp:
- Apr 9, 2014 12:35:31 AM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r167005 r167006 1 2014-04-09 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Unreviewed. Fix GTK+ build after r166975. 4 5 Do not use WebPage removed API to fix the build. Page overlays are 6 no broken, see https://bugs.webkit.org/show_bug.cgi?id=131433. 7 8 * WebProcess/WebPage/DrawingAreaImpl.cpp: 9 (WebKit::DrawingAreaImpl::display): 10 * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp: 11 (WebKit::LayerTreeHostGtk::initialize): 12 (WebKit::LayerTreeHostGtk::paintContents): 13 1 14 2014-04-09 Carlos Garcia Campos <cgarcia@igalia.com> 2 15 -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
r163079 r167006 658 658 m_webPage->drawRect(*graphicsContext, rects[i]); 659 659 660 if (m_webPage->hasPageOverlay()) { 661 PageOverlayList& pageOverlays = m_webPage->pageOverlays(); 662 PageOverlayList::iterator end = pageOverlays.end(); 663 for (PageOverlayList::iterator it = pageOverlays.begin(); it != end; ++it) 664 m_webPage->drawPageOverlay(it->get(), *graphicsContext, rects[i]); 665 } 660 // FIXME: Draw page olverlays. https://bugs.webkit.org/show_bug.cgi?id=131433. 666 661 667 662 updateInfo.updateRects.append(rects[i]); -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
r165968 r167006 127 127 toTextureMapperLayer(m_rootLayer.get())->setTextureMapper(m_textureMapper.get()); 128 128 129 if (m_webPage->hasPageOverlay()) { 130 PageOverlayList& pageOverlays = m_webPage->pageOverlays(); 131 PageOverlayList::iterator end = pageOverlays.end(); 132 for (PageOverlayList::iterator it = pageOverlays.begin(); it != end; ++it) 133 createPageOverlayLayer(it->get()); 134 } 129 // FIXME: Cretae page olverlay layers. https://bugs.webkit.org/show_bug.cgi?id=131433. 135 130 136 131 scheduleLayerFlush(); … … 285 280 } 286 281 287 for (auto& pageOverlayLayer : m_pageOverlayLayers) { 288 if (pageOverlayLayer.value.get() == graphicsLayer) { 289 m_webPage->drawPageOverlay(pageOverlayLayer.key, graphicsContext, enclosingIntRect(clipRect)); 290 break; 291 } 292 } 282 // FIXME: Draw page overlays. https://bugs.webkit.org/show_bug.cgi?id=131433. 293 283 } 294 284
Note: See TracChangeset
for help on using the changeset viewer.