Diff
Modified: trunk/Source/WebKit2/ChangeLog (159195 => 159196)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 16:10:29 UTC (rev 159196)
@@ -1,3 +1,19 @@
+2013-11-13 Anders Carlsson <[email protected]>
+
+ Remove custom overhang area painting code
+ https://bugs.webkit.org/show_bug.cgi?id=124282
+
+ Reviewed by Andreas Kling.
+
+ This code was only used by the Mac port, to draw the linen background color on Lion.
+ We now do that on the GPU instead so get rid of this code.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
2013-11-13 Sergio Correia <[email protected]>
[EFL][WK2] Convert some more OwnPtr/PassOwnPtr to std::unique_ptr
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (159195 => 159196)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-11-13 16:10:29 UTC (rev 159196)
@@ -251,7 +251,6 @@
typedef void (*WKBundlePageWillRunJavaScriptPromptCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void *clientInfo);
typedef void (*WKBundlePageMouseDidMoveOverElementCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKEventModifiers modifiers, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidScrollCallback)(WKBundlePageRef page, const void *clientInfo);
-typedef void (*WKBundlePagePaintCustomOverhangAreaCallback)(WKBundlePageRef page, WKGraphicsContextRef graphicsContext, WKRect horizontalOverhang, WKRect verticalOverhang, WKRect dirtyRect, const void* clientInfo);
typedef WKStringRef (*WKBundlePageGenerateFileForUploadCallback)(WKBundlePageRef page, WKStringRef originalFilePath, const void* clientInfo);
typedef WKBundlePageUIElementVisibility (*WKBundlePageStatusBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
typedef WKBundlePageUIElementVisibility (*WKBundlePageMenuBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo);
@@ -273,10 +272,10 @@
WKBundlePageWillRunJavaScriptPromptCallback willRunJavaScriptPrompt;
WKBundlePageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
WKBundlePageDidScrollCallback pageDidScroll;
- WKBundlePagePaintCustomOverhangAreaCallback paintCustomOverhangArea;
+ void* unused1;
WKBundlePageGenerateFileForUploadCallback shouldGenerateFileForUpload;
WKBundlePageGenerateFileForUploadCallback generateFileForUpload;
- void* unused1;
+ void* unused2;
WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible;
WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible;
WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (159195 => 159196)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp 2013-11-13 16:10:29 UTC (rev 159196)
@@ -87,19 +87,6 @@
m_client.pageDidScroll(toAPI(page), m_client.clientInfo);
}
-bool InjectedBundlePageUIClient::shouldPaintCustomOverhangArea()
-{
- return m_client.paintCustomOverhangArea;
-}
-
-void InjectedBundlePageUIClient::paintCustomOverhangArea(WebPage* page, GraphicsContext* graphicsContext, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
-{
- ASSERT(shouldPaintCustomOverhangArea());
-
- RefPtr<WebGraphicsContext> context = WebGraphicsContext::create(graphicsContext);
- m_client.paintCustomOverhangArea(toAPI(page), toAPI(context.get()), toAPI(horizontalOverhangArea), toAPI(verticalOverhangArea), toAPI(dirtyRect), m_client.clientInfo);
-}
-
String InjectedBundlePageUIClient::shouldGenerateFileForUpload(WebPage* page, const String& originalFilePath)
{
if (!m_client.shouldGenerateFileForUpload)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (159195 => 159196)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2013-11-13 16:10:29 UTC (rev 159196)
@@ -58,9 +58,6 @@
void mouseDidMoveOverElement(WebPage*, const WebCore::HitTestResult&, WebEvent::Modifiers, RefPtr<API::Object>& userData);
void pageDidScroll(WebPage*);
- bool shouldPaintCustomOverhangArea();
- void paintCustomOverhangArea(WebPage*, WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
-
String shouldGenerateFileForUpload(WebPage*, const String& originalFilePath);
String generateFileForUpload(WebPage*, const String& originalFilePath);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (159195 => 159196)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-11-13 16:10:29 UTC (rev 159196)
@@ -654,15 +654,6 @@
return m_page->injectedBundleUIClient().generateFileForUpload(m_page, path);
}
-bool WebChromeClient::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
-{
- if (!m_page->injectedBundleUIClient().shouldPaintCustomOverhangArea())
- return false;
-
- m_page->injectedBundleUIClient().paintCustomOverhangArea(m_page, context, horizontalOverhangArea, verticalOverhangArea, dirtyRect);
- return true;
-}
-
#if ENABLE(INPUT_TYPE_COLOR)
PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (159195 => 159196)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2013-11-13 16:06:53 UTC (rev 159195)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2013-11-13 16:10:29 UTC (rev 159196)
@@ -151,8 +151,6 @@
virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) OVERRIDE;
virtual String generateReplacementFile(const String& path) OVERRIDE;
- virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE;
-
#if ENABLE(INPUT_TYPE_COLOR)
virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
#endif
