Diff
Modified: trunk/Source/WebCore/ChangeLog (105048 => 105049)
--- trunk/Source/WebCore/ChangeLog 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/ChangeLog 2012-01-16 11:28:48 UTC (rev 105049)
@@ -1,5 +1,23 @@
2012-01-16 Pablo Flouret <[email protected]>
+ Fix compilation errors on build-webkit --debug --no-svg --no-svg-fonts --no-svg-dom-objc-bindings on mac.
+ https://bugs.webkit.org/show_bug.cgi?id=75865
+
+ Reviewed by Hajime Morita.
+
+ * WebCore.exp.in:
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::ApplyPropertyDisplay::isValidDisplayValue):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::setContainerSizeForRenderer):
+ (WebCore::CachedImage::imageSizeForRenderer):
+ * platform/graphics/FontFastPath.cpp:
+ (WebCore::Font::drawGlyphBuffer):
+ * rendering/FilterEffectRenderer.cpp:
+ * svg/SVGElementInstance.idl:
+
+2012-01-16 Pablo Flouret <[email protected]>
+
Compilation error on build-webkit --debug --no-request-animation-frame on mac.
https://bugs.webkit.org/show_bug.cgi?id=75875
Modified: trunk/Source/WebCore/WebCore.exp.in (105048 => 105049)
--- trunk/Source/WebCore/WebCore.exp.in 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-01-16 11:28:48 UTC (rev 105049)
@@ -364,7 +364,9 @@
__ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv
__ZN7WebCore14ResourceHandle35createPrivateBrowsingStorageSessionEPK10__CFString
__ZN7WebCore14ResourceLoader14cancelledErrorEv
+#if ENABLE(SVG)
__ZN7WebCore14SVGSMILElement13isSMILElementEPNS_4NodeE
+#endif
__ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKN3WTF6StringE
__ZN7WebCore14SchemeRegistry25registerURLSchemeAsSecureERKN3WTF6StringE
__ZN7WebCore14SchemeRegistry32registerURLSchemeAsEmptyDocumentERKN3WTF6StringE
@@ -613,7 +615,9 @@
__ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS_13PlatformEvent4TypeEb
__ZN7WebCore21ResourceLoadScheduler20servePendingRequestsENS_20ResourceLoadPriorityE
__ZN7WebCore21ResourceLoadScheduler24schedulePluginStreamLoadEPNS_5FrameEPNS_32NetscapePlugInStreamLoaderClientERKNS_15ResourceRequestE
+#if ENABLE(SVG)
__ZN7WebCore21SVGDocumentExtensions21sampleAnimationAtTimeERKN3WTF6StringEPNS_14SVGSMILElementEd
+#endif
__ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
__ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
__ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0EEE
@@ -908,11 +912,15 @@
__ZN7WebCore7toRangeEN3JSC7JSValueE
__ZN7WebCore8Document11createRangeEv
__ZN7WebCore8Document12updateLayoutEv
+#if ENABLE(SVG)
__ZN7WebCore8Document13svgExtensionsEv
+#endif
__ZN7WebCore8Document14setFocusedNodeEN3WTF10PassRefPtrINS_4NodeEEE
__ZN7WebCore8Document16isPageBoxVisibleEi
__ZN7WebCore8Document17getFocusableNodesERN3WTF6VectorINS1_6RefPtrINS_4NodeEEELm0EEE
+#if ENABLE(SVG)
__ZN7WebCore8Document19accessSVGExtensionsEv
+#endif
__ZN7WebCore8Document20styleSelectorChangedENS_23StyleSelectorUpdateFlagE
__ZN7WebCore8Document22createDocumentFragmentEv
__ZN7WebCore8Document23didAddWheelEventHandlerEv
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (105048 => 105049)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-01-16 11:28:48 UTC (rev 105049)
@@ -1572,6 +1572,9 @@
#if ENABLE(SVG)
if (selector->element() && selector->element()->isSVGElement() && selector->style()->styleType() == NOPSEUDO)
return (displayPropertyValue == INLINE || displayPropertyValue == BLOCK || displayPropertyValue == NONE);
+#else
+ UNUSED_PARAM(selector);
+ UNUSED_PARAM(displayPropertyValue);
#endif
return true;
}
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (105048 => 105049)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-01-16 11:28:48 UTC (rev 105049)
@@ -205,6 +205,7 @@
m_svgImageCache->setRequestedSizeAndZoom(renderer, SVGImageCache::SizeAndZoom(containerSize, containerZoom));
#else
UNUSED_PARAM(renderer);
+ UNUSED_PARAM(containerZoom);
m_image->setContainerSize(containerSize);
#endif
}
@@ -255,6 +256,8 @@
}
return sizeAndZoom.size;
}
+#else
+ UNUSED_PARAM(renderer);
#endif
if (multiplier == 1.0f)
Modified: trunk/Source/WebCore/platform/graphics/FontFastPath.cpp (105048 => 105049)
--- trunk/Source/WebCore/platform/graphics/FontFastPath.cpp 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/platform/graphics/FontFastPath.cpp 2012-01-16 11:28:48 UTC (rev 105049)
@@ -379,6 +379,10 @@
void Font::drawGlyphBuffer(GraphicsContext* context, const TextRun& run, const GlyphBuffer& glyphBuffer, const FloatPoint& point) const
{
+#if !ENABLE(SVG_FONTS)
+ UNUSED_PARAM(run);
+#endif
+
// Draw each contiguous run of glyphs that use the same font data.
const SimpleFontData* fontData = glyphBuffer.fontDataAt(0);
FloatSize offset = glyphBuffer.offsetAt(0);
Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (105048 => 105049)
--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-01-16 11:28:48 UTC (rev 105049)
@@ -29,6 +29,7 @@
#include "FilterEffectRenderer.h"
+#include "Document.h"
#include "FEColorMatrix.h"
#include "FEComponentTransfer.h"
#include "FEDropShadow.h"
Modified: trunk/Source/WebCore/svg/SVGElementInstance.idl (105048 => 105049)
--- trunk/Source/WebCore/svg/SVGElementInstance.idl 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebCore/svg/SVGElementInstance.idl 2012-01-16 11:28:48 UTC (rev 105049)
@@ -27,6 +27,7 @@
module svg {
interface [
+ Conditional=SVG,
CustomMarkFunction,
GenerateNativeConverter
] SVGElementInstance
Modified: trunk/Source/WebKit/mac/ChangeLog (105048 => 105049)
--- trunk/Source/WebKit/mac/ChangeLog 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-01-16 11:28:48 UTC (rev 105049)
@@ -1,3 +1,13 @@
+2012-01-16 Pablo Flouret <[email protected]>
+
+ Fix compilation errors on build-webkit --debug --no-svg --no-svg-fonts --no-svg-dom-objc-bindings on mac.
+ https://bugs.webkit.org/show_bug.cgi?id=75865
+
+ Reviewed by Hajime Morita.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _pauseSVGAnimation:onSMILNode:atTime:]):
+
2012-01-15 Pablo Flouret <[email protected]>
Fix compilation errors on build-webkit --debug --no-video on mac.
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (105048 => 105049)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-01-16 11:09:00 UTC (rev 105048)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-01-16 11:28:48 UTC (rev 105049)
@@ -995,6 +995,7 @@
// This method is only intended to be used for testing the SVG animation system.
- (BOOL)_pauseSVGAnimation:(NSString*)elementId onSMILNode:(DOMNode *)node atTime:(NSTimeInterval)time
{
+#if ENABLE(SVG)
Frame* frame = core(self);
if (!frame)
return false;
@@ -1007,7 +1008,6 @@
if (!coreNode || !SVGSMILElement::isSMILElement(coreNode))
return false;
-#if ENABLE(SVG)
return document->accessSVGExtensions()->sampleAnimationAtTime(elementId, static_cast<SVGSMILElement*>(coreNode), time);
#else
return false;
