[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
andersca at apple.com
andersca at apple.com
Thu Apr 8 02:19:49 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 470d7e21c401c72e6320d2f6e279b74fd7e248ca
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 12 00:09:17 2010 +0000
Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
Reviewed by David Hyatt.
WebCore:
* loader/EmptyClients.h:
* page/Chrome.cpp:
* page/Chrome.h:
* page/ChromeClient.h:
* platform/HostWindow.h:
WebKit/chromium:
* src/ChromeClientImpl.cpp:
* src/ChromeClientImpl.h:
WebKit/gtk:
* WebCoreSupport/ChromeClientGtk.cpp:
* WebCoreSupport/ChromeClientGtk.h:
WebKit/haiku:
* WebCoreSupport/ChromeClientHaiku.cpp:
* WebCoreSupport/ChromeClientHaiku.h:
WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
WebKit/qt:
* WebCoreSupport/ChromeClientQt.cpp:
* WebCoreSupport/ChromeClientQt.h:
WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
* WebCoreSupport/WebChromeClient.h:
WebKit/wx:
* WebKitSupport/ChromeClientWx.cpp:
* WebKitSupport/ChromeClientWx.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b5b8324..2b1259d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * loader/EmptyClients.h:
+ * page/Chrome.cpp:
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+ * platform/HostWindow.h:
+
2010-03-11 Nate Chapin <japhet at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index 6a2ecd5..a267374 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -114,7 +114,6 @@ public:
virtual IntRect windowResizerRect() const { return IntRect(); }
- virtual void invalidateContents(const IntRect&, bool) { }
virtual void invalidateWindow(const IntRect&, bool) { }
virtual void invalidateContentsAndWindow(const IntRect&, bool) { }
virtual void invalidateContentsForSlowScroll(const IntRect&, bool) {};
diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index 771df87..2f3078c 100644
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -67,11 +67,6 @@ Chrome::~Chrome()
m_client->chromeDestroyed();
}
-void Chrome::invalidateContents(const IntRect& updateRect, bool immediate)
-{
- m_client->invalidateContents(updateRect, immediate);
-}
-
void Chrome::invalidateWindow(const IntRect& updateRect, bool immediate)
{
m_client->invalidateWindow(updateRect, immediate);
diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index 279a7f8..3adf25d 100644
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -61,7 +61,6 @@ namespace WebCore {
// HostWindow methods.
- virtual void invalidateContents(const IntRect&, bool);
virtual void invalidateWindow(const IntRect&, bool);
virtual void invalidateContentsAndWindow(const IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index fcc8770..e4bc8d1 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -129,7 +129,6 @@ namespace WebCore {
virtual IntRect windowResizerRect() const = 0;
// Methods used by HostWindow.
- virtual void invalidateContents(const IntRect&, bool) = 0;
virtual void invalidateWindow(const IntRect&, bool) = 0;
virtual void invalidateContentsAndWindow(const IntRect&, bool) = 0;
virtual void invalidateContentsForSlowScroll(const IntRect&, bool) = 0;
diff --git a/WebCore/platform/HostWindow.h b/WebCore/platform/HostWindow.h
index 97abf87..dc681a1 100644
--- a/WebCore/platform/HostWindow.h
+++ b/WebCore/platform/HostWindow.h
@@ -35,9 +35,6 @@ class HostWindow : public Noncopyable {
public:
virtual ~HostWindow() { }
- // Requests the host invalidate the contents, not the window. If immediate is true do so synchronously, otherwise async.
- virtual void invalidateContents(const IntRect& updateRect, bool immediate) = 0;
-
// Requests the host invalidate the window, not the contents. If immediate is true do so synchronously, otherwise async.
virtual void invalidateWindow(const IntRect& updateRect, bool immediate) = 0;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 44a93ee..8bbdb4e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * src/ChromeClientImpl.cpp:
+ * src/ChromeClientImpl.h:
+
2010-03-10 Darin Fisher <darin at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index efd2d38..6e899bd 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -466,11 +466,6 @@ IntRect ChromeClientImpl::windowResizerRect() const
return result;
}
-void ChromeClientImpl::invalidateContents(const IntRect&, bool)
-{
- notImplemented();
-}
-
void ChromeClientImpl::invalidateWindow(const IntRect&, bool)
{
notImplemented();
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index a369f49..cb53f69 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -96,7 +96,6 @@ public:
virtual bool shouldInterruptJavaScript();
virtual bool tabsToLinks() const;
virtual WebCore::IntRect windowResizerRect() const;
- virtual void invalidateContents(const WebCore::IntRect&, bool);
virtual void invalidateWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 9add6e2..2a289e2 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ * WebCoreSupport/ChromeClientGtk.h:
+
2010-03-09 Philippe Normand <pnormand at igalia.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 514b09a..c63a03b 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -342,11 +342,6 @@ IntRect ChromeClient::windowResizerRect() const
return IntRect();
}
-void ChromeClient::invalidateContents(const IntRect&, bool)
-{
- notImplemented();
-}
-
void ChromeClient::invalidateWindow(const IntRect&, bool)
{
notImplemented();
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
index 503f66f..90f2d48 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -87,7 +87,6 @@ namespace WebKit {
virtual WebCore::IntRect windowResizerRect() const;
- virtual void invalidateContents(const WebCore::IntRect&, bool);
virtual void invalidateWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index 0b57a59..1c6870a 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebCoreSupport/ChromeClientHaiku.cpp:
+ * WebCoreSupport/ChromeClientHaiku.h:
+
2010-03-02 Adam Treat <atreat at rim.com>
Reviewed by Dave Hyatt.
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
index cd8f1f4..172137d 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
@@ -253,11 +253,6 @@ IntRect ChromeClientHaiku::windowResizerRect() const
return IntRect();
}
-void ChromeClientHaiku::invalidateContents(const IntRect&, bool)
-{
- notImplemented();
-}
-
void ChromeClientHaiku::invalidateWindow(const IntRect&, bool)
{
notImplemented();
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index 990f3f0..838a579 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -102,7 +102,6 @@ namespace WebCore {
bool tabsToLinks() const;
IntRect windowResizerRect() const;
- void invalidateContents(const IntRect&, bool);
void invalidateWindow(const IntRect&, bool);
void invalidateContentsAndWindow(const IntRect&, bool);
void invalidateContentsForSlowScroll(const IntRect&, bool);
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b96208b..97dd5ae 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+
2010-03-11 Alexey Proskuryakov <ap at apple.com>
Reviewed by Geoff Garen.
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.h b/WebKit/mac/WebCoreSupport/WebChromeClient.h
index 85267d5..730d0ee 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.h
@@ -91,7 +91,6 @@ public:
virtual WebCore::IntRect windowResizerRect() const;
- virtual void invalidateContents(const WebCore::IntRect&, bool);
virtual void invalidateWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index da6c15c..8d65f49 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -439,10 +439,6 @@ IntRect WebChromeClient::windowResizerRect() const
return enclosingIntRect([m_webView convertRect:rect fromView:nil]);
}
-void WebChromeClient::invalidateContents(const IntRect&, bool)
-{
-}
-
void WebChromeClient::invalidateWindow(const IntRect&, bool immediate)
{
if (immediate) {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4c2f4e1..81f91c3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ * WebCoreSupport/ChromeClientQt.h:
+
2010-03-10 Robert Hogan <robert at webkit.org>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 6f682c3..d58e5eb 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -327,11 +327,6 @@ IntRect ChromeClientQt::windowResizerRect() const
return IntRect();
}
-void ChromeClientQt::invalidateContents(const IntRect&, bool)
-{
- notImplemented();
-}
-
void ChromeClientQt::invalidateWindow(const IntRect&, bool)
{
notImplemented();
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index cb8a996..2751342 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -105,7 +105,6 @@ namespace WebCore {
virtual bool tabsToLinks() const;
virtual IntRect windowResizerRect() const;
- virtual void invalidateContents(const IntRect&, bool);
virtual void invalidateWindow(const IntRect&, bool);
virtual void invalidateContentsAndWindow(const IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index c927d2a..bf37332 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ * WebCoreSupport/WebChromeClient.h:
+
2010-03-10 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/WebKit/win/WebCoreSupport/WebChromeClient.cpp
index aca2d59..47d2279 100644
--- a/WebKit/win/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebChromeClient.cpp
@@ -454,12 +454,6 @@ IntRect WebChromeClient::windowResizerRect() const
return IntRect();
}
-void WebChromeClient::invalidateContents(const IntRect& windowRect, bool)
-{
- ASSERT(core(m_webView->topLevelFrame()));
- m_webView->repaint(windowRect, true /*contentChanged*/, false /*immediate*/, true /*repaintContentOnly*/);
-}
-
void WebChromeClient::invalidateWindow(const IntRect& windowRect, bool immediate)
{
ASSERT(core(m_webView->topLevelFrame()));
diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.h b/WebKit/win/WebCoreSupport/WebChromeClient.h
index 9510fc4..8f3c986 100644
--- a/WebKit/win/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/win/WebCoreSupport/WebChromeClient.h
@@ -93,7 +93,6 @@ public:
virtual bool tabsToLinks() const;
virtual WebCore::IntRect windowResizerRect() const;
- virtual void invalidateContents(const WebCore::IntRect&, bool);
virtual void invalidateWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 4ac7609..df2a89f 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+
+ * WebKitSupport/ChromeClientWx.cpp:
+ * WebKitSupport/ChromeClientWx.h:
+
2010-03-02 Adam Treat <atreat at rim.com>
Reviewed by Dave Hyatt.
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index 94b01c9..243f97c 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -336,11 +336,6 @@ IntRect ChromeClientWx::windowResizerRect() const
return IntRect();
}
-void ChromeClientWx::invalidateContents(const IntRect& rect, bool)
-{
- notImplemented();
-}
-
void ChromeClientWx::invalidateWindow(const IntRect& rect, bool immediate)
{
if (immediate)
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h
index c670f99..71da63d 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.h
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -102,7 +102,6 @@ public:
virtual void scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect);
virtual void updateBackingStore();
- virtual void invalidateContents(const IntRect&, bool);
virtual void invalidateWindow(const IntRect&, bool);
virtual void invalidateContentsAndWindow(const IntRect&, bool);
virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list