Changeset 167006 in webkit


Ignore:
Timestamp:
Apr 9, 2014 12:35:31 AM (10 years ago)
Author:
Carlos Garcia Campos
Message:

Unreviewed. Fix GTK+ build after r166975.

Do not use WebPage removed API to fix the build. Page overlays are
no broken, see https://bugs.webkit.org/show_bug.cgi?id=131433.

  • WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::display):

  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::initialize):
(WebKit::LayerTreeHostGtk::paintContents):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r167005 r167006  
     12014-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
    1142014-04-09  Carlos Garcia Campos  <cgarcia@igalia.com>
    215
  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

    r163079 r167006  
    658658        m_webPage->drawRect(*graphicsContext, rects[i]);
    659659
    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.
    666661
    667662        updateInfo.updateRects.append(rects[i]);
  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

    r165968 r167006  
    127127    toTextureMapperLayer(m_rootLayer.get())->setTextureMapper(m_textureMapper.get());
    128128
    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.
    135130
    136131    scheduleLayerFlush();
     
    285280    }
    286281
    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.
    293283}
    294284
Note: See TracChangeset for help on using the changeset viewer.