Diff
Modified: trunk/Source/WebCore/ChangeLog (150352 => 150353)
--- trunk/Source/WebCore/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebCore/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,17 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * loader/EmptyClients.h:
+ * page/ChromeClient.h:
+ (ChromeClient):
+
2013-05-19 Darin Adler <[email protected]>
Eliminate the Editor::newGeneralClipboard function
Modified: trunk/Source/WebCore/loader/EmptyClients.h (150352 => 150353)
--- trunk/Source/WebCore/loader/EmptyClients.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -66,7 +66,6 @@
virtual ~EmptyChromeClient() { }
virtual void chromeDestroyed() { }
- virtual void* webView() const { return 0; }
virtual void setWindowRect(const FloatRect&) { }
virtual FloatRect windowRect() { return FloatRect(); }
Modified: trunk/Source/WebCore/page/ChromeClient.h (150352 => 150353)
--- trunk/Source/WebCore/page/ChromeClient.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebCore/page/ChromeClient.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -144,8 +144,6 @@
virtual bool shouldInterruptJavaScript() = 0;
virtual KeyboardUIMode keyboardUIMode() = 0;
- virtual void* webView() const = 0;
-
virtual IntRect windowResizerRect() const = 0;
// Methods used by HostWindow.
Modified: trunk/Source/WebKit/blackberry/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,15 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Andreas Kling.
+
+ This blatantly horrible layer violation was only used by the Chromium port; get rid of it.
+
+ * WebCoreSupport/ChromeClientBlackBerry.h:
+ (ChromeClientBlackBerry):
+
2013-05-17 Carlos Garcia Campos <[email protected]>
[BlackBerry] REGRESSION(r150060): Crash in LayerWebKitThread::updateTextureContents
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h (150352 => 150353)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -36,7 +36,6 @@
ChromeClientBlackBerry(BlackBerry::WebKit::WebPagePrivate*);
virtual void chromeDestroyed();
- virtual void* webView() const { return 0; };
virtual void setWindowRect(const FloatRect&);
virtual FloatRect windowRect();
virtual FloatRect pageRect();
Modified: trunk/Source/WebKit/efl/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/efl/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/efl/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/ChromeClientEfl.h:
+ (ChromeClientEfl):
+
2013-05-18 Patrick Gansterer <[email protected]>
[CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h (150352 => 150353)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -45,7 +45,6 @@
virtual void chromeDestroyed();
- virtual void* webView() const { return 0; }
virtual void setWindowRect(const FloatRect&);
virtual FloatRect windowRect();
Modified: trunk/Source/WebKit/gtk/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/ChromeClientGtk.h:
+ (ChromeClient):
+
2013-05-18 Carlos Garcia Campos <[email protected]>
[GTK] Move GTK port off legacy clipboard
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h (150352 => 150353)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -43,7 +43,6 @@
class ChromeClient : public WebCore::ChromeClient {
public:
ChromeClient(WebKitWebView*);
- virtual void* webView() const { return m_webView; }
GtkAdjustmentWatcher* adjustmentWatcher() { return &m_adjustmentWatcher; }
virtual void chromeDestroyed();
@@ -163,6 +162,8 @@
void forcePaint();
void widgetSizeChanged(const IntSize& oldWidgetSize, IntSize newSize);
+ WebKitWebView* webView() { return m_webView; }
+
private:
WebKitWebView* m_webView;
GtkAdjustmentWatcher m_adjustmentWatcher;
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (150352 => 150353)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-05-19 20:38:28 UTC (rev 150353)
@@ -5537,8 +5537,11 @@
if (!corePage)
return 0;
- WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome().client());
- return client ? static_cast<WebKitWebView*>(client->webView()) : 0;
+ WebCore::ChromeClient* chromeClient = corePage->chrome().client();
+ if (chromeClient->isEmptyChromeClient())
+ return 0;
+
+ return static_cast<WebKit::ChromeClient*>(chromeClient)->webView();
}
}
Modified: trunk/Source/WebKit/mac/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient):
+
2013-05-17 Anders Carlsson <[email protected]>
Accessing null function pointers is bad.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (150352 => 150353)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -36,7 +36,6 @@
class WebChromeClient : public WebCore::ChromeClient {
public:
WebChromeClient(WebView*);
- virtual void* webView() const { return static_cast<void*>(m_webView); }
virtual void chromeDestroyed() OVERRIDE;
@@ -183,6 +182,9 @@
virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE { }
virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE { return false; }
+
+ WebView* webView() { return m_webView; }
+
private:
WebView *m_webView;
};
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (150352 => 150353)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-05-19 20:38:28 UTC (rev 150353)
@@ -243,7 +243,14 @@
WebView *kit(Page* page)
{
- return page ? static_cast<WebView*>(page->chrome().client()->webView()) : nil;
+ if (!page)
+ return nil;
+
+ ChromeClient* chromeClient = page->chrome().client();
+ if (chromeClient->isEmptyChromeClient())
+ return nil;
+
+ return static_cast<WebChromeClient*>(chromeClient)->webView();
}
WebView *getWebView(WebFrame *webFrame)
Modified: trunk/Source/WebKit/qt/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/qt/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/ChromeClientQt.h:
+ (ChromeClientQt):
+
2013-05-18 Tim Horton <[email protected]>
[Qt] REGRESSION(r150227): It made zillion tests crash under PlatformStrategiesQt::getPluginInfo
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (150352 => 150353)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -66,7 +66,6 @@
virtual ~ChromeClientQt();
virtual void chromeDestroyed();
- virtual void* webView() const { return 0; }
virtual void setWindowRect(const FloatRect&);
virtual FloatRect windowRect();
Modified: trunk/Source/WebKit/win/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/win/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/win/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient):
+
2013-05-16 Tim Horton <[email protected]>
PDFPlugins don't load when plugins are disabled, but they should
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (150352 => 150353)
--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -43,8 +43,6 @@
virtual void chromeDestroyed();
- virtual void* webView() const { return m_webView; }
-
virtual void setWindowRect(const WebCore::FloatRect&);
virtual WebCore::FloatRect windowRect();
@@ -174,6 +172,8 @@
virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const { return true; }
virtual void numWheelEventHandlersChanged(unsigned) { }
+ WebView* webView() { return m_webView; }
+
private:
COMPtr<IWebUIDelegate> uiDelegate();
Modified: trunk/Source/WebKit/win/WebView.cpp (150352 => 150353)
--- trunk/Source/WebKit/win/WebView.cpp 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-05-19 20:38:28 UTC (rev 150353)
@@ -199,7 +199,14 @@
WebView* kit(Page* page)
{
- return page ? static_cast<WebView*>(static_cast<WebChromeClient*>(page->chrome().client())->webView()) : 0;
+ if (!page)
+ return 0;
+
+ ChromeClient* chromeClient = page->chrome().client();
+ if (chromeClient->isEmptyChromeClient())
+ return 0;
+
+ return static_cast<WebChromeClient*>(chromeClient)->webView();
}
static inline AtomicString toAtomicString(BSTR bstr)
Modified: trunk/Source/WebKit/wince/ChangeLog (150352 => 150353)
--- trunk/Source/WebKit/wince/ChangeLog 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/wince/ChangeLog 2013-05-19 20:38:28 UTC (rev 150353)
@@ -1,3 +1,16 @@
+2013-05-19 Anders Carlsson <[email protected]>
+
+ Remove ChromeClient::webView()
+ https://bugs.webkit.org/show_bug.cgi?id=116054
+
+ Reviewed by Darin Adler.
+
+ This blatantly horrible layer violation was only used to know if a ChromeClient is an empty
+ client or not. We already have a (slightly less horrible) way to do that.
+
+ * WebCoreSupport/ChromeClientWinCE.h:
+ (ChromeClientWinCE):
+
2013-05-13 Anders Carlsson <[email protected]>
Frame::editor() should return a reference
Modified: trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h (150352 => 150353)
--- trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2013-05-19 18:40:28 UTC (rev 150352)
+++ trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h 2013-05-19 20:38:28 UTC (rev 150353)
@@ -37,7 +37,6 @@
virtual void chromeDestroyed();
- virtual void* webView() const { return 0; }
virtual void setWindowRect(const WebCore::FloatRect&);
virtual WebCore::FloatRect windowRect();
