Changeset 72162 in webkit


Ignore:
Timestamp:
Nov 16, 2010 7:13:27 PM (13 years ago)
Author:
weinig@apple.com
Message:

WebKit2: Support enabling site-specific quirks
<rdar://problem/8451371>
​https://bugs.webkit.org/show_bug.cgi?id=46076

Reviewed by Adam Roben.

  • Shared/WebPreferencesStore.cpp:

(WebKit::WebPreferencesStore::WebPreferencesStore):
(WebKit::WebPreferencesStore::encode):
(WebKit::WebPreferencesStore::decode):

  • Shared/WebPreferencesStore.h:

Add needsSiteSpecificQuirks;

  • UIProcess/API/C/WKAPICast.h:

(WebKit::toFontSmoothingLevel):
(WebKit::toAPI):
Move FontSmoothing conversion functions here.

  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetFontSmoothingLevel):
(WKPreferencesGetFontSmoothingLevel):
(WKPreferencesSetAcceleratedCompositingEnabled):
(WKPreferencesGetAcceleratedCompositingEnabled):
(WKPreferencesSetCompositingBordersVisible):
(WKPreferencesGetCompositingBordersVisible):
(WKPreferencesSetCompositingRepaintCountersVisible):
(WKPreferencesGetCompositingRepaintCountersVisible):
(WKPreferencesSetNeedsSiteSpecificQuirks):
(WKPreferencesGetNeedsSiteSpecificQuirks):
Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks
and move implementations from WKPreferencesPrivate.cpp here.

  • UIProcess/API/C/WKPreferencesPrivate.cpp: Removed.
  • UIProcess/API/C/WKPreferencesPrivate.h:

Add Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks.

  • UIProcess/WebPreferences.cpp:

(WebKit::WebPreferences::setNeedsSiteSpecificQuirks):
(WebKit::WebPreferences::needsSiteSpecificQuirks):

  • UIProcess/WebPreferences.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):
Pipe through needsSiteSpecificQuirks.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebKit2.pro:
  • win/WebKit2.vcproj:

Update for removed files.

