Changeset 147893 in webkit


Ignore:
Timestamp:
Apr 7, 2013 9:20:38 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

Remove the android code from WebCore
https://bugs.webkit.org/show_bug.cgi?id=114136

Reviewed by Anders Carlsson.

  • WebCore.exp.in:
  • dom/ViewportArguments.cpp:

(WebCore):
(WebCore::setViewportFeature):
(WebCore::viewportErrorMessageTemplate):
(WebCore::viewportErrorMessageLevel):

  • dom/ViewportArguments.h:

(WebCore::ViewportArguments::ViewportArguments):
(ViewportArguments):
(WebCore::ViewportArguments::operator==):

  • editing/EditingBehavior.h:

(WebCore::EditingBehavior::shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom):
(WebCore::EditingBehavior::shouldAllowSpellingSuggestionsWithoutSelection):
(WebCore::EditingBehavior::shouldNavigateBackOnBackspace):

  • editing/EditingBehaviorTypes.h:
  • page/EventHandler.cpp:

(WebCore::EventHandler::handleGestureLongTap):
(WebCore::EventHandler::handleGestureForTextSelectionOrContextMenu):

  • page/Settings.cpp:

(WebCore):
(WebCore::editingBehaviorTypeForPlatform):

  • platform/graphics/FontCache.h:

(FontCache):

  • platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:

