Diff
Modified: trunk/Source/WebKit/ios/ChangeLog (208288 => 208289)
--- trunk/Source/WebKit/ios/ChangeLog 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-11-02 17:43:32 UTC (rev 208289)
@@ -1,3 +1,12 @@
+2016-11-01 Alex Christensen <[email protected]>
+
+ Remove PassRefPtr from DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=164307
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebGeolocationProviderIOS.mm:
+
2016-10-26 Dan Bernstein <[email protected]>
Tried to fix the iOS build after r207934.
Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.mm (208288 => 208289)
--- trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.mm 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.mm 2016-11-02 17:43:32 UTC (rev 208289)
@@ -44,7 +44,7 @@
using namespace WebCore;
@interface WebGeolocationPosition (Internal)
-- (id)initWithGeolocationPosition:(PassRefPtr<GeolocationPosition>)coreGeolocationPosition;
+- (id)initWithGeolocationPosition:(RefPtr<GeolocationPosition>)coreGeolocationPosition;
@end
// CoreLocation runs in the main thread. WebGeolocationProviderIOS lives on the WebThread.
Modified: trunk/Source/WebKit/mac/ChangeLog (208288 => 208289)
--- trunk/Source/WebKit/mac/ChangeLog 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-02 17:43:32 UTC (rev 208289)
@@ -1,3 +1,13 @@
+2016-11-01 Alex Christensen <[email protected]>
+
+ Remove PassRefPtr from DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=164307
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebGeolocationPosition.mm:
+ (-[WebGeolocationPosition initWithGeolocationPosition:]):
+
2016-11-02 Romain Bellessort <[email protected]>
[Readable Streams API] Enable creation of ReadableByteStreamController
Modified: trunk/Source/WebKit/mac/WebView/WebGeolocationPosition.mm (208288 => 208289)
--- trunk/Source/WebKit/mac/WebView/WebGeolocationPosition.mm 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Source/WebKit/mac/WebView/WebGeolocationPosition.mm 2016-11-02 17:43:32 UTC (rev 208289)
@@ -71,7 +71,7 @@
return self;
}
-- (id)initWithGeolocationPosition:(PassRefPtr<GeolocationPosition>)coreGeolocationPosition
+- (id)initWithGeolocationPosition:(RefPtr<GeolocationPosition>)coreGeolocationPosition
{
self = [super init];
if (!self)
Modified: trunk/Tools/ChangeLog (208288 => 208289)
--- trunk/Tools/ChangeLog 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/ChangeLog 2016-11-02 17:43:32 UTC (rev 208289)
@@ -1,3 +1,28 @@
+2016-11-01 Alex Christensen <[email protected]>
+
+ Remove PassRefPtr from DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=164307
+
+ Reviewed by Sam Weinig.
+
+ * DumpRenderTree/PixelDumpSupport.h:
+ * DumpRenderTree/TestRunner.cpp:
+ (TestRunner::create):
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
+ (createBitmapContext):
+ * DumpRenderTree/cg/PixelDumpSupportCG.h:
+ (BitmapContext::createByAdoptingBitmapAndContext):
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (createBitmapContextFromWebView):
+ * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+ (createBitmapContextFromWebView):
+ (createPagedBitmapContext):
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ * DumpRenderTree/win/PixelDumpSupportWin.cpp:
+ (createBitmapContextFromWebView):
+ * DumpRenderTree/win/TextInputController.h:
+
2016-11-02 Carlos Garcia Campos <[email protected]>
[GTK] Use GTestDBus instead of dbus-launch in WebKitTestBus.cpp
Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.h (208288 => 208289)
--- trunk/Tools/DumpRenderTree/PixelDumpSupport.h 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.h 2016-11-02 17:43:32 UTC (rev 208289)
@@ -26,20 +26,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef PixelDumpSupport_h
-#define PixelDumpSupport_h
+#pragma once
#include <string>
+#include <wtf/RefPtr.h>
-#include <wtf/PassRefPtr.h>
-
class BitmapContext;
void computeMD5HashStringForBitmapContext(BitmapContext*, char hashString[33]);
-PassRefPtr<BitmapContext> createPagedBitmapContext();
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
+RefPtr<BitmapContext> createPagedBitmapContext();
+RefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
void dumpBitmap(BitmapContext*, const char* checksum);
void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash);
void printPNG(const unsigned char* data, const size_t dataLength, const char* checksum);
-
-#endif // PixelDumpSupport_h
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (208288 => 208289)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-11-02 17:43:32 UTC (rev 208289)
@@ -123,9 +123,9 @@
{
}
-PassRefPtr<TestRunner> TestRunner::create(const std::string& testURL, const std::string& expectedPixelHash)
+Ref<TestRunner> TestRunner::create(const std::string& testURL, const std::string& expectedPixelHash)
{
- return adoptRef(new TestRunner(testURL, expectedPixelHash));
+ return adoptRef(*new TestRunner(testURL, expectedPixelHash));
}
// Static Functions
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (208288 => 208289)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2016-11-02 17:43:32 UTC (rev 208289)
@@ -25,10 +25,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef TestRunner_h
-#define TestRunner_h
+#pragma once
+
#include "UIScriptContext.h"
#include <_javascript_Core/JSObjectRef.h>
#include <map>
@@ -35,13 +34,12 @@
#include <set>
#include <string>
#include <vector>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
class TestRunner : public WTR::UIScriptContextDelegate, public RefCounted<TestRunner> {
WTF_MAKE_NONCOPYABLE(TestRunner);
public:
- static PassRefPtr<TestRunner> create(const std::string& testURL, const std::string& expectedPixelHash);
+ static Ref<TestRunner> create(const std::string& testURL, const std::string& expectedPixelHash);
static const unsigned viewWidth;
static const unsigned viewHeight;
@@ -466,5 +464,3 @@
int m_timeout;
};
-
-#endif // TestRunner_h
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (208288 => 208289)
--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2016-11-02 17:43:32 UTC (rev 208289)
@@ -117,7 +117,7 @@
}
#if PLATFORM(COCOA)
-PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer)
+RefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer)
{
rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h (208288 => 208289)
--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2016-11-02 17:43:32 UTC (rev 208289)
@@ -28,10 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef PixelDumpSupportCG_h
-#define PixelDumpSupportCG_h
+#pragma once
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>
@@ -49,9 +47,9 @@
class BitmapContext : public RefCounted<BitmapContext> {
public:
- static PassRefPtr<BitmapContext> createByAdoptingBitmapAndContext(PlatformBitmapBuffer buffer, CGContextRef context)
+ static Ref<BitmapContext> createByAdoptingBitmapAndContext(PlatformBitmapBuffer buffer, CGContextRef context)
{
- return adoptRef(new BitmapContext(buffer, context));
+ return adoptRef(*new BitmapContext(buffer, context));
}
~BitmapContext()
@@ -80,8 +78,6 @@
};
#if PLATFORM(COCOA)
-PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer);
+RefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer);
#endif
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
-
-#endif // PixelDumpSupportCG_h
+RefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (208288 => 208289)
--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-11-02 17:43:32 UTC (rev 208289)
@@ -48,7 +48,7 @@
extern DumpRenderTreeWindow *gDrtWindow;
extern DumpRenderTreeBrowserView *gWebBrowserView;
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+RefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
{
// TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
BEGIN_BLOCK_OBJC_EXCEPTIONS;
Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (208288 => 208289)
--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2016-11-02 17:43:32 UTC (rev 208289)
@@ -78,7 +78,7 @@
CGContextRestoreGState(context);
}
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+RefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
{
WebView* view = [mainFrame webView];
@@ -174,7 +174,7 @@
return bitmapContext;
}
-PassRefPtr<BitmapContext> createPagedBitmapContext()
+RefPtr<BitmapContext> createPagedBitmapContext()
{
int pageWidthInPixels = TestRunner::viewWidth;
int pageHeightInPixels = TestRunner::viewHeight;
Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (208288 => 208289)
--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-11-02 17:43:32 UTC (rev 208289)
@@ -125,7 +125,7 @@
#endif
@interface WebGeolocationPosition (Internal)
-- (id)initWithGeolocationPosition:(PassRefPtr<WebCore::GeolocationPosition>)coreGeolocationPosition;
+- (id)initWithGeolocationPosition:(RefPtr<WebCore::GeolocationPosition>)coreGeolocationPosition;
@end
TestRunner::~TestRunner()
Modified: trunk/Tools/DumpRenderTree/win/PixelDumpSupportWin.cpp (208288 => 208289)
--- trunk/Tools/DumpRenderTree/win/PixelDumpSupportWin.cpp 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/win/PixelDumpSupportWin.cpp 2016-11-02 17:43:32 UTC (rev 208289)
@@ -54,7 +54,7 @@
}
}
-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+RefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
{
RECT frame;
if (!GetWindowRect(webViewWindow, &frame))
Modified: trunk/Tools/DumpRenderTree/win/TextInputController.h (208288 => 208289)
--- trunk/Tools/DumpRenderTree/win/TextInputController.h 2016-11-02 17:42:41 UTC (rev 208288)
+++ trunk/Tools/DumpRenderTree/win/TextInputController.h 2016-11-02 17:43:32 UTC (rev 208289)
@@ -34,7 +34,6 @@
#include <_javascript_Core/JSStringRef.h>
#include <_javascript_Core/JSValueRef.h>
#include <vector>
-#include <wtf/PassRefPtr.h>
using namespace std;
