Diff
Modified: trunk/LayoutTests/ChangeLog (132297 => 132298)
--- trunk/LayoutTests/ChangeLog 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/LayoutTests/ChangeLog 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1,3 +1,15 @@
+2012-10-23 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r132276.
+ http://trac.webkit.org/changeset/132276
+ https://bugs.webkit.org/show_bug.cgi?id=100189
+
+ It broke the Qt-WK2 build intentionally (Requested by
+ Ossy_night on #webkit).
+
+ * platform/mac/tiled-drawing/use-tiled-drawing-expected.txt: Removed.
+ * platform/mac/tiled-drawing/use-tiled-drawing.html: Removed.
+
2012-10-23 Noel Gordon <noel.gor...@gmail.com>
exif-orientation tests should use dumpAsText(true)
Deleted: trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt (132297 => 132298)
--- trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1,19 +0,0 @@
-(GraphicsLayer
- (bounds 1208.00 2021.00)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (children 1
- (GraphicsLayer
- (bounds 1208.00 2021.00)
- (drawsContent 1)
- (backgroundColor #FFFFFF)
- (visible rect 0.00, 0.00 785.00 x 585.00)
- (tile cache coverage 0, 0 1208 x 1536)
- (children 1
- (GraphicsLayer
- (visible rect 0.00, 0.00 0.00 x 0.00)
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing.html (132297 => 132298)
--- trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing.html 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing.html 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- body {
- width: 1200px;
- height: 2000px;
- }
- </style>
- <script>
- if (window.testRunner)
- testRunner.dumpAsText();
-
- function doTest()
- {
- if (window.internals) {
- document.getElementById('layers').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
- }
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-<pre id="layers">Layer tree goes here</p>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (132297 => 132298)
--- trunk/Source/WebCore/ChangeLog 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/ChangeLog 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1,3 +1,34 @@
+2012-10-23 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r132276.
+ http://trac.webkit.org/changeset/132276
+ https://bugs.webkit.org/show_bug.cgi?id=100189
+
+ It broke the Qt-WK2 build intentionally (Requested by
+ Ossy_night on #webkit).
+
+ * page/Frame.h:
+ * platform/graphics/GraphicsLayer.cpp:
+ (showGraphicsLayerTree):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::tiledBacking):
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::tiledBacking):
+ (WebCore::GraphicsLayerCA::dumpAdditionalProperties):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ (GraphicsLayerCA):
+ * platform/graphics/ca/mac/TileCache.h:
+ * platform/graphics/ca/mac/TileCache.mm:
+ (WebCore::TileCache::tileCoverageRect):
+ (WebCore::TileCache::revalidateTiles):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::layerTreeAsText):
+ * testing/Internals.cpp:
+ (WebCore::Internals::layerTreeAsText):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
2012-10-23 Philip Rogers <p...@google.com>
Add extra check for data() in PageSerializer.
Modified: trunk/Source/WebCore/page/Frame.h (132297 => 132298)
--- trunk/Source/WebCore/page/Frame.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/page/Frame.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -78,8 +78,7 @@
enum {
LayerTreeFlagsIncludeDebugInfo = 1 << 0,
- LayerTreeFlagsIncludeVisibleRects = 1 << 1,
- LayerTreeFlagsIncludeTileCaches = 1 << 2
+ LayerTreeFlagsIncludeVisibleRects = 1 << 2
};
typedef unsigned LayerTreeFlags;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -692,7 +692,7 @@
if (!layer)
return;
- String output = layer->layerTreeAsText(LayerTreeAsTextDebug | LayerTreeAsTextIncludeVisibleRects | LayerTreeAsTextIncludeTileCaches);
+ String output = layer->layerTreeAsText(LayerTreeAsTextDebug | LayerTreeAsTextIncludeVisibleRects);
fprintf(stderr, "%s\n", output.utf8().data());
}
#endif
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -48,7 +48,6 @@
LayerTreeAsTextBehaviorNormal = 0,
LayerTreeAsTextDebug = 1 << 0, // Dump extra debugging info like layer addresses.
LayerTreeAsTextIncludeVisibleRects = 1 << 1,
- LayerTreeAsTextIncludeTileCaches = 1 << 2
};
typedef unsigned LayerTreeAsTextBehavior;
@@ -402,7 +401,7 @@
bool usingTiledLayer() const { return m_usingTiledLayer; }
- virtual TiledBacking* tiledBacking() const { return 0; }
+ virtual TiledBacking* tiledBacking() { return 0; }
#if PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
// This allows several alternative GraphicsLayer implementations in the same port,
Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -54,10 +54,6 @@
virtual void setScrollingPerformanceLoggingEnabled(bool) = 0;
virtual bool scrollingPerformanceLoggingEnabled() const = 0;
-
- // Exposed for testing
- virtual IntRect tileCoverageRect() const = 0;
-
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -910,7 +910,7 @@
commitLayerChangesAfterSublayers();
}
-TiledBacking* GraphicsLayerCA::tiledBacking() const
+TiledBacking* GraphicsLayerCA::tiledBacking()
{
return m_layer->tiledBacking();
}
@@ -2522,12 +2522,6 @@
writeIndent(textStream, indent + 1);
textStream << "(visible rect " << m_visibleRect.x() << ", " << m_visibleRect.y() << " " << m_visibleRect.width() << " x " << m_visibleRect.height() << ")\n";
}
-
- if (tiledBacking() && (behavior & LayerTreeAsTextIncludeTileCaches)) {
- writeIndent(textStream, indent + 1);
- IntRect tileCoverageRect = tiledBacking()->tileCoverageRect();
- textStream << "(tile cache coverage " << tileCoverageRect.x() << ", " << tileCoverageRect.y() << " " << tileCoverageRect.width() << " x " << tileCoverageRect.height() << ")\n";
- }
}
void GraphicsLayerCA::setDebugBorder(const Color& color, float borderWidth)
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -134,7 +134,7 @@
virtual void flushCompositingState(const FloatRect&);
virtual void flushCompositingStateForThisLayerOnly();
- virtual TiledBacking* tiledBacking() const OVERRIDE;
+ virtual TiledBacking* tiledBacking() OVERRIDE;
bool allowTiledLayer() const { return m_allowTiledLayer; }
virtual void setAllowTiledLayer(bool b);
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -89,8 +89,6 @@
virtual void forceRepaint() OVERRIDE;
virtual void setScrollingPerformanceLoggingEnabled(bool flag) OVERRIDE { m_scrollingPerformanceLoggingEnabled = flag; }
virtual bool scrollingPerformanceLoggingEnabled() const OVERRIDE { return m_scrollingPerformanceLoggingEnabled; }
-
- virtual IntRect tileCoverageRect() const { return m_tileCoverageRect; }
IntRect bounds() const;
@@ -98,7 +96,7 @@
IntRect rectForTileIndex(const TileIndex&) const;
void getTileIndexRangeForRect(const IntRect&, TileIndex& topLeft, TileIndex& bottomRight);
- IntRect computeTileCoverageRect() const;
+ IntRect tileCoverageRect() const;
void scheduleTileRevalidation(double interval);
void tileRevalidationTimerFired(Timer<TileCache>*);
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm (132297 => 132298)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm 2012-10-24 04:12:26 UTC (rev 132298)
@@ -304,7 +304,7 @@
bottomRight.setY(max(clampedRect.maxY() / m_tileSize.height(), 0));
}
-IntRect TileCache::computeTileCoverageRect() const
+IntRect TileCache::tileCoverageRect() const
{
IntRect tileCoverageRect = m_visibleRect;
@@ -377,7 +377,7 @@
if (m_visibleRect.isEmpty() || bounds().isEmpty())
return;
- IntRect tileCoverageRect = computeTileCoverageRect();
+ IntRect tileCoverageRect = this->tileCoverageRect();
Vector<TileIndex> tilesToRemove;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (132297 => 132298)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1137,9 +1137,7 @@
layerTreeBehavior |= LayerTreeAsTextDebug;
if (flags & LayerTreeFlagsIncludeVisibleRects)
layerTreeBehavior |= LayerTreeAsTextIncludeVisibleRects;
- if (flags & LayerTreeFlagsIncludeTileCaches)
- layerTreeBehavior |= LayerTreeAsTextIncludeTileCaches;
-
+
// We skip dumping the scroll and clip layers to keep layerTreeAsText output
// similar between platforms.
return m_rootContentLayer->layerTreeAsText(layerTreeBehavior);
Modified: trunk/Source/WebCore/testing/Internals.cpp (132297 => 132298)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1237,8 +1237,6 @@
LayerTreeFlags layerTreeFlags = 0;
if (flags & LAYER_TREE_INCLUDES_VISIBLE_RECTS)
layerTreeFlags |= LayerTreeFlagsIncludeVisibleRects;
- if (flags & LAYER_TREE_INCLUDES_TILE_CACHES)
- layerTreeFlags |= LayerTreeFlagsIncludeTileCaches;
return document->frame()->layerTreeAsText(layerTreeFlags);
}
Modified: trunk/Source/WebCore/testing/Internals.h (132297 => 132298)
--- trunk/Source/WebCore/testing/Internals.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/testing/Internals.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -188,10 +188,7 @@
void resumeAnimations(Document*, ExceptionCode&) const;
enum {
- // Values need to be kept in sync with Internals.idl.
- LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1,
- LAYER_TREE_INCLUDES_TILE_CACHES = 2
-
+ LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1 // Values need to kept in sync with Internals.idl.
};
String layerTreeAsText(Document*, unsigned flags, ExceptionCode&) const;
String layerTreeAsText(Document*, ExceptionCode&) const;
Modified: trunk/Source/WebCore/testing/Internals.idl (132297 => 132298)
--- trunk/Source/WebCore/testing/Internals.idl 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-10-24 04:12:26 UTC (rev 132298)
@@ -158,7 +158,6 @@
// Flags for layerTreeAsText.
const unsigned short LAYER_TREE_INCLUDES_VISIBLE_RECTS = 1;
- const unsigned short LAYER_TREE_INCLUDES_TILE_CACHES = 2;
DOMString layerTreeAsText(in Document document, in [Optional] unsigned short flags) raises (DOMException);
void garbageCollectDocumentResources(in Document document) raises (DOMException);
Modified: trunk/Tools/ChangeLog (132297 => 132298)
--- trunk/Tools/ChangeLog 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/ChangeLog 2012-10-24 04:12:26 UTC (rev 132298)
@@ -1,3 +1,32 @@
+2012-10-23 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r132276.
+ http://trac.webkit.org/changeset/132276
+ https://bugs.webkit.org/show_bug.cgi?id=100189
+
+ It broke the Qt-WK2 build intentionally (Requested by
+ Ossy_night on #webkit).
+
+ * WebKitTestRunner/PlatformWebView.h:
+ (PlatformWebView):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+ * WebKitTestRunner/TestController.h:
+ (TestController):
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR):
+ (WTR::TestInvocation::invoke):
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/win/PlatformWebViewWin.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+
2012-10-23 Martin Robinson <mrobin...@igalia.com>
[GTK][Soup] Implement the default authentication dialog via WebCoreSupport
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -64,7 +64,7 @@
class PlatformWebView {
public:
- PlatformWebView(WKContextRef, WKPageGroupRef, WKDictionaryRef options = 0);
+ PlatformWebView(WKContextRef, WKPageGroupRef);
~PlatformWebView();
WKPageRef page();
@@ -88,13 +88,7 @@
void makeWebViewFirstResponder();
void setWindowIsKey(bool isKey) { m_windowIsKey = isKey; }
bool windowIsKey() const { return m_windowIsKey; }
-
-#if PLATFORM(MAC)
- bool viewSupportsOptions(WKDictionaryRef) const;
-#else
- bool viewSupportsOptions(WKDictionaryRef) const { return true; }
-#endif
-
+
WKRetainPtr<WKImageRef> windowSnapshotImage();
private:
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -343,12 +343,8 @@
if (testPluginDirectory())
WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory());
- createWebViewWithOptions(0);
-}
+ m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get()));
-void TestController::createWebViewWithOptions(WKDictionaryRef options)
-{
- m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get(), options));
WKPageUIClient pageUIClient = {
kWKPageUIClientCurrentVersion,
m_mainWebView.get(),
@@ -450,21 +446,6 @@
WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient);
}
-void TestController::ensureViewSupportsOptions(WKDictionaryRef options)
-{
- if (m_mainWebView && !m_mainWebView->viewSupportsOptions(options)) {
- WKPageSetPageUIClient(m_mainWebView->page(), 0);
- WKPageSetPageLoaderClient(m_mainWebView->page(), 0);
- WKPageSetPagePolicyClient(m_mainWebView->page(), 0);
- WKPageClose(m_mainWebView->page());
-
- m_mainWebView = nullptr;
-
- createWebViewWithOptions(options);
- resetStateToConsistentValues();
- }
-}
-
bool TestController::resetStateToConsistentValues()
{
m_state = Resetting;
Modified: trunk/Tools/WebKitTestRunner/TestController.h (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/TestController.h 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2012-10-24 04:12:26 UTC (rev 132298)
@@ -57,8 +57,6 @@
PlatformWebView* mainWebView() { return m_mainWebView.get(); }
WKContextRef context() { return m_context.get(); }
- void ensureViewSupportsOptions(WKDictionaryRef options);
-
// Runs the run loop until `done` is true or the timeout elapses.
enum TimeoutDuration { ShortTimeout, LongTimeout, NoTimeout };
bool useWaitToDumpWatchdogTimer() { return m_useWaitToDumpWatchdogTimer; }
@@ -85,7 +83,6 @@
private:
void initialize(int argc, const char* argv[]);
- void createWebViewWithOptions(WKDictionaryRef);
void run();
void runTestingServerLoop();
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -143,31 +143,9 @@
}
#endif
-#if PLATFORM(MAC)
-static bool shouldUseTiledDrawing(const char* pathOrURL)
-{
- return strstr(pathOrURL, "tiled-drawing/") || strstr(pathOrURL, "tiled-drawing\\");
-}
-#endif
-
-static void updateTiledDrawingForCurrentTest(const char* pathOrURL)
-{
-#if PLATFORM(MAC)
- WKRetainPtr<WKMutableDictionaryRef> viewOptions = adoptWK(WKMutableDictionaryCreate());
- WKRetainPtr<WKStringRef> useTiledDrawingKey = adoptWK(WKStringCreateWithUTF8CString("TiledDrawing"));
- WKRetainPtr<WKBooleanRef> useTiledDrawingValue = adoptWK(WKBooleanCreate(shouldUseTiledDrawing(pathOrURL)));
- WKDictionaryAddItem(viewOptions.get(), useTiledDrawingKey.get(), useTiledDrawingValue.get());
-
- TestController::shared().ensureViewSupportsOptions(viewOptions.get());
-#else
- UNUSED_PARAM(pathOrURL);
-#endif
-}
-
void TestInvocation::invoke()
{
sizeWebViewForCurrentTest(m_pathOrURL.c_str());
- updateTiledDrawingForCurrentTest(m_pathOrURL.c_str());
WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("BeginTest"));
WKRetainPtr<WKMutableDictionaryRef> beginTestMessageBody = adoptWK(WKMutableDictionaryCreate());
Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -40,7 +40,7 @@
return ecoreEvas;
}
-PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKDictionaryRef /*options*/)
+PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup)
{
m_window = initEcoreEvas();
Evas* evas = ecore_evas_get(m_window);
Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -33,7 +33,7 @@
namespace WTR {
-PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKDictionaryRef /*options*/)
+PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup)
: m_view(WKViewCreate(context, pageGroup))
, m_window(gtk_window_new(GTK_WINDOW_POPUP))
, m_windowIsKey(true)
Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2012-10-24 04:12:26 UTC (rev 132298)
@@ -25,7 +25,6 @@
#include "config.h"
#include "PlatformWebView.h"
-#include "TestController.h"
#import <WebKit2/WKImageCG.h>
#import <WebKit2/WKViewPrivate.h>
@@ -38,32 +37,6 @@
@property (nonatomic, assign) WTR::PlatformWebView* platformWebView;
@end
-@interface TestRunnerWKView : WKView {
- BOOL _useTiledDrawing;
-}
-
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)context pageGroupRef:(WKPageGroupRef)pageGroup useTiledDrawing:(BOOL)useTiledDrawing;
-
-@property (nonatomic, assign) BOOL useTiledDrawing;
-@end
-
-@implementation TestRunnerWKView
-
-@synthesize useTiledDrawing = _useTiledDrawing;
-
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)context pageGroupRef:(WKPageGroupRef)pageGroup useTiledDrawing:(BOOL)useTiledDrawing
-{
- _useTiledDrawing = useTiledDrawing;
- return [super initWithFrame:frame contextRef:context pageGroupRef:pageGroup];
-}
-
-- (BOOL)_shouldUseTiledDrawingArea
-{
- return _useTiledDrawing;
-}
-
-@end
-
@implementation WebKitTestRunnerWindow
@synthesize platformWebView = _platformWebView;
@@ -105,14 +78,11 @@
namespace WTR {
-PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKDictionaryRef options)
+PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
: m_windowIsKey(true)
{
- WKRetainPtr<WKStringRef> useTiledDrawingKey(AdoptWK, WKStringCreateWithUTF8CString("TiledDrawing"));
- bool useTiledDrawing = options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useTiledDrawingKey.get()))) : false;
-
NSRect rect = NSMakeRect(0, 0, 800, 600);
- m_view = [[TestRunnerWKView alloc] initWithFrame:rect contextRef:contextRef pageGroupRef:pageGroupRef useTiledDrawing:useTiledDrawing];
+ m_view = [[WKView alloc] initWithFrame:rect contextRef:contextRef pageGroupRef:pageGroupRef];
NSRect windowRect = NSOffsetRect(rect, -10000, [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
m_window = [[WebKitTestRunnerWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
@@ -198,12 +168,4 @@
return adoptWK(WKImageCreateFromCGImage(windowSnapshotImage.get(), 0));
}
-bool PlatformWebView::viewSupportsOptions(WKDictionaryRef options) const
-{
- WKRetainPtr<WKStringRef> useTiledDrawingKey(AdoptWK, WKStringCreateWithUTF8CString("TiledDrawing"));
- bool useTiledDrawing = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useTiledDrawingKey.get())));
-
- return useTiledDrawing == [(TestRunnerWKView *)m_view useTiledDrawing];
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -79,7 +79,7 @@
QQuickWebView* m_view;
};
-PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKDictionaryRef /*options*/)
+PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
: m_view(new QQuickWebView(contextRef, pageGroupRef))
, m_window(new WrapperWindow(m_view))
, m_windowIsKey(true)
Modified: trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp (132297 => 132298)
--- trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp 2012-10-24 04:09:15 UTC (rev 132297)
+++ trunk/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp 2012-10-24 04:12:26 UTC (rev 132298)
@@ -48,7 +48,7 @@
RegisterClassExW(&wndClass);
}
-PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKDictionaryRef /*options*/)
+PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
: m_windowIsKey(true)
{
registerWindowClass();
