Diff
Modified: trunk/ChangeLog (122804 => 122805)
--- trunk/ChangeLog 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/ChangeLog 2012-07-17 04:33:25 UTC (rev 122805)
@@ -1,3 +1,14 @@
+2012-07-16 Hajime Morrita <[email protected]>
+
+ WebCore needs WEBCORE_TESTING macro to mark methods being exported for testing.
+ https://bugs.webkit.org/show_bug.cgi?id=90764
+
+ Reviewed by Adam Barth.
+
+ Removed symbols which are now covered by WEBCORE_TESTING.
+
+ * Source/autotools/symbols.filter:
+
2012-07-16 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and configure.ac for 1.9.5 release
Modified: trunk/Source/WTF/ChangeLog (122804 => 122805)
--- trunk/Source/WTF/ChangeLog 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WTF/ChangeLog 2012-07-17 04:33:25 UTC (rev 122805)
@@ -1,3 +1,15 @@
+2012-07-16 Hajime Morrita <[email protected]>
+
+ WebCore needs WEBCORE_TESTING macro to mark methods being exported for testing.
+ https://bugs.webkit.org/show_bug.cgi?id=90764
+
+ Reviewed by Adam Barth.
+
+ Added USE(EXPORT_MACROS_FOR_TESTING) and enabled it on GTK and Windows.
+
+ * wtf/ExportMacros.h:
+ * wtf/Platform.h:
+
2012-07-16 Filip Pizlo <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WTF/wtf/ExportMacros.h (122804 => 122805)
--- trunk/Source/WTF/wtf/ExportMacros.h 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WTF/wtf/ExportMacros.h 2012-07-17 04:33:25 UTC (rev 122805)
@@ -48,26 +48,40 @@
#define WTF_INTERNAL
#endif
-// See note in wtf/Platform.h for more info on EXPORT_MACROS.
-#if USE(EXPORT_MACROS)
+#if !PLATFORM(CHROMIUM) && OS(WINDOWS)
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS)
-#define WTF_EXPORT __declspec(dllexport)
-#define WTF_IMPORT __declspec(dllimport)
-#define WTF_HIDDEN
+#define WTF_EXPORT_DECLARATION __declspec(dllexport)
+#define WTF_IMPORT_DECLARATION __declspec(dllimport)
+#define WTF_HIDDEN_DECLARATION
+
#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
-#define WTF_EXPORT __attribute__((visibility("default")))
-#define WTF_IMPORT WTF_EXPORT
-#define WTF_HIDDEN __attribute__((visibility("hidden")))
+
+#define WTF_EXPORT_DECLARATION __attribute__((visibility("default")))
+#define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
+#define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
+
#else
-#define WTF_EXPORT
-#define WTF_IMPORT
-#define WTF_HIDDEN
+
+#define WTF_EXPORT_DECLARATION
+#define WTF_IMPORT_DECLARATION
+#define WTF_HIDDEN_DECLARATION
+
#endif
+#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) || (PLATFORM(WX) && defined(BUILDING_JavaScriptCore))
+#define WTF_IS_LINKED_IN_SAME_BINARY 1
+#endif
+
+// See note in wtf/Platform.h for more info on EXPORT_MACROS.
+#if USE(EXPORT_MACROS)
+
+#define WTF_EXPORT WTF_EXPORT_DECLARATION
+#define WTF_IMPORT WTF_IMPORT_DECLARATION
+#define WTF_HIDDEN WTF_IMPORT_DECLARATION
+
// FIXME: When all ports are using the export macros, we should replace
// WTF_EXPORTDATA with WTF_EXPORT_PRIVATE macros.
-#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) || (PLATFORM(WX) && defined(BUILDING_JavaScriptCore))
+#if defined(WTF_IS_LINKED_IN_SAME_BINARY)
#define WTF_EXPORTDATA WTF_EXPORT
#else
#define WTF_EXPORTDATA WTF_IMPORT
@@ -93,7 +107,25 @@
#endif // USE(EXPORT_MACROS)
-#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) || (PLATFORM(WX) && defined(BUILDING_JavaScriptCore))
+// WTF_TESTING (and WEBCORE_TESTING in PlatformExportMacros.h) is used for
+// exporting symbols which are referred from WebCoreTestSupport library.
+// Since the set of APIs is common between ports,
+// it is rather worth annotating inside the code than maintaining port specific export lists.
+#if USE(EXPORT_MACROS_FOR_TESTING)
+
+#if defined(WTF_IS_LINKED_IN_SAME_BINARY)
+#define WTF_TESTING WTF_EXPORT_DECLARATION
+#else
+#define WTF_TESTING WTF_IMPORT_DECLARATION
+#endif
+
+#else // USE(EXPORT_MACROS_FOR_TESTING)
+
+#define WTF_TESTING
+
+#endif // USE(EXPORT_MACROS_FOR_TESTING)
+
+#if defined(WTF_IS_LINKED_IN_SAME_BINARY)
#define WTF_EXPORT_PRIVATE WTF_EXPORT
#else
#define WTF_EXPORT_PRIVATE WTF_IMPORT
Modified: trunk/Source/WTF/wtf/Platform.h (122804 => 122805)
--- trunk/Source/WTF/wtf/Platform.h 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WTF/wtf/Platform.h 2012-07-17 04:33:25 UTC (rev 122805)
@@ -1082,6 +1082,10 @@
#define WTF_USE_EXPORT_MACROS 1
#endif
+#if !defined(WTF_USE_EXPORT_MACROS_FOR_TESTING) && (PLATFORM(GTK) || PLATFORM(WIN))
+#define WTF_USE_EXPORT_MACROS_FOR_TESTING 1
+#endif
+
#if (PLATFORM(QT) && !OS(DARWIN)) || PLATFORM(GTK) || PLATFORM(EFL)
#define WTF_USE_UNIX_DOMAIN_SOCKETS 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (122804 => 122805)
--- trunk/Source/WebCore/ChangeLog 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebCore/ChangeLog 2012-07-17 04:33:25 UTC (rev 122805)
@@ -1,3 +1,18 @@
+2012-07-16 Hajime Morrita <[email protected]>
+
+ WebCore needs WEBCORE_TESTING macro to mark methods being exported for testing.
+ https://bugs.webkit.org/show_bug.cgi?id=90764
+
+ Reviewed by Adam Barth.
+
+ Defined WEBCORE_TESTING based on USE(EXPORT_MACROS_FOR_TESTING) and
+ applied it to FrameDestructionObserver.
+
+ * bindings/js/JSDOMGlobalObject.h: Removed conflicting symbols
+ * page/FrameDestructionObserver.h: Added WEBKIT_TESTING
+ (FrameDestructionObserver):
+ * platform/PlatformExportMacros.h:
+
2012-07-16 Kiran Muppala <[email protected]>
REGRESSION: RenderInline::absoluteQuads produces incorrect results for fixed position.
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h (122804 => 122805)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2012-07-17 04:33:25 UTC (rev 122805)
@@ -27,12 +27,10 @@
#ifndef JSDOMGlobalObject_h
#define JSDOMGlobalObject_h
+#include "PlatformExportMacros.h"
#include <runtime/JSGlobalObject.h>
#include <runtime/JSGlobalThis.h>
-#ifndef WEBKIT_EXPORTDATA
-#define WEBKIT_EXPORTDATA
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/page/FrameDestructionObserver.h (122804 => 122805)
--- trunk/Source/WebCore/page/FrameDestructionObserver.h 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebCore/page/FrameDestructionObserver.h 2012-07-17 04:33:25 UTC (rev 122805)
@@ -26,22 +26,24 @@
#ifndef FrameDestructionObserver_h
#define FrameDestructionObserver_h
+#include "PlatformExportMacros.h"
+
namespace WebCore {
class Frame;
class FrameDestructionObserver {
public:
- explicit FrameDestructionObserver(Frame*);
+ WEBCORE_TESTING explicit FrameDestructionObserver(Frame*);
- virtual void frameDestroyed();
- virtual void willDetachPage();
+ WEBCORE_TESTING virtual void frameDestroyed();
+ WEBCORE_TESTING virtual void willDetachPage();
Frame* frame() const { return m_frame; }
protected:
- virtual ~FrameDestructionObserver();
- void observeFrame(Frame*);
+ WEBCORE_TESTING virtual ~FrameDestructionObserver();
+ WEBCORE_TESTING void observeFrame(Frame*);
Frame* m_frame;
};
Modified: trunk/Source/WebCore/platform/PlatformExportMacros.h (122804 => 122805)
--- trunk/Source/WebCore/platform/PlatformExportMacros.h 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebCore/platform/PlatformExportMacros.h 2012-07-17 04:33:25 UTC (rev 122805)
@@ -32,11 +32,15 @@
#include <wtf/Platform.h>
#include <wtf/ExportMacros.h>
+#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \
+ defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit)
+#define WEBCORE_IS_LINKED_IN_SAME_BINARY 1
+#endif
+
// See note in wtf/Platform.h for more info on EXPORT_MACROS.
#if USE(EXPORT_MACROS)
-#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \
- defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit)
+#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
#define WEBKIT_EXPORTDATA WTF_EXPORT
#else
#define WEBKIT_EXPORTDATA WTF_IMPORT
@@ -46,8 +50,7 @@
#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
-#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \
- defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit)
+#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
#define WEBKIT_EXPORTDATA __declspec(dllexport)
#else
#define WEBKIT_EXPORTDATA __declspec(dllimport)
@@ -61,4 +64,18 @@
#endif // USE(EXPORT_MACROS)
+#if USE(EXPORT_MACROS_FOR_TESTING)
+
+#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
+#define WEBCORE_TESTING WTF_EXPORT_DECLARATION
+#else
+#define WEBCORE_TESTING WTF_IMPORT_DECLARATION
+#endif
+
+#else // USE(EXPORT_MACROS_FOR_TESTING)
+
+#define WEBCORE_TESTING
+
+#endif // USE(EXPORT_MACROS_FOR_TESTING)
+
#endif // PlatformExportMacros_h
Modified: trunk/Source/WebKit2/ChangeLog (122804 => 122805)
--- trunk/Source/WebKit2/ChangeLog 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-17 04:33:25 UTC (rev 122805)
@@ -1,3 +1,15 @@
+2012-07-16 Hajime Morrita <[email protected]>
+
+ WebCore needs WEBCORE_TESTING macro to mark methods being exported for testing.
+ https://bugs.webkit.org/show_bug.cgi?id=90764
+
+ Reviewed by Adam Barth.
+
+ Removed symbols which are now covered by WEBCORE_TESTING.
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-07-16 Christophe Dumez <[email protected]>
[EFL][WK2] Implement decidePolicyForResponse in policy client
Modified: trunk/Source/WebKit2/win/WebKit2.def (122804 => 122805)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-07-17 04:33:25 UTC (rev 122805)
@@ -153,8 +153,6 @@
??1ClientRectList@WebCore@@QAE@XZ
??0String@WTF@@QAE@PBD@Z
??0String@WTF@@QAE@PB_W@Z
- ??1FrameDestructionObserver@WebCore@@MAE@XZ
- ??0FrameDestructionObserver@WebCore@@QAE@PAVFrame@1@@Z
?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z
?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ
?description@DocumentMarker@WebCore@@QBEABVString@WTF@@XZ
@@ -174,7 +172,6 @@
?externalRepresentation@WebCore@@YA?AVString@WTF@@PAVElement@1@I@Z
?find@StringImpl@WTF@@QAEIPAV12@I@Z
?find@StringImpl@WTF@@QAEIPAV12@@Z
- ?frameDestroyed@FrameDestructionObserver@WebCore@@UAEXXZ
?absoluteCaretBounds@FrameSelection@WebCore@@QAE?AVIntRect@2@XZ
?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z
?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
@@ -197,7 +194,6 @@
?previous@ComposedShadowTreeWalker@WebCore@@QAEXXZ
?number@String@WTF@@SA?AV12@I@Z
?number@String@WTF@@SA?AV12@H@Z
- ?observeFrame@FrameDestructionObserver@WebCore@@IAEXPAVFrame@2@@Z
?overrideUserPreferredLanguages@WebCore@@YAXABV?$Vector@VString@WTF@@$0A@@WTF@@@Z
?numberOfScopedHTMLStyleChildren@Node@WebCore@@QBEIXZ
?page@Document@WebCore@@QBEPAVPage@2@XZ
@@ -254,7 +250,6 @@
?userPreferredLanguages@WebCore@@YA?AV?$Vector@VString@WTF@@$0A@@WTF@@XZ
?utf8@String@WTF@@QBE?AVCString@2@_N@Z
?view@Document@WebCore@@QBEPAVFrameView@2@XZ
- ?willDetachPage@FrameDestructionObserver@WebCore@@UAEXXZ
??1ContextDestructionObserver@WebCore@@MAE@XZ
?contextDestroyed@ContextDestructionObserver@WebCore@@UAEXXZ
??0ContextDestructionObserver@WebCore@@QAE@PAVScriptExecutionContext@1@@Z
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (122804 => 122805)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-07-17 04:33:25 UTC (rev 122805)
@@ -146,8 +146,6 @@
??1ClientRectList@WebCore@@QAE@XZ
??0String@WTF@@QAE@PBD@Z
??0String@WTF@@QAE@PB_W@Z
- ??1FrameDestructionObserver@WebCore@@MAE@XZ
- ??0FrameDestructionObserver@WebCore@@QAE@PAVFrame@1@@Z
??1ContextDestructionObserver@WebCore@@MAE@XZ
?contextDestroyed@ContextDestructionObserver@WebCore@@UAEXXZ
??0ContextDestructionObserver@WebCore@@QAE@PAVScriptExecutionContext@1@@Z
@@ -170,7 +168,6 @@
?externalRepresentation@WebCore@@YA?AVString@WTF@@PAVElement@1@I@Z
?find@StringImpl@WTF@@QAEIPAV12@I@Z
?find@StringImpl@WTF@@QAEIPAV12@@Z
- ?frameDestroyed@FrameDestructionObserver@WebCore@@UAEXXZ
?absoluteCaretBounds@FrameSelection@WebCore@@QAE?AVIntRect@2@XZ
?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z
?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
@@ -193,7 +190,6 @@
?previous@ComposedShadowTreeWalker@WebCore@@QAEXXZ
?number@String@WTF@@SA?AV12@I@Z
?number@String@WTF@@SA?AV12@H@Z
- ?observeFrame@FrameDestructionObserver@WebCore@@IAEXPAVFrame@2@@Z
?overrideUserPreferredLanguages@WebCore@@YAXABV?$Vector@VString@WTF@@$0A@@WTF@@@Z
?numberOfScopedHTMLStyleChildren@Node@WebCore@@QBEIXZ
?page@Document@WebCore@@QBEPAVPage@2@XZ
@@ -250,7 +246,6 @@
?userPreferredLanguages@WebCore@@YA?AV?$Vector@VString@WTF@@$0A@@WTF@@XZ
?utf8@String@WTF@@QBE?AVCString@2@_N@Z
?view@Document@WebCore@@QBEPAVFrameView@2@XZ
- ?willDetachPage@FrameDestructionObserver@WebCore@@UAEXXZ
?nodesFromRect@Document@WebCore@@QBE?AV?$PassRefPtr@VNodeList@WebCore@@@WTF@@HHIIII_N0@Z
?selectionStartHasMarkerFor@Editor@WebCore@@QBE_NW4MarkerType@DocumentMarker@2@HH@Z
?restrictScaleFactorToInitialScaleIfNotUserScalable@WebCore@@YAXAAUViewportAttributes@1@@Z
Modified: trunk/Source/autotools/symbols.filter (122804 => 122805)
--- trunk/Source/autotools/symbols.filter 2012-07-17 04:00:50 UTC (rev 122804)
+++ trunk/Source/autotools/symbols.filter 2012-07-17 04:33:25 UTC (rev 122805)
@@ -148,11 +148,6 @@
_ZN7WebCore8Settings37setFixedElementsLayoutRelativeToFrameEb;
_ZN7WebCore9FrameView17paintControlTintsEv;
_ZN7WebCore9FrameView19scrollElementToRectEPNS_7ElementERKNS_7IntRectE;
-_ZN7WebCore24FrameDestructionObserverD2Ev;
-_ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE;
-_ZN7WebCore24FrameDestructionObserver12observeFrameEPNS_5FrameE;
-_ZN7WebCore24FrameDestructionObserver14frameDestroyedEv;
-_ZN7WebCore24FrameDestructionObserver14willDetachPageEv;
_ZN7WebCore22RuntimeEnabledFeatures31isMultipleShadowSubtreesEnabledE;
_ZN7WebCore22RuntimeEnabledFeatures32setMultipleShadowSubtreesEnabledEb;
_ZN7WebCore22RuntimeEnabledFeatures18isShadowDOMEnabledE;