(WebCore::FontPlatformData::getRenderStyleForStrike):

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::setEditingBehavior):

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r147892 r147893  
     12013-04-07  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Remove the android code from WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=114136
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebCore.exp.in:
     9        * dom/ViewportArguments.cpp:
     10        (WebCore):
     11        (WebCore::setViewportFeature):
     12        (WebCore::viewportErrorMessageTemplate):
     13        (WebCore::viewportErrorMessageLevel):
     14        * dom/ViewportArguments.h:
     15        (WebCore::ViewportArguments::ViewportArguments):
     16        (ViewportArguments):
     17        (WebCore::ViewportArguments::operator==):
     18        * editing/EditingBehavior.h:
     19        (WebCore::EditingBehavior::shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom):
     20        (WebCore::EditingBehavior::shouldAllowSpellingSuggestionsWithoutSelection):
     21        (WebCore::EditingBehavior::shouldNavigateBackOnBackspace):
     22        * editing/EditingBehaviorTypes.h:
     23        * page/EventHandler.cpp:
     24        (WebCore::EventHandler::handleGestureLongTap):
     25        (WebCore::EventHandler::handleGestureForTextSelectionOrContextMenu):
     26        * page/Settings.cpp:
     27        (WebCore):
     28        (WebCore::editingBehaviorTypeForPlatform):
     29        * platform/graphics/FontCache.h:
     30        (FontCache):
     31        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
     32        (WebCore::FontPlatformData::getRenderStyleForStrike):
     33        * testing/InternalSettings.cpp:
     34        (WebCore::InternalSettings::setEditingBehavior):
     35
    1362013-04-07  Oliver Hunt  <oliver@apple.com>
    237
  • trunk/Source/WebCore/WebCore.exp.in

    r147892 r147893  
    562562__ZN7WebCore17RegularExpressionD1Ev
    563563__ZN7WebCore17SubresourceLoader6createEPNS_5FrameEPNS_14CachedResourceERKNS_15ResourceRequestERKNS_21ResourceLoaderOptionsE
    564 __ZN7WebCore17ViewportArguments19deprecatedTargetDPIE
    565564__ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
    566565__ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
  • trunk/Source/WebCore/dom/ViewportArguments.cpp

    r147529 r147893  
    4343namespace WebCore {
    4444
     45#if PLATFORM(BLACKBERRY) || PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
    4546const float ViewportArguments::deprecatedTargetDPI = 160;
     47#endif
    4648
    4749static const float& compareIgnoringAuto(const float& value1, const float& value2, const float& (*compare) (const float&, const float&))
     
    381383
    382384    return 1;
    383 }
    384 
    385 static float findTargetDensityDPIValue(const String& keyString, const String& valueString, Document* document)
    386 {
    387     if (equalIgnoringCase(valueString, "device-dpi"))
    388         return ViewportArguments::ValueDeviceDPI;
    389     if (equalIgnoringCase(valueString, "low-dpi"))
    390         return ViewportArguments::ValueLowDPI;
    391     if (equalIgnoringCase(valueString, "medium-dpi"))
    392         return ViewportArguments::ValueMediumDPI;
    393     if (equalIgnoringCase(valueString, "high-dpi"))
    394         return ViewportArguments::ValueHighDPI;
    395 
    396     bool ok;
    397     float value = numericPrefix(keyString, valueString, document, &ok);
    398     if (!ok || value < 70 || value > 400)
    399         return ViewportArguments::ValueAuto;
    400 
    401     return value;
    402385}
    403386
     
    418401    else if (keyString == "user-scalable")
    419402        arguments->userZoom = findUserScalableValue(keyString, valueString, document);
    420     else if (keyString == "target-densitydpi") {
    421         arguments->deprecatedTargetDensityDPI = findTargetDensityDPIValue(keyString, valueString, document);
    422         reportViewportWarning(document, TargetDensityDpiUnsupported, String(), String());
    423     } else
     403    else
    424404        reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
    425405}
     
    431411        "Viewport argument value \"%replacement1\" for key \"%replacement2\" is invalid, and has been ignored.",
    432412        "Viewport argument value \"%replacement1\" for key \"%replacement2\" was truncated to its numeric prefix.",
    433         "Viewport maximum-scale cannot be larger than 10.0. The maximum-scale will be set to 10.0.",
    434         "Viewport target-densitydpi is not supported.",
     413        "Viewport maximum-scale cannot be larger than 10.0. The maximum-scale will be set to 10.0."
    435414    };
    436415
     
    442421    switch (errorCode) {
    443422    case TruncatedViewportArgumentValueError:
    444     case TargetDensityDpiUnsupported:
    445423        return WarningMessageLevel;
    446424    case UnrecognizedViewportArgumentKeyError:
  • trunk/Source/WebCore/dom/ViewportArguments.h

    r147529 r147893  
    4040    UnrecognizedViewportArgumentValueError,
    4141    TruncatedViewportArgumentValueError,
    42     MaximumScaleTooLargeError,
    43     TargetDensityDpiUnsupported
     42    MaximumScaleTooLargeError
    4443};
    4544
     
    9493        , userZoom(ValueAuto)
    9594        , orientation(ValueAuto)
    96         , deprecatedTargetDensityDPI(ValueAuto)
    9795    {
    9896    }
     
    112110    float userZoom;
    113111    float orientation;
    114     float deprecatedTargetDensityDPI; // Only used for Android WebView
    115112
    116113    bool operator==(const ViewportArguments& other) const
     
    128125            && maxZoom == other.maxZoom
    129126            && userZoom == other.userZoom
    130             && orientation == other.orientation
    131             && deprecatedTargetDensityDPI == other.deprecatedTargetDensityDPI;
     127            && orientation == other.orientation;
    132128    }
    133129
     
    137133    }
    138134
     135#if PLATFORM(BLACKBERRY) || PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
    139136    // FIXME: We're going to keep this constant around until all embedders
    140137    // refactor their code to no longer need it.
    141138    static const float deprecatedTargetDPI;
     139#endif
    142140};
    143141
  • trunk/Source/WebCore/editing/EditingBehavior.h

    r147721 r147893  
    4242    bool shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom() const
    4343    {
    44         return m_type != EditingWindowsBehavior && m_type != EditingAndroidBehavior;
     44        return m_type != EditingWindowsBehavior;
    4545    }
    4646
     
    6767    bool shouldAllowSpellingSuggestionsWithoutSelection() const
    6868    {
    69         return m_type == EditingUnixBehavior || m_type == EditingAndroidBehavior;
     69        return m_type == EditingUnixBehavior;
    7070    }
    7171   
     
    7373    bool shouldNavigateBackOnBackspace() const
    7474    {
    75         return m_type != EditingUnixBehavior && m_type != EditingAndroidBehavior;
     75        return m_type != EditingUnixBehavior;
    7676    }
    7777
  • trunk/Source/WebCore/editing/EditingBehaviorTypes.h

    r141837 r147893  
    4040    EditingMacBehavior,
    4141    EditingWindowsBehavior,
    42     EditingUnixBehavior,
    43     EditingAndroidBehavior
     42    EditingUnixBehavior
    4443};
    4544
  • trunk/Source/WebCore/page/EventHandler.cpp

    r147749 r147893  
    26762676bool EventHandler::handleGestureLongTap(const PlatformGestureEvent& gestureEvent)
    26772677{
    2678 #if ENABLE(CONTEXT_MENUS) && !OS(ANDROID)
     2678#if ENABLE(CONTEXT_MENUS)
    26792679    if (!m_didLongPressInvokeContextMenu)
    26802680        return sendContextMenuEventForGesture(gestureEvent);
    2681 #endif
     2681#endif // ENABLE(CONTEXT_MENUS)
    26822682    return false;
    26832683}
     
    26852685bool EventHandler::handleGestureForTextSelectionOrContextMenu(const PlatformGestureEvent& gestureEvent)
    26862686{
    2687 #if OS(ANDROID)
    2688     IntPoint hitTestPoint = m_frame->view()->windowToContents(gestureEvent.position());
    2689     HitTestResult result = hitTestResultAtPoint(hitTestPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
    2690     Node* innerNode = result.targetNode();
    2691     if (!result.isLiveLink() && innerNode && (innerNode->isContentEditable() || innerNode->isTextNode())) {
    2692         selectClosestWordFromHitTestResult(result, DontAppendTrailingWhitespace);
    2693         if (m_frame->selection()->isRange())
    2694             return true;
    2695     }
    2696 #endif
    26972687#if ENABLE(CONTEXT_MENUS)
    26982688    m_didLongPressInvokeContextMenu = (gestureEvent.type() == PlatformEvent::GestureLongPress);
  • trunk/Source/WebCore/page/Settings.cpp

    r147795 r147893  
    113113//  1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well as QtWebKit when built on Mac;
    114114//  2) EditingWindowsBehavior comprises Win32 and WinCE builds, as well as QtWebKit and Chromium when built on Windows;
    115 //  3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/Android (and then abusing the terminology);
    116 //  4) EditingAndroidBehavior comprises Android builds.
     115//  3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS (and then abusing the terminology);
    117116// 99) MacEditingBehavior is used as a fallback.
    118117static EditingBehaviorType editingBehaviorTypeForPlatform()
     
    123122#elif OS(WINDOWS)
    124123    EditingWindowsBehavior
    125 #elif OS(ANDROID)
    126     EditingAndroidBehavior
    127124#elif OS(UNIX)
    128125    EditingUnixBehavior
  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r147888 r147893  
    156156    int m_purgePreventCount;
    157157
    158 #if PLATFORM(MAC) || OS(ANDROID)
     158#if PLATFORM(MAC)
    159159    friend class ComplexTextController;
    160160#endif
  • trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp

    r146456 r147893  
    270270    WebKit::WebFontRenderStyle style;
    271271
    272 #if OS(ANDROID)
    273     style.setDefaults();
    274 #else
    275272    if (!font || !*font)
    276273        style.setDefaults(); // It's probably a webfont. Take the system defaults.
     
    279276    else
    280277        WebKit::WebFontInfo::renderStyleForStrike(font, sizeAndStyle, &style);
    281 #endif
    282278
    283279    style.toFontRenderStyle(&m_style);
  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r147034 r147893  
    388388    else if (equalIgnoringCase(editingBehavior, "unix"))
    389389        settings()->setEditingBehaviorType(EditingUnixBehavior);
    390     else if (equalIgnoringCase(editingBehavior, "android"))
    391         settings()->setEditingBehaviorType(EditingAndroidBehavior);
    392390    else
    393391        ec = SYNTAX_ERR;
Note: See TracChangeset for help on using the changeset viewer.