Changeset 147748 in webkit


Ignore:
Timestamp:
Apr 5, 2013 8:45:51 AM (11 years ago)
Author:
rniwa@webkit.org
Message:

Remove Chromium code from WebCore/rendering
https://bugs.webkit.org/show_bug.cgi?id=114017

Reviewed by Simon Fraser.

Removed.

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::setLogicalWidthForTextRun):

  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::requiresHorizontalScrollbarLayer):
(WebCore::RenderLayerBacking::requiresVerticalScrollbarLayer):
(WebCore::RenderLayerBacking::requiresScrollCornerLayer):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::paintContents):
(WebCore::shouldCompositeOverflowControls):
(WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):

  • rendering/RenderMediaControlsChromium.cpp: Removed.
  • rendering/RenderMediaControlsChromium.h: Removed.
  • rendering/RenderObject.cpp:

(WebCore::RenderObject::shouldRespectImageOrientation):

  • rendering/RenderText.cpp:

(WebCore):
(WebCore::RenderText::previousOffsetForBackwardDeletion):

  • rendering/RenderThemeChromiumAndroid.cpp: Removed.
  • rendering/RenderThemeChromiumAndroid.h: Removed.
  • rendering/RenderThemeChromiumCommon.cpp: Removed.
  • rendering/RenderThemeChromiumCommon.h: Removed.
  • rendering/RenderThemeChromiumDefault.cpp: Removed.
  • rendering/RenderThemeChromiumDefault.h: Removed.
  • rendering/RenderThemeChromiumFontProvider.cpp: Removed.
  • rendering/RenderThemeChromiumFontProvider.h: Removed.
  • rendering/RenderThemeChromiumFontProviderLinux.cpp: Removed.
  • rendering/RenderThemeChromiumFontProviderWin.cpp: Removed.
  • rendering/RenderThemeChromiumMac.h: Removed.
  • rendering/RenderThemeChromiumMac.mm: Removed.
  • rendering/RenderThemeChromiumSkia.cpp: Removed.
  • rendering/RenderThemeChromiumSkia.h: Removed.
  • rendering/RenderThemeChromiumWin.cpp: Removed.
  • rendering/RenderThemeChromiumWin.h: Removed.
  • rendering/RenderThemeMacShared.mm:

(WebCore::RenderThemeMacShared::paintSliderThumb):

