Diff
Modified: trunk/Source/WebCore/ChangeLog (179973 => 179974)
--- trunk/Source/WebCore/ChangeLog 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/ChangeLog 2015-02-12 01:09:50 UTC (rev 179974)
@@ -1,3 +1,24 @@
+2015-02-11 Alex Christensen <achristen...@webkit.org>
+
+ Do not export functions defined in headers.
+ This prevents weak external symbol errors in some configurations.
+
+ * dom/Range.h:
+ (WebCore::Range::startContainer):
+ (WebCore::Range::startOffset):
+ (WebCore::Range::endContainer):
+ (WebCore::Range::endOffset):
+ * inspector/InspectorController.h:
+ * page/Settings.h:
+ (WebCore::Settings::setMediaKeysStorageDirectory):
+ * page/make_settings.pl:
+ (printGetterAndSetter):
+ * platform/network/cocoa/ProtectionSpaceCocoa.h:
+ (WebCore::ProtectionSpace::encodingRequiresPlatformData):
+ * platform/text/TextEncoding.h:
+ (WebCore::TextEncoding::decode):
+ Removed WEBCORE_EXPORT macros.
+
2015-02-11 Chris Dumez <cdu...@apple.com>
[WK2] Add logging to validate the network cache efficacy (Part 2)
Modified: trunk/Source/WebCore/dom/Range.h (179973 => 179974)
--- trunk/Source/WebCore/dom/Range.h 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/dom/Range.h 2015-02-12 01:09:50 UTC (rev 179974)
@@ -58,10 +58,10 @@
Document& ownerDocument() const { return const_cast<Document&>(m_ownerDocument.get()); }
- WEBCORE_EXPORT Node* startContainer() const { return m_start.container(); }
- WEBCORE_EXPORT int startOffset() const { return m_start.offset(); }
- WEBCORE_EXPORT Node* endContainer() const { return m_end.container(); }
- WEBCORE_EXPORT int endOffset() const { return m_end.offset(); }
+ Node* startContainer() const { return m_start.container(); }
+ int startOffset() const { return m_start.offset(); }
+ Node* endContainer() const { return m_end.container(); }
+ int endOffset() const { return m_end.offset(); }
WEBCORE_EXPORT Node* startContainer(ExceptionCode&) const;
WEBCORE_EXPORT int startOffset(ExceptionCode&) const;
Modified: trunk/Source/WebCore/inspector/InspectorController.h (179973 => 179974)
--- trunk/Source/WebCore/inspector/InspectorController.h 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-02-12 01:09:50 UTC (rev 179974)
@@ -126,7 +126,7 @@
void resume();
InspectorClient* inspectorClient() const { return m_inspectorClient; }
- WEBCORE_EXPORT InspectorPageAgent* pageAgent() const { return m_pageAgent; }
+ InspectorPageAgent* pageAgent() const { return m_pageAgent; }
virtual bool developerExtrasEnabled() const override;
virtual bool canAccessInspectedScriptState(JSC::ExecState*) const override;
Modified: trunk/Source/WebCore/page/Settings.h (179973 => 179974)
--- trunk/Source/WebCore/page/Settings.h 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/page/Settings.h 2015-02-12 01:09:50 UTC (rev 179974)
@@ -272,7 +272,7 @@
#endif
#if ENABLE(ENCRYPTED_MEDIA_V2)
- WEBCORE_EXPORT void setMediaKeysStorageDirectory(const String& directory) { m_mediaKeysStorageDirectory = directory; }
+ void setMediaKeysStorageDirectory(const String& directory) { m_mediaKeysStorageDirectory = directory; }
const String& mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
#endif
Modified: trunk/Source/WebCore/page/make_settings.pl (179973 => 179974)
--- trunk/Source/WebCore/page/make_settings.pl 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/page/make_settings.pl 2015-02-12 01:09:50 UTC (rev 179974)
@@ -240,10 +240,10 @@
my ($file, $settingName, $type, $setNeedsStyleRecalcInAllFrames) = @_;
my $setterFunctionName = setterFunctionName($settingName);
if (lc(substr($type, 0, 1)) eq substr($type, 0, 1)) {
- print $file " WEBCORE_EXPORT $type $settingName() const { return m_$settingName; } \\\n";
+ print $file " $type $settingName() const { return m_$settingName; } \\\n";
print $file " WEBCORE_EXPORT void $setterFunctionName($type $settingName)";
} else {
- print $file " WEBCORE_EXPORT const $type& $settingName() { return m_$settingName; } \\\n";
+ print $file " const $type& $settingName() { return m_$settingName; } \\\n";
print $file " WEBCORE_EXPORT void $setterFunctionName(const $type& $settingName)";
}
if ($setNeedsStyleRecalcInAllFrames) {
Modified: trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h (179973 => 179974)
--- trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.h 2015-02-12 01:09:50 UTC (rev 179974)
@@ -54,7 +54,7 @@
static bool platformCompare(const ProtectionSpace& a, const ProtectionSpace& b);
- WEBCORE_EXPORT bool encodingRequiresPlatformData() const { return m_nsSpace && encodingRequiresPlatformData(m_nsSpace.get()); }
+ bool encodingRequiresPlatformData() const { return m_nsSpace && encodingRequiresPlatformData(m_nsSpace.get()); }
WEBCORE_EXPORT bool receivesCredentialSecurely() const;
Modified: trunk/Source/WebCore/platform/text/TextEncoding.h (179973 => 179974)
--- trunk/Source/WebCore/platform/text/TextEncoding.h 2015-02-12 00:46:21 UTC (rev 179973)
+++ trunk/Source/WebCore/platform/text/TextEncoding.h 2015-02-12 01:09:50 UTC (rev 179974)
@@ -63,7 +63,7 @@
const TextEncoding& closestByteBasedEquivalent() const;
const TextEncoding& encodingForFormSubmission() const;
- WEBCORE_EXPORT String decode(const char* str, size_t length) const
+ String decode(const char* str, size_t length) const
{
bool ignored;
return decode(str, length, false, ignored);
