Diff
Modified: trunk/Source/WebCore/ChangeLog (123674 => 123675)
--- trunk/Source/WebCore/ChangeLog 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/ChangeLog 2012-07-25 23:29:00 UTC (rev 123675)
@@ -1,3 +1,59 @@
+2012-07-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r123625 and r123672.
+ http://trac.webkit.org/changeset/123625
+ http://trac.webkit.org/changeset/123672
+ https://bugs.webkit.org/show_bug.cgi?id=92315
+
+ Broke Windows and gcc builds (Requested by rniwa on #webkit).
+
+ * platform/AutodrainedPool.h:
+ (AutodrainedPool):
+ * platform/ContentType.h:
+ (ContentType):
+ * platform/ContextMenu.h:
+ (ContextMenu):
+ * platform/ContextMenuItem.h:
+ (ContextMenuItem):
+ * platform/Cursor.h:
+ (WebCore::SharedCursor::SharedCursor):
+ (Cursor):
+ * platform/KURL.h:
+ (WebCore::KURL::KURL):
+ (KURL):
+ * platform/KURLGooglePrivate.h:
+ (KURLGooglePrivate):
+ * platform/PODRedBlackTree.h:
+ (WebCore::PODRedBlackTree::PODRedBlackTree):
+ * platform/Pasteboard.h:
+ (Pasteboard):
+ * platform/PlatformEvent.h:
+ (WebCore::PlatformEvent::PlatformEvent):
+ * platform/PlatformKeyboardEvent.h:
+ (PlatformKeyboardEvent):
+ * platform/PlatformMouseEvent.h:
+ (PlatformMouseEvent):
+ * platform/PlatformPasteboard.h:
+ (PlatformPasteboard):
+ * platform/PlatformTouchEvent.h:
+ (PlatformTouchEvent):
+ * platform/PlatformWheelEvent.h:
+ (PlatformWheelEvent):
+ * platform/RunLoop.h:
+ (TimerBase):
+ * platform/ScrollAnimator.h:
+ (ScrollAnimator):
+ * platform/ScrollAnimatorNone.h:
+ (ScrollAnimatorNone):
+ * platform/SharedBuffer.h:
+ (SharedBuffer):
+ * platform/WheelFlingPlatformGestureCurve.h:
+ (WheelFlingPlatformGestureCurve):
+ * platform/Widget.h:
+ (Widget):
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+
2012-07-25 Ryosuke Niwa <[email protected]>
Windows build fix attempt after r123625.
Modified: trunk/Source/WebCore/platform/AutodrainedPool.h (123674 => 123675)
--- trunk/Source/WebCore/platform/AutodrainedPool.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/AutodrainedPool.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -38,7 +38,7 @@
class AutodrainedPool {
WTF_MAKE_NONCOPYABLE(AutodrainedPool);
public:
- explicit AutodrainedPool(int iterationLimit = 1);
+ AutodrainedPool(int iterationLimit = 1);
~AutodrainedPool();
void cycle();
Modified: trunk/Source/WebCore/platform/ContentType.h (123674 => 123675)
--- trunk/Source/WebCore/platform/ContentType.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/ContentType.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -33,7 +33,7 @@
class ContentType {
public:
- explicit ContentType(const String& type);
+ ContentType(const String& type);
String parameter (const String& parameterName) const;
String type() const;
Modified: trunk/Source/WebCore/platform/ContextMenu.h (123674 => 123675)
--- trunk/Source/WebCore/platform/ContextMenu.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -71,7 +71,7 @@
void appendItem(const ContextMenuItem& item) { m_items.append(item); }
#else
- explicit ContextMenu(const PlatformMenuDescription);
+ ContextMenu(const PlatformMenuDescription);
~ContextMenu();
void insertItem(unsigned position, ContextMenuItem&);
Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (123674 => 123675)
--- trunk/Source/WebCore/platform/ContextMenuItem.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -277,8 +277,8 @@
const Vector<ContextMenuItem>& subMenuItems() const { return m_subMenuItems; }
#else
public:
- explicit ContextMenuItem(PlatformMenuItemDescription);
- explicit ContextMenuItem(ContextMenu* subMenu = 0);
+ ContextMenuItem(PlatformMenuItemDescription);
+ ContextMenuItem(ContextMenu* subMenu = 0);
ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);
PlatformMenuItemDescription releasePlatformDescription();
Modified: trunk/Source/WebCore/platform/Cursor.h (123674 => 123675)
--- trunk/Source/WebCore/platform/Cursor.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/Cursor.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -75,7 +75,7 @@
~SharedCursor();
HCURSOR nativeCursor() const { return m_nativeCursor; }
private:
- explicit SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) { }
+ SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) { }
HCURSOR m_nativeCursor;
};
typedef RefPtr<SharedCursor> PlatformCursor;
@@ -158,18 +158,18 @@
#if !PLATFORM(IOS)
Cursor(Image*, const IntPoint& hotSpot);
- explicit Cursor(const Cursor&);
+ Cursor(const Cursor&);
~Cursor();
Cursor& operator=(const Cursor&);
#if USE(LAZY_NATIVE_CURSOR)
- explicit Cursor(Type);
+ Cursor(Type);
Type type() const { return m_type; }
Image* image() const { return m_image.get(); }
const IntPoint& hotSpot() const { return m_hotSpot; }
PlatformCursor platformCursor() const;
#else
- explicit Cursor(PlatformCursor);
+ Cursor(PlatformCursor);
PlatformCursor impl() const { return m_platformCursor; }
#endif
Modified: trunk/Source/WebCore/platform/KURL.h (123674 => 123675)
--- trunk/Source/WebCore/platform/KURL.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/KURL.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -69,11 +69,11 @@
// It is usually best to avoid repeatedly parsing a string, unless memory saving outweigh the possible slow-downs.
KURL(ParsedURLStringTag, const String&);
#if USE(GOOGLEURL)
- explicit KURL(WTF::HashTableDeletedValueType) : m_url(WTF::HashTableDeletedValue) { }
+ KURL(WTF::HashTableDeletedValueType) : m_url(WTF::HashTableDeletedValue) { }
#elif USE(WTFURL)
- explicit KURL(WTF::HashTableDeletedValueType) : m_urlImpl(WTF::HashTableDeletedValue) { }
+ KURL(WTF::HashTableDeletedValueType) : m_urlImpl(WTF::HashTableDeletedValue) { }
#else
- explicit KURL(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { }
+ KURL(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { }
#endif
#if !USE(WTFURL)
bool isHashTableDeletedValue() const { return string().isHashTableDeletedValue(); }
@@ -195,7 +195,7 @@
operator const String&() const { return string(); }
#if USE(CF)
- explicit KURL(CFURLRef);
+ KURL(CFURLRef);
CFURLRef createCFURL() const;
#endif
Modified: trunk/Source/WebCore/platform/KURLGooglePrivate.h (123674 => 123675)
--- trunk/Source/WebCore/platform/KURLGooglePrivate.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/KURLGooglePrivate.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -49,8 +49,8 @@
public:
KURLGooglePrivate();
KURLGooglePrivate(const url_parse::Parsed&, bool isValid);
- explicit KURLGooglePrivate(WTF::HashTableDeletedValueType);
- explicit KURLGooglePrivate(const KURLGooglePrivate&);
+ KURLGooglePrivate(WTF::HashTableDeletedValueType);
+ KURLGooglePrivate(const KURLGooglePrivate&);
KURLGooglePrivate& operator=(const KURLGooglePrivate&);
// Initializes the object. This will call through the backend initializer
Modified: trunk/Source/WebCore/platform/PODRedBlackTree.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PODRedBlackTree.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PODRedBlackTree.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -111,7 +111,7 @@
// isInitialized will return false in this case. initIfNeeded can be used
// to init the structure. This constructor is usefull for creating
// lazy initialized tree.
- explicit PODRedBlackTree(UninitializedTreeEnum)
+ PODRedBlackTree(UninitializedTreeEnum)
: m_root(0)
, m_needsFullOrderingComparisons(false)
#ifndef NDEBUG
Modified: trunk/Source/WebCore/platform/Pasteboard.h (123674 => 123675)
--- trunk/Source/WebCore/platform/Pasteboard.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -79,7 +79,7 @@
#if PLATFORM(MAC)
// This is required to support OS X services.
void writeSelectionForTypes(const Vector<String>& pasteboardTypes, bool canSmartCopyOrDelete, Frame*);
- explicit Pasteboard(const String& pasteboardName);
+ Pasteboard(const String& pasteboardName);
static String getStringSelection(Frame*);
static PassRefPtr<SharedBuffer> getDataSelection(Frame*, const String& pasteboardType);
#endif
Modified: trunk/Source/WebCore/platform/PlatformEvent.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformEvent.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformEvent.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -96,7 +96,7 @@
{
}
- explicit PlatformEvent(Type type)
+ PlatformEvent(Type type)
: m_type(type)
, m_modifiers(0)
, m_timestamp(0)
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -170,16 +170,16 @@
#endif
#if PLATFORM(WX)
- explicit PlatformKeyboardEvent(wxKeyEvent&);
+ PlatformKeyboardEvent(wxKeyEvent&);
#endif
#if PLATFORM(BLACKBERRY)
- explicit PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
+ PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
#endif
#if PLATFORM(EFL)
- explicit PlatformKeyboardEvent(const Evas_Event_Key_Down*);
- explicit PlatformKeyboardEvent(const Evas_Event_Key_Up*);
+ PlatformKeyboardEvent(const Evas_Event_Key_Down*);
+ PlatformKeyboardEvent(const Evas_Event_Key_Up*);
#endif
protected:
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -103,8 +103,8 @@
#if PLATFORM(GTK)
- explicit PlatformMouseEvent(GdkEventButton*);
- explicit PlatformMouseEvent(GdkEventMotion*);
+ PlatformMouseEvent(GdkEventButton*);
+ PlatformMouseEvent(GdkEventMotion*);
void setClickCount(int count) { m_clickCount = count; }
#endif
Modified: trunk/Source/WebCore/platform/PlatformPasteboard.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformPasteboard.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformPasteboard.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -42,7 +42,7 @@
class PlatformPasteboard {
public:
- explicit PlatformPasteboard(const String& pasteboardName);
+ PlatformPasteboard(const String& pasteboardName);
static String uniqueName();
void getTypes(Vector<String>& types);
Modified: trunk/Source/WebCore/platform/PlatformTouchEvent.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformTouchEvent.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformTouchEvent.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -63,7 +63,7 @@
#if PLATFORM(EFL)
PlatformTouchEvent(const Eina_List*, const IntPoint, PlatformEvent::Type, PlatformEvent::Modifiers);
#elif PLATFORM(BLACKBERRY)
- explicit PlatformTouchEvent(BlackBerry::Platform::TouchEvent*);
+ PlatformTouchEvent(BlackBerry::Platform::TouchEvent*);
#endif
const Vector<PlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (123674 => 123675)
--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -152,11 +152,11 @@
bool directionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
#if PLATFORM(GTK)
- explicit PlatformWheelEvent(GdkEventScroll*);
+ PlatformWheelEvent(GdkEventScroll*);
#endif
#if PLATFORM(EFL)
- explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
+ PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
#endif
#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
@@ -180,7 +180,7 @@
#endif
#if PLATFORM(HAIKU)
- explicit PlatformWheelEvent(BMessage*);
+ PlatformWheelEvent(BMessage*);
#endif
protected:
Modified: trunk/Source/WebCore/platform/RunLoop.h (123674 => 123675)
--- trunk/Source/WebCore/platform/RunLoop.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/RunLoop.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -67,7 +67,7 @@
class TimerBase {
friend class RunLoop;
public:
- explicit TimerBase(RunLoop*);
+ TimerBase(RunLoop*);
virtual ~TimerBase();
void startRepeating(double repeatInterval) { start(repeatInterval, true); }
Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (123674 => 123675)
--- trunk/Source/WebCore/platform/ScrollAnimator.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -95,7 +95,7 @@
virtual bool isRubberBandInProgress() const { return false; }
protected:
- explicit ScrollAnimator(ScrollableArea*);
+ ScrollAnimator(ScrollableArea*);
virtual void notifyPositionChanged();
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (123674 => 123675)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -53,7 +53,7 @@
class ScrollAnimatorNone : public ScrollAnimator, public PlatformGestureCurveTarget {
public:
- explicit ScrollAnimatorNone(ScrollableArea*);
+ ScrollAnimatorNone(ScrollableArea*);
virtual ~ScrollAnimatorNone();
virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
Modified: trunk/Source/WebCore/platform/SharedBuffer.h (123674 => 123675)
--- trunk/Source/WebCore/platform/SharedBuffer.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -119,7 +119,7 @@
private:
SharedBuffer();
- explicit SharedBuffer(size_t);
+ SharedBuffer(size_t);
SharedBuffer(const char*, int);
SharedBuffer(const unsigned char*, int);
@@ -144,7 +144,7 @@
unsigned copySomeDataFromDataArray(const char*& someData, unsigned position) const;
#endif
#if USE(CF)
- explicit SharedBuffer(CFDataRef);
+ SharedBuffer(CFDataRef);
RetainPtr<CFDataRef> m_cfData;
#endif
};
Modified: trunk/Source/WebCore/platform/WheelFlingPlatformGestureCurve.h (123674 => 123675)
--- trunk/Source/WebCore/platform/WheelFlingPlatformGestureCurve.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/WheelFlingPlatformGestureCurve.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -47,7 +47,7 @@
virtual bool apply(double time, PlatformGestureCurveTarget*);
private:
- explicit WheelFlingPlatformGestureCurve(const FloatPoint& velocity);
+ WheelFlingPlatformGestureCurve(const FloatPoint& velocity);
FloatPoint m_velocity;
IntPoint m_cumulativeScroll;
Modified: trunk/Source/WebCore/platform/Widget.h (123674 => 123675)
--- trunk/Source/WebCore/platform/Widget.h 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/Widget.h 2012-07-25 23:29:00 UTC (rev 123675)
@@ -127,7 +127,7 @@
//
class Widget : public RefCounted<Widget> {
public:
- explicit Widget(PlatformWidget = 0);
+ Widget(PlatformWidget = 0);
virtual ~Widget();
PlatformWidget platformWidget() const;
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (123674 => 123675)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2012-07-25 23:16:10 UTC (rev 123674)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2012-07-25 23:29:00 UTC (rev 123675)
@@ -192,7 +192,7 @@
return;
}
- m_url = KURL(CFURLRequestGetURL(m_cfRequest.get()));
+ m_url = CFURLRequestGetURL(m_cfRequest.get());
m_cachePolicy = (ResourceRequestCachePolicy)CFURLRequestGetCachePolicy(m_cfRequest.get());
m_timeoutInterval = CFURLRequestGetTimeoutInterval(m_cfRequest.get());
