diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/src/ChromeClientImpl.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/src/ChromeClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/ChromeClientImpl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp index 985757783..9d0961c46 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp +++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp @@ -63,7 +63,6 @@ #include "Page.h" #include "PagePopupDriver.h" #include "PlatformScreen.h" -#include "PlatformSupport.h" #include "PopupContainer.h" #include "PopupMenuChromium.h" #include "RenderWidget.h" @@ -90,16 +89,16 @@ #include "WebPopupMenuImpl.h" #include "WebPopupMenuInfo.h" #include "WebPopupType.h" -#include "platform/WebRect.h" #include "WebSettings.h" #include "WebTextDirection.h" -#include "platform/WebURLRequest.h" #include "WebViewClient.h" #include "WebViewImpl.h" #include "WebWindowFeatures.h" #include "WindowFeatures.h" #include "WrappedResourceRequest.h" #include <public/Platform.h> +#include <public/WebRect.h> +#include <public/WebURLRequest.h> #include <wtf/text/CString.h> #include <wtf/text/StringBuilder.h> #include <wtf/text/StringConcatenate.h> @@ -918,7 +917,7 @@ void ChromeClientImpl::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* grap m_webView->setRootGraphicsLayer(graphicsLayer); } -void ChromeClientImpl::scheduleCompositingLayerSync() +void ChromeClientImpl::scheduleCompositingLayerFlush() { m_webView->scheduleCompositingLayerSync(); } @@ -1120,8 +1119,8 @@ bool ChromeClientImpl::isPointerLocked() } #endif -#if ENABLE(WIDGET_REGION) -void ChromeClientImpl::dashboardRegionsChanged() +#if ENABLE(DRAGGABLE_REGION) +void ChromeClientImpl::annotatedRegionsChanged() { WebViewClient* client = m_webView->client(); if (client) |