diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 4b5244211..00625cdef 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -61,7 +61,6 @@ #include "FrameView.h" #include "GOwnPtrGtk.h" #include "GeolocationClientGtk.h" -#include "GeolocationClientMock.h" #include "GeolocationController.h" #include "GraphicsContext.h" #include "GtkUtilities.h" @@ -678,8 +677,8 @@ static gboolean webkit_web_view_draw(GtkWidget* widget, cairo_t* cr) return FALSE; WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv; -#if USE(TEXTURE_MAPPER_GL) - if (priv->acceleratedCompositingContext->renderLayersToWindow(clipRect)) +#if USE(TEXTURE_MAPPER) + if (priv->acceleratedCompositingContext->renderLayersToWindow(cr, clipRect)) return FALSE; #endif @@ -3539,9 +3538,9 @@ static void webkit_web_view_init(WebKitWebView* webView) #if ENABLE(GEOLOCATION) if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) { - GeolocationClientMock* mock = new GeolocationClientMock; - WebCore::provideGeolocationTo(priv->corePage, mock); - mock->setController(GeolocationController::from(priv->corePage)); + priv->geolocationClientMock = adoptPtr(new GeolocationClientMock); + WebCore::provideGeolocationTo(priv->corePage, priv->geolocationClientMock.get()); + priv->geolocationClientMock.get()->setController(GeolocationController::from(priv->corePage)); } else WebCore::provideGeolocationTo(priv->corePage, new WebKit::GeolocationClient(webView)); #endif |