Changeset 163717 in webkit


Ignore:
Timestamp:
Feb 8, 2014, 11:58:21 AM (11 years ago)
Author:
mitz@apple.com
Message:

Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
​https://bugs.webkit.org/show_bug.cgi?id=128456

Reviewed by Anders Carlsson.

Source/WebCore:

Updated fast/css/getComputedStyle and svg/css results.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue): Removed CSSPropertyWebKitHighlight case.

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue): Ditto.

  • css/CSSPropertyNames.in: Removed -webkit-highlight.
  • css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Removed
CSSPropertyWebKitHighlight handler.

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty): Removed CSSPropertyWebKitHighlight case.

  • page/Chrome.cpp: Removed customHighlightRect and paintCustomHighlight.
  • page/ChromeClient.h: Ditto.
  • rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint): Removed painting custom highlight.

  • rendering/InlineTextBox.h:
  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::createLineBoxesFromBidiRuns): Removed adding overflow for custom
highlights.

  • rendering/RenderBox.cpp: Removed paintCustomHighlight.
  • rendering/RenderBox.h:
  • rendering/RenderImage.cpp:

(WebCore::RenderImage::paintReplaced): Removed painting custom highlight.

  • rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::paint): Ditto.

  • rendering/RenderSnapshottedPlugIn.cpp:

(WebCore::RenderSnapshottedPlugIn::paintSnapshot): Ditto.

  • rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paint): Ditto.

  • rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::paint): Ditto.

  • rendering/RootInlineBox.h:
  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresLayout): Removed highlight comparison.

  • rendering/style/RenderStyle.h:
  • rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData): Removed initializer.
(WebCore::StyleRareInheritedData::operator==): Removed highlight comparison.

  • rendering/style/StyleRareInheritedData.h: Removed highlight member variable.

Source/WebInspectorUI:

  • UserInterface/CSSKeywordCompletions.js: Removed -webkit-highlight.

Source/WebKit/mac:

  • WebCoreSupport/WebChromeClient.h:
  • WebCoreSupport/WebChromeClient.mm: Removed customHighlightRect and paintCustomHighlight.
  • WebView/WebHTMLView.mm:

(-[WebHTMLViewPrivate dealloc]): Removed highlighters ivar.
(-[WebHTMLViewPrivate clear]): Ditto.

  • WebView/WebHTMLViewInternal.h: Removed declaration.
  • WebView/WebHTMLViewPrivate.h: Removed WebHTMLHighlighter protocol and method declarations.

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebChromeClient.cpp: Removed customHighlightRect and

paintCustomHighlight.

  • WebProcess/WebCoreSupport/WebChromeClient.h:

