| Differences between
and this patch
- a/Source/WebCore/ChangeLog +29 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2013-02-14  Tony Chang  <tony@chromium.org>
2
3
        Convert 3 settings to use Settings.in
4
        https://bugs.webkit.org/show_bug.cgi?id=109875
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Convert mediaEnabled, applicationChromeMode and DOMPasteAllowed to
9
        use Settings.in. They previously had inconsistently named setters.
10
11
        No new tests, this is a refactoring.
12
13
        * dom/make_names.pl:
14
        (printConstructorInterior): Rename isMediaEnabled to mediaEnabled.
15
        (printWrapperFunctions): Rename isMediaEnabled to mediaEnabled.
16
        * editing/EditorCommand.cpp:
17
        (WebCore::supportedPaste): Rename isDOMPasteAllowed to DOMPasteAllowed.
18
        * page/Settings.cpp:
19
        (WebCore::Settings::Settings): Remove custom code.
20
        * page/Settings.h:
21
        (Settings): Remove custom code.
22
        * page/Settings.in: Add entries for mediaEnabled, applicationChromeMode and DOMPasteAllowed.
23
        * page/make_settings.pl:
24
        (setterFunctionName): Expand uppercase rules to include DOM.
25
        * rendering/RenderTheme.cpp:
26
        (WebCore::RenderTheme::isDefault): Rename inApplicationChromeMode to applicationChromeMode.
27
        * rendering/RenderThemeWin.cpp:
28
        (WebCore::documentIsInApplicationChromeMode): Rename inApplicationChromeMode to applicationChromeMode.
29
1
2013-02-13 Joe Mason <jmason@rim.com>
30
2013-02-13 Joe Mason <jmason@rim.com>
2
31
3
        [BlackBerry] Notify platform layer of failing to get authentication credentials
32
        [BlackBerry] Notify platform layer of failing to get authentication credentials
- a/Source/WebKit/efl/ChangeLog +10 lines
Lines 1-3 a/Source/WebKit/efl/ChangeLog_sec1
1
2013-02-14  Tony Chang  <tony@chromium.org>
2
3
        Convert 3 settings to use Settings.in
4
        https://bugs.webkit.org/show_bug.cgi?id=109875
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * ewk/ewk_view.cpp:
9
        (_ewk_view_priv_new): Rename isDOMPasteAllowed to DOMPasteAllowed.
10
1
2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
11
2013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
2
12
3
        [Qt] window.open passes height and width parameters even if not defined in a page
13
        [Qt] window.open passes height and width parameters even if not defined in a page
