Changeset 78800 in webkit


Ignore:
Timestamp:
Feb 17, 2011 1:35:59 AM (13 years ago)
Author:
alex
Message:

2011-02-17 Alejandro G. Castro <alex@igalia.com>

Reviewed by Martin Robinson.

[GTK] Add WKPluginSiteDataManager.cpp compilation after r78647
https://bugs.webkit.org/show_bug.cgi?id=54564

  • GNUmakefile.am: Added files to compilation.
  • Shared/Plugins/Netscape/NetscapePluginModule.h: used npruntime_internal.h in the include to avoid problems with X types.
  • WebProcess/WebProcess.cpp: (WebKit::WebProcess::setAlwaysUsesComplexTextCodePath): fixed ambiguous reference to Font caused by the X headers required by the plugins.
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r78788 r78800  
     12011-02-17  Alejandro G. Castro  <alex@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Add WKPluginSiteDataManager.cpp compilation after r78647
     6        https://bugs.webkit.org/show_bug.cgi?id=54564
     7
     8        * GNUmakefile.am: Added files to compilation.
     9        * Shared/Plugins/Netscape/NetscapePluginModule.h: used
     10        npruntime_internal.h in the include to avoid problems with X
     11        types.
     12        * WebProcess/WebProcess.cpp:
     13        (WebKit::WebProcess::setAlwaysUsesComplexTextCodePath): fixed
     14        ambiguous reference to Font caused by the X headers required by
     15        the plugins.
     16
    1172011-02-16  Matthew Delaney  <mdelaney@apple.com>
    218
  • trunk/Source/WebKit2/GNUmakefile.am

    r78350 r78800  
    6060        $(WebKit2)/UIProcess/API/C/WKPage.h \
    6161        $(WebKit2)/UIProcess/API/C/WKPagePrivate.h \
     62        $(WebKit2)/UIProcess/API/C/WKPluginSiteDataManager.h \
    6263        $(WebKit2)/UIProcess/API/C/WKPreferences.h \
    6364        $(WebKit2)/UIProcess/API/C/WKPreferencesPrivate.h \
     
    319320        Source/WebKit2/UIProcess/API/C/WKPage.h \
    320321        Source/WebKit2/UIProcess/API/C/WKPagePrivate.h \
     322        Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h \
     323        Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp \
    321324        Source/WebKit2/UIProcess/API/C/WKPreferences.cpp \
    322325        Source/WebKit2/UIProcess/API/C/WKPreferences.h \
     
    368371        Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp \
    369372        Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h \
     373        Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h \
     374        Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp \
    370375        Source/WebKit2/UIProcess/ProcessModel.h \
    371376        Source/WebKit2/UIProcess/ResponsivenessTimer.cpp \
  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h

    r78611 r78800  
    2929#include "Module.h"
    3030#include "PluginQuirks.h"
    31 #include <WebCore/npfunctions.h>
     31#include <WebCore/npruntime_internal.h>
    3232#include <wtf/RefCounted.h>
    3333#include <wtf/text/WTFString.h>
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r78676 r78800  
    227227void WebProcess::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
    228228{
    229     Font::setCodePath(alwaysUseComplexText ? Font::Complex : Font::Auto);
     229    WebCore::Font::setCodePath(alwaysUseComplexText ? WebCore::Font::Complex : WebCore::Font::Auto);
    230230}
    231231
Note: See TracChangeset for help on using the changeset viewer.