LayoutTests:

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r163713 r163717  
     12014-02-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
     4        https://bugs.webkit.org/show_bug.cgi?id=128456
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * fast/css/getComputedStyle/computed-style-expected.txt:
     9        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     10        * svg/css/getComputedStyle-basic-expected.txt:
     11
    1122014-02-08  Zan Dobersek  <zdobersek@igalia.com>
    213

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r162135 r163717  
    153153-webkit-font-smoothing: auto;
    154154-webkit-font-variant-ligatures: normal;
    155 -webkit-highlight: none;
    156155-webkit-hyphenate-character: auto;
    157156-webkit-hyphenate-limit-after: auto;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r162135 r163717  
    152152-webkit-font-smoothing: auto
    153153-webkit-font-variant-ligatures: normal
    154 -webkit-highlight: none
    155154-webkit-hyphenate-character: auto
    156155-webkit-hyphenate-limit-after: auto

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r162135 r163717  
    303303rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
    304304rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
    305 rect: style.getPropertyValue(-webkit-highlight) : none
    306 rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
    307305rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
    308306rect: style.getPropertyCSSValue(-webkit-hyphenate-character) : [object CSSPrimitiveValue]
    … …  
    799797g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
    800798g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
    801 g: style.getPropertyValue(-webkit-highlight) : none
    802 g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
    803799g: style.getPropertyValue(-webkit-hyphenate-character) : auto
    804800g: style.getPropertyCSSValue(-webkit-hyphenate-character) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r163716 r163717  
     12014-02-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
     4        https://bugs.webkit.org/show_bug.cgi?id=128456
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Updated fast/css/getComputedStyle and svg/css results.
     9
     10        * css/CSSComputedStyleDeclaration.cpp:
     11        (WebCore::ComputedStyleExtractor::propertyValue): Removed CSSPropertyWebKitHighlight case.
     12        * css/CSSParser.cpp:
     13        (WebCore::CSSParser::parseValue): Ditto.
     14        * css/CSSPropertyNames.in: Removed -webkit-highlight.
     15        * css/DeprecatedStyleBuilder.cpp:
     16        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Removed
     17        CSSPropertyWebKitHighlight handler.
     18        * css/StyleResolver.cpp:
     19        (WebCore::StyleResolver::applyProperty): Removed CSSPropertyWebKitHighlight case.
     20        * page/Chrome.cpp: Removed customHighlightRect and paintCustomHighlight.
     21        * page/ChromeClient.h: Ditto.
     22        * rendering/InlineTextBox.cpp:
     23        (WebCore::InlineTextBox::paint): Removed painting custom highlight.
     24        * rendering/InlineTextBox.h:
     25        * rendering/RenderBlockLineLayout.cpp:
     26        (WebCore::RenderBlockFlow::createLineBoxesFromBidiRuns): Removed adding overflow for custom
     27        highlights.
     28        * rendering/RenderBox.cpp: Removed paintCustomHighlight.
     29        * rendering/RenderBox.h:
     30        * rendering/RenderImage.cpp:
     31        (WebCore::RenderImage::paintReplaced): Removed painting custom highlight.
     32        * rendering/RenderListMarker.cpp:
     33        (WebCore::RenderListMarker::paint): Ditto.
     34        * rendering/RenderSnapshottedPlugIn.cpp:
     35        (WebCore::RenderSnapshottedPlugIn::paintSnapshot): Ditto.
     36        * rendering/RenderWidget.cpp:
     37        (WebCore::RenderWidget::paint): Ditto.
     38        * rendering/RootInlineBox.cpp:
     39        (WebCore::RootInlineBox::paint): Ditto.
     40        * rendering/RootInlineBox.h:
     41        * rendering/style/RenderStyle.cpp:
     42        (WebCore::RenderStyle::changeRequiresLayout): Removed highlight comparison.
     43        * rendering/style/RenderStyle.h:
     44        * rendering/style/StyleRareInheritedData.cpp:
     45        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Removed initializer.
     46        (WebCore::StyleRareInheritedData::operator==): Removed highlight comparison.
     47        * rendering/style/StyleRareInheritedData.h: Removed highlight member variable.
     48
    1492014-02-08  Dan Bernstein  <mitz@apple.com>
    250

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r163633 r163717  
    291291    CSSPropertyWebkitGridRowEnd,
    292292    CSSPropertyWebkitGridRowStart,
    293     CSSPropertyWebkitHighlight,
    294293    CSSPropertyWebkitHyphenateCharacter,
    295294    CSSPropertyWebkitHyphenateLimitAfter,
    … …  
    21192118            }
    21202119            return zoomAdjustedPixelValueForLength(style->height(), style.get());
    2121         case CSSPropertyWebkitHighlight:
    2122             if (style->highlight() == nullAtom)
    2123                 return cssValuePool().createIdentifierValue(CSSValueNone);
    2124             return cssValuePool().createValue(style->highlight(), CSSPrimitiveValue::CSS_STRING);
    21252120        case CSSPropertyWebkitHyphens:
    21262121            return cssValuePool().createValue(style->hyphens());

  • trunk/Source/WebCore/css/CSSParser.cpp

    r163633 r163717  
    26852685    case CSSPropertyWebkitFontSizeDelta:           // <length>
    26862686        validPrimitive = validUnit(value, FLength);
    2687         break;
    2688 
    2689     case CSSPropertyWebkitHighlight:
    2690         if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING)
    2691             validPrimitive = true;
    26922687        break;
    26932688

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r163633 r163717  
    313313-webkit-grid-template
    314314-webkit-grid-auto-flow
    315 -webkit-highlight [Inherited]
    316315-webkit-hyphenate-character [Inherited]
    317316-webkit-hyphenate-limit-after [Inherited]

  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r163633 r163717  
    25222522    setPropertyHandler(CSSPropertyWebkitFontSmoothing, ApplyPropertyFont<FontSmoothingMode, &FontDescription::fontSmoothing, &FontDescription::setFontSmoothing, AutoSmoothing>::createHandler());
    25232523    setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
    2524     setPropertyHandler(CSSPropertyWebkitHighlight, ApplyPropertyString<MapNoneToNull, &RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight>::createHandler());
    25252524    setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
    25262525    setPropertyHandler(CSSPropertyWebkitHyphenateLimitAfter, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitAfter, &RenderStyle::setHyphenationLimitAfter, &RenderStyle::initialHyphenationLimitAfter>::createHandler());

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r163625 r163717  
    29302930    case CSSPropertyWebkitFontSmoothing:
    29312931    case CSSPropertyWebkitFontVariantLigatures:
    2932     case CSSPropertyWebkitHighlight:
    29332932    case CSSPropertyWebkitHyphenateCharacter:
    29342933    case CSSPropertyWebkitHyphenateLimitAfter:

  • trunk/Source/WebCore/page/Chrome.cpp

    r163483 r163717  
    560560}
    561561
    562 FloatRect ChromeClient::customHighlightRect(Node*, const AtomicString&, const FloatRect&)
    563 {
    564     return FloatRect();
    565 }
    566 
    567 void ChromeClient::paintCustomHighlight(Node*, const AtomicString&, const FloatRect&, const FloatRect&, bool, bool)
    568 {
    569 }
    570 
    571562bool ChromeClient::shouldReplaceWithGeneratedFileForUpload(const String&, String&)
    572563{

  • trunk/Source/WebCore/page/ChromeClient.h

    r163591 r163717  
    220220    virtual void populateVisitedLinks();
    221221
    222     virtual FloatRect customHighlightRect(Node*, const AtomicString& type, const FloatRect& lineRect);
    223     virtual void paintCustomHighlight(Node*, const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect, bool behindText, bool entireLine);
    224            
    225222    virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename);
    226223    virtual String generateReplacementFile(const String& path);

  • trunk/Source/WebCore/rendering/InlineTextBox.cpp

    r162579 r163717  
    586586    // and composition underlines.
    587587    if (paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseTextClip && !isPrinting) {
    588 #if PLATFORM(MAC)
    589         // Custom highlighters go behind everything else.
    590         if (lineStyle.highlight() != nullAtom && !context->paintingDisabled())
    591             paintCustomHighlight(adjustedPaintOffset, lineStyle.highlight());
    592 #endif
    593 
    594588        if (containsComposition && !useCustomUnderlines)
    595589            paintCompositionBackground(context, boxOrigin, lineStyle, font,
    … …  
    814808    context->drawHighlightForText(font, constructTextRun(style, font), localOrigin, selHeight, c, style.colorSpace(), sPos, ePos);
    815809}
    816 
    817 #if PLATFORM(MAC)
    818 
    819 void InlineTextBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type)
    820 {
    821     Page* page = renderer().frame().page();
    822     if (!page)
    823         return;
    824 
    825     const RootInlineBox& rootBox = root();
    826     FloatRect rootRect(paintOffset.x() + rootBox.x(), paintOffset.y() + selectionTop(), rootBox.logicalWidth(), selectionHeight());
    827     FloatRect textRect(paintOffset.x() + x(), rootRect.y(), logicalWidth(), rootRect.height());
    828 
    829     page->chrome().client().paintCustomHighlight(renderer().textNode(), type, textRect, rootRect, true, false);
    830 }
    831 
    832 #endif
    833810
    834811static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)

  • trunk/Source/WebCore/rendering/InlineTextBox.h

    r163469 r163717  
    166166    void paintDocumentMarkers(GraphicsContext*, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, bool background);
    167167    void paintCompositionUnderline(GraphicsContext*, const FloatPoint& boxOrigin, const CompositionUnderline&);
    168 #if PLATFORM(MAC)
    169     void paintCustomHighlight(const LayoutPoint&, const AtomicString& type);
    170 #endif
    171168
    172169private:

  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r163631 r163717  
    10171017    lineBox->computeOverflow(lineBox->lineTop(), lineBox->lineBottom(), textBoxDataMap);
    10181018   
    1019 #if PLATFORM(MAC)
    1020     // Highlight acts as an overflow inflation.
    1021     if (style().highlight() != nullAtom)
    1022         lineBox->addHighlightOverflow();
    1023 #endif
    10241019    return lineBox;
    10251020}

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r163617 r163717  
    16221622    return false;
    16231623}
    1624 
    1625 #if PLATFORM(MAC)
    1626 
    1627 void RenderBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type, bool behindText)
    1628 {
    1629     Page* page = frame().page();
    1630     if (!page)
    1631         return;
    1632 
    1633     InlineBox* boxWrap = inlineBoxWrapper();
    1634     RootInlineBox* r = boxWrap ? &boxWrap->root() : 0;
    1635     if (r) {
    1636         FloatRect rootRect(paintOffset.x() + r->x(), paintOffset.y() + r->selectionTop(), r->logicalWidth(), r->selectionHeight());
    1637         FloatRect imageRect(paintOffset.x() + x(), rootRect.y(), width(), rootRect.height());
    1638         page->chrome().client().paintCustomHighlight(element(), type, imageRect, rootRect, behindText, false);
    1639     } else {
    1640         FloatRect imageRect(paintOffset.x() + x(), paintOffset.y() + y(), width(), height());
    1641         page->chrome().client().paintCustomHighlight(element(), type, imageRect, imageRect, behindText, false);
    1642     }
    1643 }
    1644 
    1645 #endif
    16461624
    16471625bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset)

  • trunk/Source/WebCore/rendering/RenderBox.h

    r163427 r163717  
    635635    bool backgroundHasOpaqueTopLayer() const;
    636636
    637 #if PLATFORM(MAC)
    638     void paintCustomHighlight(const LayoutPoint&, const AtomicString& type, bool behindText);
    639 #endif
    640 
    641637    void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = 0) const;
    642638

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r163440 r163717  
    464464        }
    465465
    466 #if PLATFORM(MAC)
    467         if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
    468             paintCustomHighlight(toPoint(paintOffset - location()), style().highlight(), true);
    469 #endif
    470 
    471466        LayoutRect contentRect = contentBoxRect();
    472467        contentRect.moveBy(paintOffset);

  • trunk/Source/WebCore/rendering/RenderListMarker.cpp

    r161851 r163717  
    11971197
    11981198    if (isImage()) {
    1199 #if PLATFORM(MAC)
    1200         if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
    1201             paintCustomHighlight(paintOffset, style().highlight(), true);
    1202 #endif
    12031199        context->drawImage(m_image->image(this, marker.size()).get(), style().colorSpace(), marker);
    12041200        if (selectionState() != SelectionNone) {
    … …  
    12091205        return;
    12101206    }
    1211 
    1212 #if PLATFORM(MAC)
    1213     // FIXME: paint gap between marker and list item proper
    1214     if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
    1215         paintCustomHighlight(paintOffset, style().highlight(), true);
    1216 #endif
    12171207
    12181208    if (selectionState() != SelectionNone) {

  • trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp

    r162356 r163717  
    124124
    125125    GraphicsContext* context = paintInfo.context;
    126 #if PLATFORM(MAC)
    127     if (style().highlight() != nullAtom && !context->paintingDisabled())
    128         paintCustomHighlight(toPoint(paintOffset - location()), style().highlight(), true);
    129 #endif
    130126
    131127    LayoutSize contentSize(cWidth, cHeight);

  • trunk/Source/WebCore/rendering/RenderWidget.cpp

    r163079 r163717  
    269269        return;
    270270
    271 #if PLATFORM(MAC)
    272     if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
    273         paintCustomHighlight(paintOffset, style().highlight(), true);
    274 #endif
    275 
    276271    if (style().hasBorderRadius()) {
    277272        LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());

  • trunk/Source/WebCore/rendering/RootInlineBox.cpp

    r163440 r163717  
    169169}
    170170
    171 #if PLATFORM(MAC)
    172 
    173 void RootInlineBox::addHighlightOverflow()
    174 {
    175     Page* page = renderer().frame().page();
    176     if (!page)
    177         return;
    178 
    179     // Highlight acts as a selection inflation.
    180     FloatRect rootRect(0, selectionTop(), logicalWidth(), selectionHeight());
    181     IntRect inflatedRect = enclosingIntRect(page->chrome().client().customHighlightRect(renderer().element(), renderer().style().highlight(), rootRect));
    182     setOverflowFromLogicalRects(inflatedRect, inflatedRect, lineTop(), lineBottom());
    183 }
    184 
    185 void RootInlineBox::paintCustomHighlight(PaintInfo& paintInfo, const LayoutPoint& paintOffset, const AtomicString& highlightType)
    186 {
    187     if (!paintInfo.shouldPaintWithinRoot(renderer()) || renderer().style().visibility() != VISIBLE || paintInfo.phase != PaintPhaseForeground)
    188         return;
    189 
    190     Page* page = renderer().frame().page();
    191     if (!page)
    192         return;
    193 
    194     // Get the inflated rect so that we can properly hit test.
    195     FloatRect rootRect(paintOffset.x() + x(), paintOffset.y() + selectionTop(), logicalWidth(), selectionHeight());
    196     FloatRect inflatedRect = page->chrome().client().customHighlightRect(renderer().element(), highlightType, rootRect);
    197     if (inflatedRect.intersects(paintInfo.rect))
    198         page->chrome().client().paintCustomHighlight(renderer().element(), highlightType, rootRect, rootRect, false, true);
    199 }
    200 
    201 #endif
    202 
    203171void RootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
    204172{
    … …  
    209177    InlineFlowBox::paint(paintInfo, paintOffset, lineTop, lineBottom);
    210178    paintEllipsisBox(paintInfo, paintOffset, lineTop, lineBottom);
    211 #if PLATFORM(MAC)
    212     const RenderStyle& lineStyle = this->lineStyle();
    213     if (lineStyle.highlight() != nullAtom && !paintInfo.context->paintingDisabled())
    214         paintCustomHighlight(paintInfo, paintOffset, lineStyle.highlight());
    215 #endif
    216179}
    217180

  • trunk/Source/WebCore/rendering/RootInlineBox.h

    r162579 r163717  
    118118    virtual int baselinePosition(FontBaseline baselineType) const override final;
    119119    virtual LayoutUnit lineHeight() const override final;
    120 
    121 #if PLATFORM(MAC)
    122     void addHighlightOverflow();
    123     void paintCustomHighlight(PaintInfo&, const LayoutPoint&, const AtomicString& highlightType);
    124 #endif
    125120
    126121    virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r163440 r163717  
    482482
    483483    if (rareInheritedData.get() != other->rareInheritedData.get()) {
    484         if (rareInheritedData->highlight != other->rareInheritedData->highlight
    485             || rareInheritedData->indent != other->rareInheritedData->indent
     484        if (rareInheritedData->indent != other->rareInheritedData->indent
    486485#if ENABLE(CSS3_TEXT)
    487486            || rareInheritedData->m_textAlignLast != other->rareInheritedData->m_textAlignLast

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r163440 r163717  
    815815    ENBSPMode nbspMode() const { return static_cast<ENBSPMode>(rareInheritedData->nbspMode); }
    816816    LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedData->lineBreak); }
    817     const AtomicString& highlight() const { return rareInheritedData->highlight; }
    818817    Hyphens hyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }
    819818    short hyphenationLimitBefore() const { return rareInheritedData->hyphenationLimitBefore; }
    … …  
    13341333    void setNBSPMode(ENBSPMode b) { SET_VAR(rareInheritedData, nbspMode, b); }
    13351334    void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
    1336     void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }
    13371335    void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
    13381336    void setHyphenationLimitBefore(short limit) { SET_VAR(rareInheritedData, hyphenationLimitBefore, limit); }
    … …  
    17161714    static ENBSPMode initialNBSPMode() { return NBNORMAL; }
    17171715    static LineBreak initialLineBreak() { return LineBreakAuto; }
    1718     static const AtomicString& initialHighlight() { return nullAtom; }
    17191716    static ESpeak initialSpeak() { return SpeakNormal; }
    17201717    static Hyphens initialHyphens() { return HyphensManual; }

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

    r162579 r163717  
    148148    , visitedLinkTextEmphasisColor(o.visitedLinkTextEmphasisColor)
    149149    , textShadow(o.textShadow ? adoptPtr(new ShadowData(*o.textShadow)) : nullptr)
    150     , highlight(o.highlight)
    151150    , cursorData(o.cursorData)
    152151    , indent(o.indent)
    … …  
    262261#endif
    263262        && shadowDataEquivalent(o)
    264         && highlight == o.highlight
    265263        && cursorDataEquivalent(cursorData.get(), o.cursorData.get())
    266264        && indent == o.indent

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

    r162579 r163717  
    7171
    7272    OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing.
    73     AtomicString highlight; // Apple-specific extension for custom highlight rendering.
    7473   
    7574    RefPtr<CursorList> cursorData;

  • trunk/Source/WebInspectorUI/ChangeLog

    r163637 r163717  
     12014-02-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
     4        https://bugs.webkit.org/show_bug.cgi?id=128456
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UserInterface/CSSKeywordCompletions.js: Removed -webkit-highlight.
     9
    1102014-02-07  Brian Burg  <bburg@apple.com>
    211

  • trunk/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js

    r163633 r163717  
    8181    "word-spacing", "word-wrap", "writing-mode", "-webkit-aspect-ratio", "-webkit-border-horizontal-spacing",
    8282    "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "-webkit-font-feature-settings",
    83     "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures", "-webkit-highlight",
     83    "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures",
    8484    "-webkit-hyphenate-character", "-webkit-hyphenate-limit-after", "-webkit-hyphenate-limit-before",
    8585    "-webkit-hyphenate-limit-lines", "-webkit-hyphens", "-webkit-line-align", "-webkit-line-box-contain",
    … …  
    851851        "auto", "calc()", "-webkit-calc()"
    852852    ],
    853     "-webkit-highlight": [
    854         "none"
    855     ],
    856853    "-webkit-hyphenate-character": [
    857854        "none"

  • trunk/Source/WebKit/mac/ChangeLog

    r163715 r163717  
     12014-02-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
     4        https://bugs.webkit.org/show_bug.cgi?id=128456
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebCoreSupport/WebChromeClient.h:
     9        * WebCoreSupport/WebChromeClient.mm: Removed customHighlightRect and paintCustomHighlight.
     10        * WebView/WebHTMLView.mm:
     11        (-[WebHTMLViewPrivate dealloc]): Removed highlighters ivar.
     12        (-[WebHTMLViewPrivate clear]): Ditto.
     13        * WebView/WebHTMLViewInternal.h: Removed declaration.
     14        * WebView/WebHTMLViewPrivate.h: Removed WebHTMLHighlighter protocol and method declarations.
     15
    1162014-02-08  Dan Bernstein  <mitz@apple.com>
    217

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r163568 r163717  
    135135#endif
    136136
    137     virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) override;
    138     virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) override;
    139 
    140137#if ENABLE(INPUT_TYPE_COLOR)
    141138    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r163568 r163717  
    740740#endif
    741741
    742 FloatRect WebChromeClient::customHighlightRect(Node* node, const AtomicString& type, const FloatRect& lineRect)
    743 {
    744     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    745 
    746     NSView *documentView = [[kit(node->document().frame()) frameView] documentView];
    747     if (![documentView isKindOfClass:[WebHTMLView class]])
    748         return NSZeroRect;
    749 
    750     WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
    751     id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
    752     return [highlighter highlightRectForLine:lineRect representedNode:kit(node)];
    753 
    754     END_BLOCK_OBJC_EXCEPTIONS;
    755 
    756     return NSZeroRect;
    757 }
    758 
    759 void WebChromeClient::paintCustomHighlight(Node* node, const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect,
    760     bool behindText, bool entireLine)
    761 {
    762     BEGIN_BLOCK_OBJC_EXCEPTIONS;
    763 
    764     NSView *documentView = [[kit(node->document().frame()) frameView] documentView];
    765     if (![documentView isKindOfClass:[WebHTMLView class]])
    766         return;
    767 
    768     WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
    769     id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
    770     [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:behindText entireLine:entireLine representedNode:kit(node)];
    771 
    772     END_BLOCK_OBJC_EXCEPTIONS;
    773 }
    774 
    775742#if ENABLE(INPUT_TYPE_COLOR)
    776743PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)

  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r163232 r163717  
    595595    NSArray *pageRects;
    596596
    597     NSMutableDictionary *highlighters;
    598 
    599    
    600597#if !PLATFORM(IOS)
    601598    WebTextCompletionController *completionController;
    … …  
    693690#endif
    694691    [dataSource release];
    695     [highlighters release];
    696692#if !PLATFORM(IOS)
    697693    [trackingAreaForNonKeyWindow release];
    … …  
    732728#endif
    733729    [dataSource release];
    734     [highlighters release];
    735730#if !PLATFORM(IOS)
    736731    [trackingAreaForNonKeyWindow release];
    … …  
    747742#endif
    748743    dataSource = nil;
    749     highlighters = nil;
    750744#if !PLATFORM(IOS)
    751745    trackingAreaForNonKeyWindow = nil;
    … …  
    20872081    if (coreFrame)
    20882082        coreFrame->editor().decreaseSelectionListLevel();
    2089 }
    2090 
    2091 - (void)_setHighlighter:(id<WebHTMLHighlighter>)highlighter ofType:(NSString*)type
    2092 {
    2093     if (!_private->highlighters)
    2094         _private->highlighters = [[NSMutableDictionary alloc] init];
    2095     [_private->highlighters setObject:highlighter forKey:type];
    2096 }
    2097 
    2098 - (void)_removeHighlighterOfType:(NSString*)type
    2099 {
    2100     [_private->highlighters removeObjectForKey:type];
    21012083}
    21022084
    … …  
    55385520#endif
    55395521
    5540 - (id<WebHTMLHighlighter>)_highlighterForType:(NSString*)type
    5541 {
    5542     return [_private->highlighters objectForKey:type];
    5543 }
    5544 
    55455522- (WebFrame *)_frame
    55465523{

  • trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h

    r163079 r163717  
    4646- (BOOL)_canSmartCopyOrDelete;
    4747
    48 - (id <WebHTMLHighlighter>)_highlighterForType:(NSString*)type;
    4948- (WebFrame *)_frame;
    5049#if !PLATFORM(IOS)

  • trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h

    r160622 r163717  
    3939@class DOMRange;
    4040@class WebPluginController;
    41 
    42 @protocol WebHTMLHighlighter
    43 - (NSRect)highlightRectForLine:(NSRect)lineRect representedNode:(DOMNode *)node;
    44 - (void)paintHighlightForBox:(NSRect)boxRect onLine:(NSRect)lineRect behindText:(BOOL)text entireLine:(BOOL)line representedNode:(DOMNode *)node;
    45 @end
    4641
    4742extern const float _WebHTMLViewPrintingMinimumShrinkFactor;
    … …  
    119114- (DOMNode *)_increaseSelectionListLevelUnordered;
    120115- (void)_decreaseSelectionListLevel;
    121 - (void)_setHighlighter:(id <WebHTMLHighlighter>)highlighter ofType:(NSString *)type;
    122 - (void)_removeHighlighterOfType:(NSString *)type;
    123116- (DOMDocumentFragment *)_documentFragmentFromPasteboard:(NSPasteboard *)pasteboard forType:(NSString *)pboardType inContext:(DOMRange *)context subresources:(NSArray **)subresources;
    124117#endif

  • trunk/Source/WebKit2/ChangeLog

    r163712 r163717  
     12014-02-08  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
     4        https://bugs.webkit.org/show_bug.cgi?id=128456
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebProcess/WebCoreSupport/WebChromeClient.cpp: Removed customHighlightRect and
     9        paintCustomHighlight.
     10        * WebProcess/WebCoreSupport/WebChromeClient.h:
     11
    1122014-02-08  Darin Adler  <darin@apple.com>
    213

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r163676 r163717  
    664664}
    665665
    666 FloatRect WebChromeClient::customHighlightRect(Node*, const AtomicString& /*type*/, const FloatRect& /*lineRect*/)
    667 {
    668     notImplemented();
    669     return FloatRect();
    670 }
    671 
    672 void WebChromeClient::paintCustomHighlight(Node*, const AtomicString& /*type*/, const FloatRect& /*boxRect*/, const FloatRect& /*lineRect*/,
    673                                            bool /*behindText*/, bool /*entireLine*/)
    674 {
    675     notImplemented();
    676 }
    677 
    678666bool WebChromeClient::shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename)
    679667{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r163600 r163717  
    145145    virtual void populateVisitedLinks() override;
    146146   
    147     virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) override;
    148     virtual void paintCustomHighlight(WebCore::Node*, const AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,
    149         bool behindText, bool entireLine) override;
    150    
    151147    virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) override;
    152148    virtual String generateReplacementFile(const String& path) override;
Note: See TracChangeset for help on using the changeset viewer.