Location:
trunk/Source/WebCore
Files:
18 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r147746 r147748  
     12013-04-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Remove Chromium code from WebCore/rendering
     4        https://bugs.webkit.org/show_bug.cgi?id=114017
     5
     6        Reviewed by Simon Fraser.
     7
     8        Removed.
     9
     10        * rendering/RenderBlockLineLayout.cpp:
     11        (WebCore::setLogicalWidthForTextRun):
     12        * rendering/RenderLayerBacking.cpp:
     13        (WebCore::RenderLayerBacking::requiresHorizontalScrollbarLayer):
     14        (WebCore::RenderLayerBacking::requiresVerticalScrollbarLayer):
     15        (WebCore::RenderLayerBacking::requiresScrollCornerLayer):
     16        * rendering/RenderLayerCompositor.cpp:
     17        (WebCore::RenderLayerCompositor::paintContents):
     18        (WebCore::shouldCompositeOverflowControls):
     19        (WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):
     20        * rendering/RenderMediaControlsChromium.cpp: Removed.
     21        * rendering/RenderMediaControlsChromium.h: Removed.
     22        * rendering/RenderObject.cpp:
     23        (WebCore::RenderObject::shouldRespectImageOrientation):
     24        * rendering/RenderText.cpp:
     25        (WebCore):
     26        (WebCore::RenderText::previousOffsetForBackwardDeletion):
     27        * rendering/RenderThemeChromiumAndroid.cpp: Removed.
     28        * rendering/RenderThemeChromiumAndroid.h: Removed.
     29        * rendering/RenderThemeChromiumCommon.cpp: Removed.
     30        * rendering/RenderThemeChromiumCommon.h: Removed.
     31        * rendering/RenderThemeChromiumDefault.cpp: Removed.
     32        * rendering/RenderThemeChromiumDefault.h: Removed.
     33        * rendering/RenderThemeChromiumFontProvider.cpp: Removed.
     34        * rendering/RenderThemeChromiumFontProvider.h: Removed.
     35        * rendering/RenderThemeChromiumFontProviderLinux.cpp: Removed.
     36        * rendering/RenderThemeChromiumFontProviderWin.cpp: Removed.
     37        * rendering/RenderThemeChromiumMac.h: Removed.
     38        * rendering/RenderThemeChromiumMac.mm: Removed.
     39        * rendering/RenderThemeChromiumSkia.cpp: Removed.
     40        * rendering/RenderThemeChromiumSkia.h: Removed.
     41        * rendering/RenderThemeChromiumWin.cpp: Removed.
     42        * rendering/RenderThemeChromiumWin.h: Removed.
     43        * rendering/RenderThemeMacShared.mm:
     44        (WebCore::RenderThemeMacShared::paintSliderThumb):
     45
    1462013-04-05  Noam Rosenthal  <noam@webkit.org>
    247
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r147667 r147748  
    819819
    820820    bool kerningIsEnabled = font.typesettingFeatures() & Kerning;
    821 
    822 #if PLATFORM(CHROMIUM) && OS(DARWIN)
    823     // FIXME: Having any font feature settings enabled can lead to selection gaps on
    824     // Chromium-mac. https://bugs.webkit.org/show_bug.cgi?id=113418
    825     bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath() && !font.fontDescription().featureSettings();
    826 #else
    827821    bool canUseSimpleFontCodePath = renderer->canUseSimpleFontCodePath();
    828 #endif
    829822   
    830823    // Since we don't cache glyph overflows, we need to re-measure the run if
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r147579 r147748  
    10171017bool RenderLayerBacking::requiresHorizontalScrollbarLayer() const
    10181018{
    1019 #if !PLATFORM(CHROMIUM)
    10201019    if (!m_owningLayer->hasOverlayScrollbars() && !m_owningLayer->needsCompositedScrolling())
    10211020        return false;
    1022 #endif
    10231021    return m_owningLayer->horizontalScrollbar();
    10241022}
     
    10261024bool RenderLayerBacking::requiresVerticalScrollbarLayer() const
    10271025{
    1028 #if !PLATFORM(CHROMIUM)
    10291026    if (!m_owningLayer->hasOverlayScrollbars() && !m_owningLayer->needsCompositedScrolling())
    10301027        return false;
    1031 #endif
    10321028    return m_owningLayer->verticalScrollbar();
    10331029}
     
    10351031bool RenderLayerBacking::requiresScrollCornerLayer() const
    10361032{
    1037 #if !PLATFORM(CHROMIUM)
    10381033    if (!m_owningLayer->hasOverlayScrollbars() && !m_owningLayer->needsCompositedScrolling())
    10391034        return false;
    1040 #endif
    10411035    return !m_owningLayer->scrollCornerAndResizerRect().isEmpty();
    10421036}
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r147502 r147748  
    22792279        m_renderView->frameView()->paintScrollCorner(&context, transformedClip);
    22802280        context.restore();
    2281 #if PLATFORM(CHROMIUM) && ENABLE(RUBBER_BANDING)
    2282     } else if (graphicsLayer == layerForOverhangAreas()) {
    2283         ScrollView* view = m_renderView->frameView();
    2284         view->calculateAndPaintOverhangAreas(&context, clip);
    2285 #endif
    22862281    }
    22872282}
     
    23812376    }
    23822377
    2383 #if !PLATFORM(CHROMIUM)
    23842378    if (!view->hasOverlayScrollbars())
    23852379        return false;
    2386 #endif
    23872380    return true;
    23882381}
     
    24162409    if (scrollingCoordinator() && m_renderView->frameView()->hasOpaqueBackground() && !m_renderView->frameView()->prohibitsScrolling())
    24172410        return true;
    2418 
    2419     // Chromium always wants a layer.
    2420 #if PLATFORM(CHROMIUM)
    2421     return true;
    2422 #endif
    24232411
    24242412    return false;
  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r147739 r147748  
    22952295    // an <img> and the setting to respect it everywhere is set.
    22962296    return
    2297 #if USE(CG) || PLATFORM(CHROMIUM) || USE(CAIRO) || PLATFORM(BLACKBERRY)
     2297#if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
    22982298        // This can only be enabled for ports which honor the orientation flag in their drawing code.
    22992299        document()->isImageDocument() ||
  • trunk/Source/WebCore/rendering/RenderText.cpp

    r146726 r147748  
    17411741}
    17421742
    1743 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) && OS(MAC_OS_X)
     1743#if PLATFORM(MAC)
    17441744
    17451745#define HANGUL_CHOSEONG_START (0x1100)
     
    17831783int RenderText::previousOffsetForBackwardDeletion(int current) const
    17841784{
    1785 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) && OS(MAC_OS_X)
     1785#if PLATFORM(MAC)
    17861786    ASSERT(m_text);
    17871787    StringImpl& text = *m_text.impl();
  • trunk/Source/WebCore/rendering/RenderThemeMacShared.mm

    r147135 r147748  
    14341434    }
    14351435
    1436 #if PLATFORM(CHROMIUM)
    1437     paintInfo.context->translate(0, unzoomedRect.y());
    1438     paintInfo.context->scale(FloatSize(1, -1));
    1439     paintInfo.context->translate(0, -(unzoomedRect.y() + unzoomedRect.height()));
    1440 #endif
    1441 
    14421436    [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:documentViewFor(o)];
    14431437    [sliderThumbCell setControlView:nil];
Note: See TracChangeset for help on using the changeset viewer.