Changeset 178520 in webkit


Ignore:
Timestamp:
Jan 15, 2015 11:41:40 AM (9 years ago)
Author:
Antti Koivisto
Message:

Try to fix windows build.

  • platform/graphics/ca/win/PlatformCALayerWin.cpp:
  • platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:

(PlatformCALayerWinInternal::displayCallback):

  • platform/win/DragImageWin.cpp:

(WebCore::dragLabelFont):
(WebCore::createDragImageForLink):

  • platform/win/PopupMenuWin.cpp:

(WebCore::PopupMenuWin::calculatePositionAndSize):
(WebCore::PopupMenuWin::paint):

  • platform/win/WebCoreTextRenderer.cpp:

(WebCore::doDrawTextAtPoint):
(WebCore::WebCoreDrawDoubledTextAtPoint):
(WebCore::WebCoreTextFloatWidth):
(WebCore::WebCoreSetAlwaysUsesComplexTextCodePath):
(WebCore::WebCoreAlwaysUsesComplexTextCodePath):

  • rendering/RenderThemeSafari.cpp:

(WebCore::RenderThemeSafari::setFontFromControlSize):

Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r178519 r178520  
     12015-01-15  Antti Koivisto  <antti@apple.com>
     2
     3        Try to fix windows build.
     4
     5        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     6        * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
     7        (PlatformCALayerWinInternal::displayCallback):
     8        * platform/win/DragImageWin.cpp:
     9        (WebCore::dragLabelFont):
     10        (WebCore::createDragImageForLink):
     11        * platform/win/PopupMenuWin.cpp:
     12        (WebCore::PopupMenuWin::calculatePositionAndSize):
     13        (WebCore::PopupMenuWin::paint):
     14        * platform/win/WebCoreTextRenderer.cpp:
     15        (WebCore::doDrawTextAtPoint):
     16        (WebCore::WebCoreDrawDoubledTextAtPoint):
     17        (WebCore::WebCoreTextFloatWidth):
     18        (WebCore::WebCoreSetAlwaysUsesComplexTextCodePath):
     19        (WebCore::WebCoreAlwaysUsesComplexTextCodePath):
     20        * rendering/RenderThemeSafari.cpp:
     21        (WebCore::RenderThemeSafari::setFontFromControlSize):
     22
    1232015-01-15  Antti Koivisto  <antti@apple.com>
    224

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r178519 r178520  
    2929
    3030#include "AbstractCACFLayerTreeHost.h"
    31 #include "Font.h"
     31#include "FontCascade.h"
    3232#include "GraphicsContext.h"
    3333#include "PlatformCAAnimationWin.h"

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp

    r178519 r178520  
    2828#include "PlatformCALayerWinInternal.h"
    2929
    30 #include "Font.h"
     30#include "FontCascade.h"
    3131#include "GraphicsContext.h"
    3232#include "PlatformCALayer.h"
    … …  
    160160        desc.setComputedSize(18);
    161161       
    162         Font font = Font(desc, 0, 0);
     162        FontCascade font = FontCascade(desc, 0, 0);
    163163        font.update(0);
    164164

  • trunk/Source/WebCore/platform/win/DragImageWin.cpp

    r178519 r178520  
    2828
    2929#include "FloatRoundedRect.h"
    30 #include "Font.h"
     30#include "FontCascade.h"
    3131#include "FontDescription.h"
    3232#include "FontSelector.h"
    … …  
    102102const float DragLinkUrlFontSize = 10;
    103103
    104 static Font dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
    105 {
    106     Font result;
     104static FontCascade dragLabelFont(int size, bool bold, FontRenderingMode renderingMode)
     105{
     106    FontCascade result;
    107107    NONCLIENTMETRICS metrics;
    108108    metrics.cbSize = sizeof(metrics);
    … …  
    115115    description.setComputedSize((float)size);
    116116    description.setRenderingMode(renderingMode);
    117     result = Font(description, 0, 0);
     117    result = FontCascade(description, 0, 0);
    118118    result.update(0);
    119119    return result;
    … …  
    124124    // This is more or less an exact match for the Mac OS X code.
    125125
    126     const Font* labelFont;
    127     const Font* urlFont;
     126    const FontCascade* labelFont;
     127    const FontCascade* urlFont;
    128128
    129129    if (fontRenderingMode == AlternateRenderingMode) {

  • trunk/Source/WebCore/platform/win/PopupMenuWin.cpp

    r178519 r178520  
    336336            continue;
    337337
    338         Font itemFont = client()->menuStyle().font();
     338        FontCascade itemFont = client()->menuStyle().font();
    339339        if (client()->itemIsLabel(i)) {
    340340            FontDescription d = itemFont.fontDescription();
    341341            d.setWeight(d.bolderWeight());
    342             itemFont = Font(d, itemFont.letterSpacing(), itemFont.wordSpacing());
     342            itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
    343343            itemFont.update(m_popupClient->fontSelector());
    344344        }
    … …  
    642642        context.setFillColor(optionTextColor, ColorSpaceDeviceRGB);
    643643       
    644         Font itemFont = client()->menuStyle().font();
     644        FontCascade itemFont = client()->menuStyle().font();
    645645        if (client()->itemIsLabel(index)) {
    646646            FontDescription d = itemFont.fontDescription();
    647647            d.setWeight(d.bolderWeight());
    648             itemFont = Font(d, itemFont.letterSpacing(), itemFont.wordSpacing());
     648            itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
    649649            itemFont.update(m_popupClient->fontSelector());
    650650        }

  • trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp

    r178519 r178520  
    2626#include "WebCoreTextRenderer.h"
    2727
    28 #include "Font.h"
     28#include "FontCascade.h"
    2929#include "FontDescription.h"
    3030#include "GraphicsContext.h"
    … …  
    4646}
    4747
    48 static void doDrawTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const Font& font, const Color& color, int underlinedIndex)
     48static void doDrawTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const FontCascade& font, const Color& color, int underlinedIndex)
    4949{
    5050    TextRun run(text);
    … …  
    7777}
    7878
    79 void WebCoreDrawDoubledTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const Font& font, const Color& topColor, const Color& bottomColor, int underlinedIndex)
     79void WebCoreDrawDoubledTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const FontCascade& font, const Color& topColor, const Color& bottomColor, int underlinedIndex)
    8080{
    8181    context.save();
    … …  
    9090}
    9191
    92 float WebCoreTextFloatWidth(const String& text, const Font& font)
     92float WebCoreTextFloatWidth(const String& text, const FontCascade& font)
    9393{
    9494    return StringTruncator::width(text, font, StringTruncator::EnableRoundingHacks);
    … …  
    107107void WebCoreSetAlwaysUsesComplexTextCodePath(bool complex)
    108108{
    109     Font::setCodePath(complex ? Font::Complex : Font::Auto);
     109    Font::setCodePath(complex ? FontCascade::Complex : FontCascade::Auto);
    110110}
    111111
    112112bool WebCoreAlwaysUsesComplexTextCodePath()
    113113{
    114     return Font::codePath() == Font::Complex;
     114    return Font::codePath() == FontCascade::Complex;
    115115}
    116116

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

    r178519 r178520  
    402402
    403403    if (style.setFontDescription(fontDescription))
    404         style.font().update(styleResolver.fontSelector());
     404        style.fontCascade().update(styleResolver.fontSelector());
    405405}
    406406
Note: See TracChangeset for help on using the changeset viewer.