Title: [209235] trunk/Source
- Revision
- 209235
- Author
- [email protected]
- Date
- 2016-12-02 08:21:35 -0800 (Fri, 02 Dec 2016)
Log Message
Fix build break when disabling some features.
https://bugs.webkit.org/show_bug.cgi?id=165254
Source/WebCore:
Patch by Gustavo Sverzut Barbieri <[email protected]> on 2016-12-02
Reviewed by Michael Catanzaro.
If we disable SVG_FONTS or XSLT, then
WebCore::CachedResource::isCORSSameOrigin() would have assertions
on non-existent members. These should be isolated within "#if" as
the other places.
If we're in DEVELOPER_MODE but did not provide
TEST_HYPHENATAION_PATH, then we must mark UNUSED_PARAM() if we're
not on GTK port (ie: EFL).
No new tests as this is a build fix.
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::isCORSSameOrigin):
- missing #if ENABLED(SVG_FONTS)
- missing #if ENABLED(XSLT)
* platform/text/hyphen/HyphenationLibHyphen.cpp:
(WebCore::scanTestDictionariesDirectoryIfNecessary):
- missing UNUSED_PARAM()
Source/WebKit2:
The EFL port was broken if SPELLCHECK was disabled or
PLUGIN_ARCHITECTURE is not x11.
Patch by Gustavo Sverzut Barbieri <[email protected]> on 2016-12-02
Reviewed by Michael Catanzaro.
* UIProcess/efl/TextCheckerEfl.cpp:
(WebKit::TextChecker::checkTextOfParagraph):
(WebKit::TextChecker::checkSpellingOfString):
Fix UNUSED_PARAM() usage if SPELLCHECK is disabled.
* UIProcess/efl/WebPageProxyEfl.cpp:
Isolate methods within #if PLUGIN_ARCHITECTURE(X11).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209234 => 209235)
--- trunk/Source/WebCore/ChangeLog 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 16:21:35 UTC (rev 209235)
@@ -1,3 +1,30 @@
+2016-12-02 Gustavo Sverzut Barbieri <[email protected]>
+
+ Fix build break when disabling some features.
+ https://bugs.webkit.org/show_bug.cgi?id=165254
+
+ Reviewed by Michael Catanzaro.
+
+ If we disable SVG_FONTS or XSLT, then
+ WebCore::CachedResource::isCORSSameOrigin() would have assertions
+ on non-existent members. These should be isolated within "#if" as
+ the other places.
+
+ If we're in DEVELOPER_MODE but did not provide
+ TEST_HYPHENATAION_PATH, then we must mark UNUSED_PARAM() if we're
+ not on GTK port (ie: EFL).
+
+ No new tests as this is a build fix.
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::isCORSSameOrigin):
+ - missing #if ENABLED(SVG_FONTS)
+ - missing #if ENABLED(XSLT)
+ * platform/text/hyphen/HyphenationLibHyphen.cpp:
+ (WebCore::scanTestDictionariesDirectoryIfNecessary):
+ - missing UNUSED_PARAM()
+
+
2016-12-02 Miguel Gomez <[email protected]>
[GTK] Use an OpenGL < 3.0 compliant way to request the OpenGL version
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (209234 => 209235)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-12-02 16:21:35 UTC (rev 209235)
@@ -366,8 +366,12 @@
{
// Following resource types do not use CORS
ASSERT(type() != CachedResource::Type::FontResource);
+#if ENABLE(SVG_FONTS)
ASSERT(type() != CachedResource::Type::SVGFontResource);
+#endif
+#if ENABLE(XSLT)
ASSERT(type() != CachedResource::XSLStyleSheet);
+#endif
// https://html.spec.whatwg.org/multipage/infrastructure.html#cors-same-origin
return !loadFailedOrCanceled() && m_responseTainting != ResourceResponse::Tainting::Opaque;
Modified: trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (209234 => 209235)
--- trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2016-12-02 16:21:35 UTC (rev 209235)
@@ -98,6 +98,8 @@
scanDirectoryForDicionaries(dictionariesPath.get(), availableLocales);
#elif defined(TEST_HYPHENATAION_PATH)
scanDirectoryForDicionaries(TEST_HYPHENATAION_PATH, availableLocales);
+#else
+ UNUSED_PARAM(availableLocales);
#endif
}
#endif
Modified: trunk/Source/WebKit2/ChangeLog (209234 => 209235)
--- trunk/Source/WebKit2/ChangeLog 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-02 16:21:35 UTC (rev 209235)
@@ -1,3 +1,20 @@
+2016-12-02 Gustavo Sverzut Barbieri <[email protected]>
+
+ Fix build break when disabling some features.
+ https://bugs.webkit.org/show_bug.cgi?id=165254
+
+ The EFL port was broken if SPELLCHECK was disabled or
+ PLUGIN_ARCHITECTURE is not x11.
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/efl/TextCheckerEfl.cpp:
+ (WebKit::TextChecker::checkTextOfParagraph):
+ (WebKit::TextChecker::checkSpellingOfString):
+ Fix UNUSED_PARAM() usage if SPELLCHECK is disabled.
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ Isolate methods within #if PLUGIN_ARCHITECTURE(X11).
+
2016-12-01 Jiewen Tan <[email protected]>
Add a runtime flag for SubtleCrypto
Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp (209234 => 209235)
--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp 2016-12-02 16:21:35 UTC (rev 209235)
@@ -198,7 +198,7 @@
#else
UNUSED_PARAM(spellDocumentTag);
UNUSED_PARAM(text);
- UNUSED_PARAM(length);
+ UNUSED_PARAM(insertionPoint);
UNUSED_PARAM(checkingTypes);
#endif
return paragraphCheckingResult;
@@ -212,7 +212,6 @@
#else
UNUSED_PARAM(spellDocumentTag);
UNUSED_PARAM(text);
- UNUSED_PARAM(length);
UNUSED_PARAM(misspellingLocation);
UNUSED_PARAM(misspellingLength);
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (209234 => 209235)
--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2016-12-02 13:22:51 UTC (rev 209234)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2016-12-02 16:21:35 UTC (rev 209235)
@@ -83,6 +83,7 @@
process().send(Messages::WebPage::SetThemePath(themePath), m_pageID);
}
+#if PLUGIN_ARCHITECTURE(X11)
void WebPageProxy::createPluginContainer(uint64_t&)
{
notImplemented();
@@ -102,6 +103,7 @@
{
handled = m_keyEventQueue.first().isFiltered();
}
+#endif
void WebPageProxy::confirmComposition(const String& compositionString)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