- a/Source/WebCore/dom/make_names.pl -3 / +3 lines
Lines 369-375 sub printConstructorInterior a/Source/WebCore/dom/make_names.pl_sec1
369
    if ($enabledTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
369
    if ($enabledTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
370
        print F <<END
370
        print F <<END
371
    Settings* settings = document->settings();
371
    Settings* settings = document->settings();
372
    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
372
    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
373
        return 0;
373
        return 0;
374
    
374
    
375
END
375
END
Lines 1018-1024 sub printWrapperFunctions a/Source/WebCore/dom/make_names.pl_sec2
1018
static JSDOMWrapper* create${JSInterfaceName}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
1018
static JSDOMWrapper* create${JSInterfaceName}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
1019
{
1019
{
1020
    Settings* settings = element->document()->settings();
1020
    Settings* settings = element->document()->settings();
1021
    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
1021
    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
1022
        return CREATE_DOM_WRAPPER(exec, globalObject, $parameters{namespace}Element, element.get());
1022
        return CREATE_DOM_WRAPPER(exec, globalObject, $parameters{namespace}Element, element.get());
1023
    return CREATE_DOM_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get());
1023
    return CREATE_DOM_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get());
1024
}
1024
}
Lines 1069-1075 END a/Source/WebCore/dom/make_names.pl_sec3
1069
static v8::Handle<v8::Object> create${JSInterfaceName}Wrapper($parameters{namespace}Element* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
1069
static v8::Handle<v8::Object> create${JSInterfaceName}Wrapper($parameters{namespace}Element* element, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
1070
{
1070
{
1071
    Settings* settings = element->document()->settings();
1071
    Settings* settings = element->document()->settings();
1072
    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
1072
    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
1073
        return createV8$parameters{namespace}DirectWrapper(element, creationContext, isolate);
1073
        return createV8$parameters{namespace}DirectWrapper(element, creationContext, isolate);
1074
    return wrap(static_cast<${JSInterfaceName}*>(element), creationContext, isolate);
1074
    return wrap(static_cast<${JSInterfaceName}*>(element), creationContext, isolate);
1075
}
1075
}
- a/Source/WebCore/editing/EditorCommand.cpp -1 / +1 lines
Lines 1179-1185 static bool supportedPaste(Frame* frame) a/Source/WebCore/editing/EditorCommand.cpp_sec1
1179
        return false;
1179
        return false;
1180
1180
1181
    Settings* settings = frame->settings();
1181
    Settings* settings = frame->settings();
1182
    bool defaultValue = settings && settings->javaScriptCanAccessClipboard() && settings->isDOMPasteAllowed();
1182
    bool defaultValue = settings && settings->javaScriptCanAccessClipboard() && settings->DOMPasteAllowed();
1183
1183
1184
    EditorClient* client = frame->editor()->client();
1184
    EditorClient* client = frame->editor()->client();
1185
    return client ? client->canPaste(frame, defaultValue) : defaultValue;
1185
    return client ? client->canPaste(frame, defaultValue) : defaultValue;
- a/Source/WebCore/page/Settings.cpp -18 lines
Lines 165-180 Settings::Settings(Page* page) a/Source/WebCore/page/Settings.cpp_sec1
165
    , m_loadsImagesAutomatically(false)
165
    , m_loadsImagesAutomatically(false)
166
    , m_privateBrowsingEnabled(false)
166
    , m_privateBrowsingEnabled(false)
167
    , m_areImagesEnabled(true)
167
    , m_areImagesEnabled(true)
168
    , m_isMediaEnabled(true)
169
    , m_arePluginsEnabled(false)
168
    , m_arePluginsEnabled(false)
170
    , m_isScriptEnabled(false)
169
    , m_isScriptEnabled(false)
171
    , m_textAreasAreResizable(false)
170
    , m_textAreasAreResizable(false)
172
    , m_needsAdobeFrameReloadingQuirk(false)
171
    , m_needsAdobeFrameReloadingQuirk(false)
173
    , m_isDOMPasteAllowed(false)
174
    , m_usesPageCache(false)
172
    , m_usesPageCache(false)
175
    , m_authorAndUserStylesEnabled(true)
173
    , m_authorAndUserStylesEnabled(true)
176
    , m_fontRenderingMode(0)
174
    , m_fontRenderingMode(0)
177
    , m_inApplicationChromeMode(false)
178
    , m_isCSSCustomFilterEnabled(false)
175
    , m_isCSSCustomFilterEnabled(false)
179
#if ENABLE(CSS_STICKY_POSITION)
176
#if ENABLE(CSS_STICKY_POSITION)
180
    , m_cssStickyPositionEnabled(true)
177
    , m_cssStickyPositionEnabled(true)
Lines 437-447 void Settings::setImagesEnabled(bool areImagesEnabled) a/Source/WebCore/page/Settings.cpp_sec2
437
    m_setImageLoadingSettingsTimer.startOneShot(0);
434
    m_setImageLoadingSettingsTimer.startOneShot(0);
438
}
435
}
439
436
440
void Settings::setMediaEnabled(bool isMediaEnabled)
441
{
442
    m_isMediaEnabled = isMediaEnabled;
443
}
444
445
void Settings::setPluginsEnabled(bool arePluginsEnabled)
437
void Settings::setPluginsEnabled(bool arePluginsEnabled)
446
{
438
{
447
    m_arePluginsEnabled = arePluginsEnabled;
439
    m_arePluginsEnabled = arePluginsEnabled;
Lines 482-492 void Settings::setNeedsAdobeFrameReloadingQuirk(bool shouldNotReloadIFramesForUn a/Source/WebCore/page/Settings.cpp_sec3
482
    m_needsAdobeFrameReloadingQuirk = shouldNotReloadIFramesForUnchangedSRC;
474
    m_needsAdobeFrameReloadingQuirk = shouldNotReloadIFramesForUnchangedSRC;
483
}
475
}
484
476
485
void Settings::setDOMPasteAllowed(bool DOMPasteAllowed)
486
{
487
    m_isDOMPasteAllowed = DOMPasteAllowed;
488
}
489
490
void Settings::setDefaultMinDOMTimerInterval(double interval)
477
void Settings::setDefaultMinDOMTimerInterval(double interval)
491
{
478
{
492
    gDefaultMinDOMTimerInterval = interval;
479
    gDefaultMinDOMTimerInterval = interval;
Lines 564-574 FontRenderingMode Settings::fontRenderingMode() const a/Source/WebCore/page/Settings.cpp_sec4
564
    return static_cast<FontRenderingMode>(m_fontRenderingMode);
551
    return static_cast<FontRenderingMode>(m_fontRenderingMode);
565
}
552
}
566
553
567
void Settings::setApplicationChromeMode(bool mode)
568
{
569
    m_inApplicationChromeMode = mode;
570
}
571
572
#if USE(SAFARI_THEME)
554
#if USE(SAFARI_THEME)
573
void Settings::setShouldPaintNativeControls(bool shouldPaintNativeControls)
555
void Settings::setShouldPaintNativeControls(bool shouldPaintNativeControls)
574
{
556
{
- a/Source/WebCore/page/Settings.h -12 lines
Lines 152-160 namespace WebCore { a/Source/WebCore/page/Settings.h_sec1
152
        void setImagesEnabled(bool);
152
        void setImagesEnabled(bool);
153
        bool areImagesEnabled() const { return m_areImagesEnabled; }
153
        bool areImagesEnabled() const { return m_areImagesEnabled; }
154
154
155
        void setMediaEnabled(bool);
156
        bool isMediaEnabled() const { return m_isMediaEnabled; }
157
158
        void setPluginsEnabled(bool);
155
        void setPluginsEnabled(bool);
159
        bool arePluginsEnabled() const { return m_arePluginsEnabled; }
156
        bool arePluginsEnabled() const { return m_arePluginsEnabled; }
160
157
Lines 186-194 namespace WebCore { a/Source/WebCore/page/Settings.h_sec2
186
        void setNeedsAdobeFrameReloadingQuirk(bool);
183
        void setNeedsAdobeFrameReloadingQuirk(bool);
187
        bool needsAcrobatFrameReloadingQuirk() const { return m_needsAdobeFrameReloadingQuirk; }
184
        bool needsAcrobatFrameReloadingQuirk() const { return m_needsAdobeFrameReloadingQuirk; }
188
185
189
        void setDOMPasteAllowed(bool);
190
        bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
191
        
192
        static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
186
        static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
193
        static double defaultMinDOMTimerInterval();
187
        static double defaultMinDOMTimerInterval();
194
        
188
        
Lines 213-221 namespace WebCore { a/Source/WebCore/page/Settings.h_sec3
213
        void setFontRenderingMode(FontRenderingMode mode);
207
        void setFontRenderingMode(FontRenderingMode mode);
214
        FontRenderingMode fontRenderingMode() const;
208
        FontRenderingMode fontRenderingMode() const;
215
209
216
        void setApplicationChromeMode(bool);
217
        bool inApplicationChromeMode() const { return m_inApplicationChromeMode; }
218
219
        void setCSSCustomFilterEnabled(bool enabled) { m_isCSSCustomFilterEnabled = enabled; }
210
        void setCSSCustomFilterEnabled(bool enabled) { m_isCSSCustomFilterEnabled = enabled; }
220
        bool isCSSCustomFilterEnabled() const { return m_isCSSCustomFilterEnabled; }
211
        bool isCSSCustomFilterEnabled() const { return m_isCSSCustomFilterEnabled; }
221
212
Lines 339-354 namespace WebCore { a/Source/WebCore/page/Settings.h_sec4
339
        bool m_loadsImagesAutomatically : 1;
330
        bool m_loadsImagesAutomatically : 1;
340
        bool m_privateBrowsingEnabled : 1;
331
        bool m_privateBrowsingEnabled : 1;
341
        bool m_areImagesEnabled : 1;
332
        bool m_areImagesEnabled : 1;
342
        bool m_isMediaEnabled : 1;
343
        bool m_arePluginsEnabled : 1;
333
        bool m_arePluginsEnabled : 1;
344
        bool m_isScriptEnabled : 1;
334
        bool m_isScriptEnabled : 1;
345
        bool m_textAreasAreResizable : 1;
335
        bool m_textAreasAreResizable : 1;
346
        bool m_needsAdobeFrameReloadingQuirk : 1;
336
        bool m_needsAdobeFrameReloadingQuirk : 1;
347
        bool m_isDOMPasteAllowed : 1;
348
        bool m_usesPageCache : 1;
337
        bool m_usesPageCache : 1;
349
        bool m_authorAndUserStylesEnabled : 1;
338
        bool m_authorAndUserStylesEnabled : 1;
350
        unsigned m_fontRenderingMode : 1;
339
        unsigned m_fontRenderingMode : 1;
351
        bool m_inApplicationChromeMode : 1;
352
        bool m_isCSSCustomFilterEnabled : 1;
340
        bool m_isCSSCustomFilterEnabled : 1;
353
#if ENABLE(CSS_STICKY_POSITION)
341
#if ENABLE(CSS_STICKY_POSITION)
354
        bool m_cssStickyPositionEnabled : 1;
342
        bool m_cssStickyPositionEnabled : 1;
- a/Source/WebCore/page/Settings.in +3 lines
Lines 153-158 needsDidFinishLoadOrderQuirk initial=false a/Source/WebCore/page/Settings.in_sec1
153
fixedPositionCreatesStackingContext initial=false
153
fixedPositionCreatesStackingContext initial=false
154
syncXHRInDocumentsEnabled initial=true
154
syncXHRInDocumentsEnabled initial=true
155
cookieEnabled initial=true
155
cookieEnabled initial=true
156
mediaEnabled initial=true
157
applicationChromeMode initial=false
158
DOMPasteAllowed initial=false
156
159
157
threadedHTMLParser initial=false, conditional=THREADED_HTML_PARSER
160
threadedHTMLParser initial=false, conditional=THREADED_HTML_PARSER
158
161
- a/Source/WebCore/page/make_settings.pl -2 / +6 lines
Lines 216-223 sub setterFunctionName($) a/Source/WebCore/page/make_settings.pl_sec1
216
    my $settingName = shift;
216
    my $settingName = shift;
217
    my $setterFunctionName = "set" . $settingName;
217
    my $setterFunctionName = "set" . $settingName;
218
    substr($setterFunctionName, 3, 1) = uc(substr($setterFunctionName, 3, 1));
218
    substr($setterFunctionName, 3, 1) = uc(substr($setterFunctionName, 3, 1));
219
    if (substr($settingName, 0, 3) eq "css" || substr($settingName, 0, 3) eq "xss" || substr($settingName, 0, 3) eq "ftp") {
219
    my @prefixesToUpperCase = ("css", "xss", "ftp", "dom");
220
        substr($setterFunctionName, 3, 3) = uc(substr($setterFunctionName, 3, 3));
220
    foreach my $prefix (@prefixesToUpperCase) {
221
        my $prefixLength = length($prefix);
222
        if (substr($settingName, 0, $prefixLength) eq $prefix) {
223
            substr($setterFunctionName, $prefixLength, $prefixLength) = uc(substr($setterFunctionName, 3, 3));
224
        }
221
    }
225
    }
222
    return $setterFunctionName;
226
    return $setterFunctionName;
223
}
227
}
- a/Source/WebCore/rendering/RenderTheme.cpp -1 / +1 lines
Lines 854-860 bool RenderTheme::isDefault(const RenderObject* o) const a/Source/WebCore/rendering/RenderTheme.cpp_sec1
854
        return false;
854
        return false;
855
855
856
    Settings* settings = o->document()->settings();
856
    Settings* settings = o->document()->settings();
857
    if (!settings || !settings->inApplicationChromeMode())
857
    if (!settings || !settings->applicationChromeMode())
858
        return false;
858
        return false;
859
    
859
    
860
    return o->style()->appearance() == DefaultButtonPart;
860
    return o->style()->appearance() == DefaultButtonPart;
- a/Source/WebCore/rendering/RenderThemeWin.cpp -1 / +1 lines
Lines 145-151 static bool gWebKitIsBeingUnloaded; a/Source/WebCore/rendering/RenderThemeWin.cpp_sec1
145
static bool documentIsInApplicationChromeMode(const Document* document)
145
static bool documentIsInApplicationChromeMode(const Document* document)
146
{
146
{
147
    Settings* settings = document->settings();
147
    Settings* settings = document->settings();
148
    return settings && settings->inApplicationChromeMode();
148
    return settings && settings->applicationChromeMode();
149
}
149
}
150
150
151
void RenderThemeWin::setWebKitIsBeingUnloaded()
151
void RenderThemeWin::setWebKitIsBeingUnloaded()
- a/Source/WebKit/efl/ewk/ewk_view.cpp -1 / +1 lines
Lines 893-899 static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* smartData) a/Source/WebKit/efl/ewk/ewk_view.cpp_sec1
893
    priv->settings.shouldDisplaySubtitles = priv->pageSettings->shouldDisplaySubtitles();
893
    priv->settings.shouldDisplaySubtitles = priv->pageSettings->shouldDisplaySubtitles();
894
    priv->settings.shouldDisplayTextDescriptions = priv->pageSettings->shouldDisplayTextDescriptions();
894
    priv->settings.shouldDisplayTextDescriptions = priv->pageSettings->shouldDisplayTextDescriptions();
895
#endif
895
#endif
896
    priv->settings.scriptsCanAccessClipboard = priv->pageSettings->javaScriptCanAccessClipboard() && priv->pageSettings->isDOMPasteAllowed();
896
    priv->settings.scriptsCanAccessClipboard = priv->pageSettings->javaScriptCanAccessClipboard() && priv->pageSettings->DOMPasteAllowed();
897
    priv->settings.resizableTextareas = priv->pageSettings->textAreasAreResizable();
897
    priv->settings.resizableTextareas = priv->pageSettings->textAreasAreResizable();
898
    priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();
898
    priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();
899
    priv->settings.caretBrowsing = priv->pageSettings->caretBrowsingEnabled();
899
    priv->settings.caretBrowsing = priv->pageSettings->caretBrowsingEnabled();

Return to Bug 109875