Diff
Modified: trunk/Source/WebCore/ChangeLog (100873 => 100874)
--- trunk/Source/WebCore/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebCore/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,28 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ Most of the port specific implementations of EditorClient::respondToChangedSelection
+ (like EditorClient{Qt,Gtk,etc}) are wrongly relying on FocusController::focusedOrMainFrame
+ method to get the Frame where the selection is happening on.
+ It is not right, since a selection can be easily triggered in an inner
+ frame that is not focused.
+
+ No new tests since it is a hard thing to test without
+ to hook into editor client in layout tests. We could
+ change the "Dumped Delegate" messages, but it would
+ require a rebasile of +1200 for a minor change.
+
+ * editing/Editor.cpp: Pass the Frame on where the selection is changing to the client.
+ (WebCore::Editor::respondToChangedSelection): Ditto.
+ (WebCore::Editor::changeSelectionAfterCommand): Ditto.
+ (WebCore::EmptyEditorClient::respondToChangedSelection):
+ * page/EditorClient.h: Pass Frame* to indicate where the selection is happening.
+ * loader/EmptyClients.h: Changed signature as per base class change.
+
2011-11-17 Mark Rowe <[email protected]>
<http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
Modified: trunk/Source/WebCore/editing/Editor.cpp (100873 => 100874)
--- trunk/Source/WebCore/editing/Editor.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebCore/editing/Editor.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -480,7 +480,7 @@
void Editor::respondToChangedSelection(const VisibleSelection& oldSelection)
{
if (client())
- client()->respondToChangedSelection();
+ client()->respondToChangedSelection(m_frame);
m_deleteButtonController->respondToChangedSelection(oldSelection);
m_spellingCorrector->respondToChangedSelection(oldSelection);
}
@@ -2602,7 +2602,7 @@
// does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
// starts a new kill ring sequence, but we want to do these things (matches AppKit).
if (selectionDidNotChangeDOMPosition)
- client()->respondToChangedSelection();
+ client()->respondToChangedSelection(m_frame);
}
String Editor::selectedText() const
Modified: trunk/Source/WebCore/loader/EmptyClients.h (100873 => 100874)
--- trunk/Source/WebCore/loader/EmptyClients.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -460,7 +460,7 @@
//
virtual void didBeginEditing() { }
virtual void respondToChangedContents() { }
- virtual void respondToChangedSelection() { }
+ virtual void respondToChangedSelection(Frame*) { }
virtual void didEndEditing() { }
virtual void didWriteSelectionToPasteboard() { }
virtual void didSetSelectionTypesForPasteboard() { }
Modified: trunk/Source/WebCore/page/EditorClient.h (100873 => 100874)
--- trunk/Source/WebCore/page/EditorClient.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebCore/page/EditorClient.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -94,7 +94,7 @@
virtual void didBeginEditing() = 0;
virtual void respondToChangedContents() = 0;
- virtual void respondToChangedSelection() = 0;
+ virtual void respondToChangedSelection(Frame*) = 0;
virtual void didEndEditing() = 0;
virtual void didWriteSelectionToPasteboard() = 0;
virtual void didSetSelectionTypesForPasteboard() = 0;
Modified: trunk/Source/WebKit/chromium/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * src/EditorClientImpl.cpp: Make use of the newly added Frame* parameter.
+ (WebKit::EditorClientImpl::respondToChangedSelection):
+ * src/EditorClientImpl.h: Change the method signature, as per base class change.
+
2011-11-20 Adam Barth <[email protected]>
Add WebNode::hasEventListeners for Android
Modified: trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp (100873 => 100874)
--- trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -260,10 +260,9 @@
m_webView->client()->didBeginEditing();
}
-void EditorClientImpl::respondToChangedSelection()
+void EditorClientImpl::respondToChangedSelection(Frame* frame)
{
if (m_webView->client()) {
- Frame* frame = m_webView->focusedWebCoreFrame();
if (frame)
m_webView->client()->didChangeSelection(!frame->selection()->isRange());
}
Modified: trunk/Source/WebKit/chromium/src/EditorClientImpl.h (100873 => 100874)
--- trunk/Source/WebKit/chromium/src/EditorClientImpl.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/chromium/src/EditorClientImpl.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -37,6 +37,7 @@
#include <wtf/Deque.h>
namespace WebCore {
+class Frame;
class HTMLInputElement;
class SpellChecker;
}
@@ -72,7 +73,7 @@
virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
virtual void didBeginEditing();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(WebCore::Frame*);
virtual void didEndEditing();
virtual void didWriteSelectionToPasteboard();
virtual void didSetSelectionTypesForPasteboard();
Modified: trunk/Source/WebKit/efl/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/efl/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/EditorClientEfl.cpp: Make use of the newly added Frame* parameter.
+ (WebCore::EditorClientEfl::respondToChangedSelection):
+ * WebCoreSupport/EditorClientEfl.h:
+
2011-11-17 KwangHyuk Kim <[email protected]>
[EFL] Add matrix list to reuse tile matrix for each different zoom level.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (100873 => 100874)
--- trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -133,25 +133,16 @@
ewk_frame_editor_client_contents_changed(frame);
}
-void EditorClientEfl::respondToChangedSelection()
+void EditorClientEfl::respondToChangedSelection(Frame* coreFrame)
{
- Evas_Object* frame = ewk_view_frame_focused_get(m_view);
-
- if (!frame)
- frame = ewk_view_frame_main_get(m_view);
-
- if (!frame)
- return;
-
- WebCore::Frame* coreFrame = EWKPrivate::coreFrame(frame);
-
if (!coreFrame)
return;
if (coreFrame->editor() && coreFrame->editor()->ignoreCompositionSelectionChange())
return;
- ewk_frame_editor_client_selection_changed(frame);
+ Evas_Object* webFrame = EWKPrivate::kitFrame(coreFrame);
+ ewk_frame_editor_client_selection_changed(webFrame);
}
void EditorClientEfl::didEndEditing()
Modified: trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h (100873 => 100874)
--- trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -79,7 +79,7 @@
virtual void didBeginEditing();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(Frame*);
virtual void didEndEditing();
virtual void didWriteSelectionToPasteboard();
virtual void didSetSelectionTypesForPasteboard();
Modified: trunk/Source/WebKit/gtk/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/EditorClientGtk.cpp: Make use of the newly added Frame* parameter.
+ (WebKit::EditorClient::respondToChangedSelection):
+ * WebCoreSupport/EditorClientGtk.h:
+
2011-11-18 Martin Robinson <[email protected]>
REGRESSION (r99924): broke 2 pasteboard tests on GTK
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (100873 => 100874)
--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -302,33 +302,31 @@
}
#endif
-void EditorClient::respondToChangedSelection()
+void EditorClient::respondToChangedSelection(Frame* frame)
{
g_signal_emit_by_name(m_webView, "selection-changed");
- WebKitWebViewPrivate* priv = m_webView->priv;
- WebCore::Page* corePage = core(m_webView);
- Frame* targetFrame = corePage->focusController()->focusedOrMainFrame();
-
- if (!targetFrame)
+ if (!frame)
return;
- if (targetFrame->editor()->ignoreCompositionSelectionChange())
+ if (frame->editor()->ignoreCompositionSelectionChange())
return;
#if PLATFORM(X11)
setSelectionPrimaryClipboardIfNeeded(m_webView);
#endif
- if (!targetFrame->editor()->hasComposition())
+ if (!frame->editor()->hasComposition())
return;
unsigned start;
unsigned end;
- if (!targetFrame->editor()->getCompositionSelection(start, end)) {
+ WebKitWebViewPrivate* priv = m_webView->priv;
+
+ if (!frame->editor()->getCompositionSelection(start, end)) {
// gtk_im_context_reset() clears the composition for us.
gtk_im_context_reset(priv->imContext.get());
- targetFrame->editor()->cancelComposition();
+ frame->editor()->cancelComposition();
}
}
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h (100873 => 100874)
--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -100,7 +100,7 @@
virtual void didBeginEditing();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(WebCore::Frame*);
virtual void didEndEditing();
virtual void didWriteSelectionToPasteboard();
virtual void didSetSelectionTypesForPasteboard();
Modified: trunk/Source/WebKit/mac/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/mac/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm: Make use of the newly added Frame* parameter.
+ (WebEditorClient::respondToChangedSelection):
+
2011-11-17 Mark Rowe <[email protected]>
<http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (100873 => 100874)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -98,7 +98,7 @@
TextCheckerClient* textChecker() OVERRIDE { return this; }
virtual void respondToChangedContents() OVERRIDE;
- virtual void respondToChangedSelection() OVERRIDE;
+ virtual void respondToChangedSelection(WebCore::Frame*) OVERRIDE;
virtual void registerCommandForUndo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
virtual void registerCommandForRedo(PassRefPtr<WebCore::EditCommand>) OVERRIDE;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (100873 => 100874)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2011-11-20 23:55:31 UTC (rev 100874)
@@ -290,9 +290,9 @@
[[NSNotificationCenter defaultCenter] postNotificationName:WebViewDidChangeNotification object:m_webView];
}
-void WebEditorClient::respondToChangedSelection()
+void WebEditorClient::respondToChangedSelection(Frame* frame)
{
- NSView<WebDocumentView> *documentView = [[[m_webView _selectedOrMainFrame] frameView] documentView];
+ NSView<WebDocumentView> *documentView = [[kit(frame) frameView] documentView];
if ([documentView isKindOfClass:[WebHTMLView class]])
[(WebHTMLView *)documentView _selectionChanged];
Modified: trunk/Source/WebKit/qt/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/EditorClientQt.cpp: Make use of the newly added Frame* parameter.
+ (WebCore::EditorClientQt::respondToChangedSelection):
+ * WebCoreSupport/EditorClientQt.h:
+
2011-11-18 Yuta Kitamura <[email protected]>
[Qt] Enable WebSocket hybi tests
Modified: trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp (100873 => 100874)
--- trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -201,7 +201,7 @@
emit m_page->contentsChanged();
}
-void EditorClientQt::respondToChangedSelection()
+void EditorClientQt::respondToChangedSelection(Frame* frame)
{
if (dumpEditingCallbacks)
printf("EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification\n");
@@ -212,7 +212,6 @@
m_page->d->updateEditorActions();
emit m_page->selectionChanged();
- Frame* frame = m_page->d->page->focusController()->focusedOrMainFrame();
if (!frame->editor()->ignoreCompositionSelectionChange())
emit m_page->microFocusChanged();
}
Modified: trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h (100873 => 100874)
--- trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -69,7 +69,7 @@
virtual void didBeginEditing();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(Frame*);
virtual void didEndEditing();
virtual void didWriteSelectionToPasteboard();
virtual void didSetSelectionTypesForPasteboard();
Modified: trunk/Source/WebKit/win/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/win/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/win/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/WebEditorClient.cpp: Make use of the newly added Frame* parameter.
+ (WebEditorClient::respondToChangedSelection):
+ * WebCoreSupport/WebEditorClient.h:
+
2011-11-15 Jochen Eisinger <[email protected]>
Rename ReferrerPolicy to clarify its meaning
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (100873 => 100874)
--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -208,7 +208,7 @@
notImplemented();
}
-void WebEditorClient::respondToChangedSelection()
+void WebEditorClient::respondToChangedSelection(Frame*)
{
m_webView->selectionChanged();
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (100873 => 100874)
--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -58,7 +58,7 @@
virtual void didSetSelectionTypesForPasteboard();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(WebCore::Frame*);
bool shouldShowDeleteInterface(WebCore::HTMLElement*);
bool shouldDeleteRange(WebCore::Range*);
Modified: trunk/Source/WebKit/wx/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit/wx/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/wx/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebKitSupport/EditorClientWx.cpp: Make use of the newly added Frame* parameter.
+ (WebCore::EditorClientWx::respondToChangedSelection):
+ * WebKitSupport/EditorClientWx.h:
+
2011-11-15 Anders Carlsson <[email protected]>
HostWindow screenToWindow/windowToScreen should be screenToRootView/rootViewToScreen
Modified: trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp (100873 => 100874)
--- trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -487,9 +487,8 @@
notImplemented();
}
-void EditorClientWx::respondToChangedSelection()
+void EditorClientWx::respondToChangedSelection(Frame* frame)
{
- Frame* frame = m_page->focusController()->focusedOrMainFrame();
if (frame) {
wxWebView* webKitWin = dynamic_cast<wxWebView*>(frame->view()->hostWindow()->platformPageClient());
if (webKitWin) {
Modified: trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.h (100873 => 100874)
--- trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -72,7 +72,7 @@
virtual void didBeginEditing();
virtual void respondToChangedContents();
- virtual void respondToChangedSelection();
+ virtual void respondToChangedSelection(Frame*);
virtual void didEndEditing();
virtual void didWriteSelectionToPasteboard();
virtual void didSetSelectionTypesForPasteboard();
Modified: trunk/Source/WebKit2/ChangeLog (100873 => 100874)
--- trunk/Source/WebKit2/ChangeLog 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-20 23:55:31 UTC (rev 100874)
@@ -1,3 +1,14 @@
+2011-10-17 Antonio Gomes <[email protected]>
+
+ Pass a Frame* parameter in EditorClient::respondToChangedSelection
+ https://bugs.webkit.org/show_bug.cgi?id=70248
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp: Make use of the newly added Frame* parameter.
+ (WebKit::WebEditorClient::respondToChangedSelection):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+
2011-11-17 Mark Rowe <[email protected]>
<http://webkit.org/b/72646> Disable deprecation warnings around code where we cannot easily
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (100873 => 100874)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2011-11-20 23:55:31 UTC (rev 100874)
@@ -174,11 +174,10 @@
notImplemented();
}
-void WebEditorClient::respondToChangedSelection()
+void WebEditorClient::respondToChangedSelection(Frame* frame)
{
DEFINE_STATIC_LOCAL(String, WebViewDidChangeSelectionNotification, ("WebViewDidChangeSelectionNotification"));
m_page->injectedBundleEditorClient().didChangeSelection(m_page, WebViewDidChangeSelectionNotification.impl());
- Frame* frame = m_page->corePage()->focusController()->focusedFrame();
if (!frame)
return;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (100873 => 100874)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2011-11-20 23:40:12 UTC (rev 100873)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2011-11-20 23:55:31 UTC (rev 100874)
@@ -64,7 +64,7 @@
virtual void didBeginEditing() OVERRIDE;
virtual void respondToChangedContents() OVERRIDE;
- virtual void respondToChangedSelection() OVERRIDE;
+ virtual void respondToChangedSelection(WebCore::Frame*) OVERRIDE;
virtual void didEndEditing() OVERRIDE;
virtual void didWriteSelectionToPasteboard() OVERRIDE;
virtual void didSetSelectionTypesForPasteboard() OVERRIDE;
