[Mac] Disable QTKit by default on future OS X.

• Component: New Bugs
• Status: RESOLVED FIXED

[Jer Noble]

[Mac] Disable QTKit by default on future OS X.

[Jer Noble]

Created attachment 251389 [details]
Patch

[Darin Adler]

Comment on attachment 251389 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=251389&action=review

Can we find a way to not have this in three different places!?

> Source/WTF/wtf/Platform.h:1007
> +#define WTF_USE_QTKIT 1

This is a strange use of USE(QTKIT). If it’s false, then you default to not using QTKit, but can turn it on at runtime. That’s not normally what our USE macros mean.

> Source/WebCore/page/Settings.cpp:80
> -#if PLATFORM(COCOA)
> +#if USE(QTKIT)
>  bool Settings::gQTKitEnabled = true;
> +#else
> +bool Settings::gQTKitEnabled = false;
>  #endif

Still need to wrap this in #if PLATFORM(COCOA)

[Jer Noble]

(In reply to comment #2)
> Comment on attachment 251389 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=251389&action=review
> 
> Can we find a way to not have this in three different places!?

I'd love to, but WebCore, WebKit, and WebKit2 each have their own definitions for their respective default settings. 

> > Source/WTF/wtf/Platform.h:1007
> > +#define WTF_USE_QTKIT 1
> 
> This is a strange use of USE(QTKIT). If it’s false, then you default to not
> using QTKit, but can turn it on at runtime. That’s not normally what our USE
> macros mean.

I realize; this is just the first step. The next step is to actually disable the implementation. 

Meanwhile, having this USE macro means not having to repeat the same platform macro everywhere in each of the settings defaults.  I'm open to other ideas though. 

> > Source/WebCore/page/Settings.cpp:80
> > -#if PLATFORM(COCOA)
> > +#if USE(QTKIT)
> >  bool Settings::gQTKitEnabled = true;
> > +#else
> > +bool Settings::gQTKitEnabled = false;
> >  #endif
> 
> Still need to wrap this in #if PLATFORM(COCOA)

Oh, good point.

[Jer Noble]

Created attachment 251454 [details]
Patch for landing

Got rid of WTF_USE_WEBKIT and managed to have the WebKit and WebKit2 preference defaults derived from the WebCore ones.

[Jer Noble]

Created attachment 251455 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 251455 [details]
Patch for landing

Clearing flags on attachment: 251455

Committed r183221: <http://trac.webkit.org/changeset/183221>

[Jon Lee]

rdar://problem/20314926

[Alexey Proskuryakov]

As discussed in person, we probably need more tests updated, see <rdar://problem/20527672>.