Location:
trunk/WebKit2
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r72155 r72162  
     12010-11-16  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        WebKit2: Support enabling site-specific quirks
     6        <rdar://problem/8451371>
     7        https://bugs.webkit.org/show_bug.cgi?id=46076
     8
     9        * Shared/WebPreferencesStore.cpp:
     10        (WebKit::WebPreferencesStore::WebPreferencesStore):
     11        (WebKit::WebPreferencesStore::encode):
     12        (WebKit::WebPreferencesStore::decode):
     13        * Shared/WebPreferencesStore.h:
     14        Add needsSiteSpecificQuirks;
     15
     16        * UIProcess/API/C/WKAPICast.h:
     17        (WebKit::toFontSmoothingLevel):
     18        (WebKit::toAPI):
     19        Move FontSmoothing conversion functions here.
     20
     21        * UIProcess/API/C/WKPreferences.cpp:
     22        (WKPreferencesSetFontSmoothingLevel):
     23        (WKPreferencesGetFontSmoothingLevel):
     24        (WKPreferencesSetAcceleratedCompositingEnabled):
     25        (WKPreferencesGetAcceleratedCompositingEnabled):
     26        (WKPreferencesSetCompositingBordersVisible):
     27        (WKPreferencesGetCompositingBordersVisible):
     28        (WKPreferencesSetCompositingRepaintCountersVisible):
     29        (WKPreferencesGetCompositingRepaintCountersVisible):
     30        (WKPreferencesSetNeedsSiteSpecificQuirks):
     31        (WKPreferencesGetNeedsSiteSpecificQuirks):
     32        Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks
     33        and move implementations from WKPreferencesPrivate.cpp here.
     34
     35        * UIProcess/API/C/WKPreferencesPrivate.cpp: Removed.
     36
     37        * UIProcess/API/C/WKPreferencesPrivate.h:
     38        Add Add WKPreferencesSetNeedsSiteSpecificQuirks/WKPreferencesGetNeedsSiteSpecificQuirks.
     39
     40        * UIProcess/WebPreferences.cpp:
     41        (WebKit::WebPreferences::setNeedsSiteSpecificQuirks):
     42        (WebKit::WebPreferences::needsSiteSpecificQuirks):
     43        * UIProcess/WebPreferences.h:
     44        * WebProcess/WebPage/WebPage.cpp:
     45        (WebKit::WebPage::updatePreferences):
     46        Pipe through needsSiteSpecificQuirks.
     47
     48        * WebKit2.xcodeproj/project.pbxproj:
     49        * WebKit2.pro:
     50        * win/WebKit2.vcproj:
     51        Update for removed files.
     52
    1532010-11-16  Adam Roben  <aroben@apple.com>
    254

  • trunk/WebKit2/Shared/WebPreferencesStore.cpp

    r72141 r72162  
    4242    , xssAuditorEnabled(true)
    4343    , frameFlatteningEnabled(false)
     44    , developerExtrasEnabled(false)
     45    , privateBrowsingEnabled(false)
     46    , needsSiteSpecificQuirks(false)
    4447    , acceleratedCompositingEnabled(true)
    4548    , compositingBordersVisible(false)
    4649    , compositingRepaintCountersVisible(false)
    47     , privateBrowsingEnabled(false)
    48     , developerExtrasEnabled(false)
    4950    , fontSmoothingLevel(FontSmoothingLevelMedium)
    5051    , minimumFontSize(0)
    … …  
    9697    encoder->encode(compositingBordersVisible);
    9798    encoder->encode(compositingRepaintCountersVisible);
     99    encoder->encode(needsSiteSpecificQuirks);
    98100}
    99101
    … …  
    148150    if (!decoder->decode(s.compositingRepaintCountersVisible))
    149151        return false;
     152    if (!decoder->decode(s.needsSiteSpecificQuirks))
     153        return false;
    150154
    151155    if (hasXSSAuditorEnabledTestRunnerOverride)

  • trunk/WebKit2/Shared/WebPreferencesStore.h

    r70680 r72162  
    5151    bool xssAuditorEnabled;
    5252    bool frameFlatteningEnabled;
    53 
     53    bool developerExtrasEnabled;
     54    bool privateBrowsingEnabled;
     55    bool needsSiteSpecificQuirks;
    5456    bool acceleratedCompositingEnabled;
    5557    bool compositingBordersVisible;
    5658    bool compositingRepaintCountersVisible;
    57 
    58     bool privateBrowsingEnabled;
    59 
    60     bool developerExtrasEnabled;
    61 
    6259    uint32_t fontSmoothingLevel;
    63 
    6460    uint32_t minimumFontSize;
    6561    uint32_t minimumLogicalFontSize;

  • trunk/WebKit2/UIProcess/API/C/WKAPICast.h

    r71591 r72162  
    2929#include "CacheModel.h"
    3030#include "FindOptions.h"
     31#include "FontSmoothingLevel.h"
    3132#include "WKContext.h"
    3233#include "WKPage.h"
     34#include "WKPreferencesPrivate.h"
    3335#include "WKSharedAPICast.h"
    3436#include <WebCore/FrameLoaderTypes.h>
    … …  
    150152}
    151153
     154inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
     155{
     156    switch (wkLevel) {
     157    case kWKFontSmoothingLevelNoSubpixelAntiAliasing:
     158        return FontSmoothingLevelNoSubpixelAntiAliasing;
     159    case kWKFontSmoothingLevelLight:
     160        return FontSmoothingLevelLight;
     161    case kWKFontSmoothingLevelMedium:
     162        return FontSmoothingLevelMedium;
     163    case kWKFontSmoothingLevelStrong:
     164        return FontSmoothingLevelStrong;
     165#if PLATFORM(WIN)
     166    case kWKFontSmoothingLevelWindows:
     167        return FontSmoothingLevelWindows;
     168#endif
     169    }
     170
     171    ASSERT_NOT_REACHED();
     172    return FontSmoothingLevelMedium;
     173}
     174
     175
     176inline WKFontSmoothingLevel toAPI(FontSmoothingLevel level)
     177{
     178    switch (level) {
     179    case FontSmoothingLevelNoSubpixelAntiAliasing:
     180        return kWKFontSmoothingLevelNoSubpixelAntiAliasing;
     181    case FontSmoothingLevelLight:
     182        return kWKFontSmoothingLevelLight;
     183    case FontSmoothingLevelMedium:
     184        return kWKFontSmoothingLevelMedium;
     185    case FontSmoothingLevelStrong:
     186        return kWKFontSmoothingLevelStrong;
     187#if PLATFORM(WIN)
     188    case FontSmoothingLevelWindows:
     189        return kWKFontSmoothingLevelWindows;
     190#endif
     191    }
     192
     193    ASSERT_NOT_REACHED();
     194    return kWKFontSmoothingLevelMedium;
     195}
     196
    152197} // namespace WebKit
    153198

  • trunk/WebKit2/UIProcess/API/C/WKPreferences.cpp

    r71048 r72162  
    2525
    2626#include "WKPreferences.h"
     27#include "WKPreferencesPrivate.h"
    2728
    2829#include "WKAPICast.h"
    … …  
    219220    return toImpl(preferencesRef)->developerExtrasEnabled();
    220221}
     222
     223void WKPreferencesSetFontSmoothingLevel(WKPreferencesRef preferencesRef, WKFontSmoothingLevel wkLevel)
     224{
     225    toImpl(preferencesRef)->setFontSmoothingLevel(toFontSmoothingLevel(wkLevel));
     226}
     227
     228WKFontSmoothingLevel WKPreferencesGetFontSmoothingLevel(WKPreferencesRef preferencesRef)
     229{
     230    return toAPI(toImpl(preferencesRef)->fontSmoothingLevel());
     231}
     232
     233void WKPreferencesSetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef, bool flag)
     234{
     235    toImpl(preferencesRef)->setAcceleratedCompositingEnabled(flag);
     236}
     237
     238bool WKPreferencesGetAcceleratedCompositingEnabled(WKPreferencesRef preferencesRef)
     239{
     240    return toImpl(preferencesRef)->acceleratedCompositingEnabled();
     241}
     242
     243void WKPreferencesSetCompositingBordersVisible(WKPreferencesRef preferencesRef, bool flag)
     244{
     245    toImpl(preferencesRef)->setCompositingBordersVisible(flag);
     246}
     247
     248bool WKPreferencesGetCompositingBordersVisible(WKPreferencesRef preferencesRef)
     249{
     250    return toImpl(preferencesRef)->compositingBordersVisible();
     251}
     252
     253void WKPreferencesSetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef, bool flag)
     254{
     255    toImpl(preferencesRef)->setCompositingRepaintCountersVisible(flag);
     256}
     257
     258bool WKPreferencesGetCompositingRepaintCountersVisible(WKPreferencesRef preferencesRef)
     259{
     260    return toImpl(preferencesRef)->compositingRepaintCountersVisible();
     261}
     262
     263void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef, bool flag)
     264{
     265    toImpl(preferencesRef)->setNeedsSiteSpecificQuirks(flag);
     266}
     267
     268bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef)
     269{
     270    return toImpl(preferencesRef)->needsSiteSpecificQuirks();
     271}

  • trunk/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h

    r69826 r72162  
    6060WK_EXPORT bool WKPreferencesGetCompositingRepaintCountersVisible(WKPreferencesRef);
    6161
     62// Defaults to false.
     63WK_EXPORT void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef, bool);
     64WK_EXPORT bool WKPreferencesGetNeedsSiteSpecificQuirks(WKPreferencesRef);
     65
    6266#ifdef __cplusplus
    6367}

  • trunk/WebKit2/UIProcess/WebPreferences.cpp

    r71048 r72162  
    153153}
    154154
     155void WebPreferences::setNeedsSiteSpecificQuirks(bool b)
     156{
     157    m_store.needsSiteSpecificQuirks = b;
     158    update();
     159}
     160
     161bool WebPreferences::needsSiteSpecificQuirks() const
     162{
     163    return m_store.needsSiteSpecificQuirks;
     164}
     165
    155166void WebPreferences::setPluginsEnabled(bool b)
    156167{

  • trunk/WebKit2/UIProcess/WebPreferences.h

    r71048 r72162  
    123123    bool developerExtrasEnabled() const;
    124124
     125    void setNeedsSiteSpecificQuirks(bool);
     126    bool needsSiteSpecificQuirks() const;
     127
    125128private:
    126129    WebPreferences();

  • trunk/WebKit2/WebKit2.pro

    r72074 r72162  
    443443    UIProcess/API/C/WKPageNamespace.cpp \
    444444    UIProcess/API/C/WKPreferences.cpp \
    445     UIProcess/API/C/WKPreferencesPrivate.cpp \
    446445    UIProcess/API/cpp/qt/WKStringQt.cpp \
    447446    UIProcess/API/cpp/qt/WKURLQt.cpp \

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r72024 r72162  
    218218                6D8A91A611F0EFD100DD01FE /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = 6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb */; };
    219219                762B748D120BC75C00819339 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    220                 762B74AF120BC94F00819339 /* WKPreferencesPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */; };
    221220                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
    222221                8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
    … …  
    786785                762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };
    787786                762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
    788                 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPreferencesPrivate.cpp; sourceTree = "<group>"; };
    789787                8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    790788                8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    17541752                                BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */,
    17551753                                BCD597CE112B56AC00EC8C23 /* WKPreferences.h */,
    1756                                 762B749D120BC8EA00819339 /* WKPreferencesPrivate.cpp */,
    17571754                                762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */,
    17581755                        );
    … …  
    26302627                                BCEE98CC1133174C006BCC24 /* WKPageNamespace.cpp in Sources */,
    26312628                                BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */,
    2632                                 762B74AF120BC94F00819339 /* WKPreferencesPrivate.cpp in Sources */,
    26332629                                BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
    26342630                                BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r72100 r72162  
    864864    settings->setPrivateBrowsingEnabled(store.privateBrowsingEnabled);
    865865    settings->setDeveloperExtrasEnabled(store.developerExtrasEnabled);
     866    settings->setNeedsSiteSpecificQuirks(store.needsSiteSpecificQuirks);
    866867    settings->setMinimumFontSize(store.minimumFontSize);
    867868    settings->setMinimumLogicalFontSize(store.minimumLogicalFontSize);

  • trunk/WebKit2/win/WebKit2.vcproj

    r72152 r72162  
    21492149                                        </File>
    21502150                                        <File
    2151                                                 RelativePath="..\UIProcess\API\C\WKPreferencesPrivate.cpp"
    2152                                                 >
    2153                                         </File>
    2154                                         <File
    21552151                                                RelativePath="..\UIProcess\API\C\WKPreferencesPrivate.h"
    21562152                                                >
Note: See TracChangeset for help on using the changeset viewer.