summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp')
-rw-r--r--Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp64
1 files changed, 36 insertions, 28 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
index 277a9ed54..30e2a936c 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
@@ -28,121 +28,129 @@
#include "APIArray.h"
#include "APIData.h"
+#include "InjectedBundleCSSStyleDeclarationHandle.h"
#include "InjectedBundleNodeHandle.h"
#include "InjectedBundleRangeHandle.h"
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
#include "WKString.h"
+#include "WebPage.h"
#include <wtf/text/WTFString.h>
using namespace WebCore;
namespace WebKit {
-bool InjectedBundlePageEditorClient::shouldBeginEditing(WebPage* page, Range* range)
+InjectedBundlePageEditorClient::InjectedBundlePageEditorClient(const WKBundlePageEditorClientBase& client)
+{
+ initialize(&client);
+}
+
+bool InjectedBundlePageEditorClient::shouldBeginEditing(WebPage& page, Range* range)
{
if (m_client.shouldBeginEditing) {
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
- return m_client.shouldBeginEditing(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
+ return m_client.shouldBeginEditing(toAPI(&page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldEndEditing(WebPage* page, Range* range)
+bool InjectedBundlePageEditorClient::shouldEndEditing(WebPage& page, Range* range)
{
if (m_client.shouldEndEditing) {
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
- return m_client.shouldEndEditing(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
+ return m_client.shouldEndEditing(toAPI(&page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldInsertNode(WebPage* page, Node* node, Range* rangeToReplace, EditorInsertAction action)
+bool InjectedBundlePageEditorClient::shouldInsertNode(WebPage& page, Node* node, Range* rangeToReplace, EditorInsertAction action)
{
if (m_client.shouldInsertNode) {
RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(node);
RefPtr<InjectedBundleRangeHandle> rangeToReplaceHandle = InjectedBundleRangeHandle::getOrCreate(rangeToReplace);
- return m_client.shouldInsertNode(toAPI(page), toAPI(nodeHandle.get()), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo);
+ return m_client.shouldInsertNode(toAPI(&page), toAPI(nodeHandle.get()), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldInsertText(WebPage* page, StringImpl* text, Range* rangeToReplace, EditorInsertAction action)
+bool InjectedBundlePageEditorClient::shouldInsertText(WebPage& page, StringImpl* text, Range* rangeToReplace, EditorInsertAction action)
{
if (m_client.shouldInsertText) {
RefPtr<InjectedBundleRangeHandle> rangeToReplaceHandle = InjectedBundleRangeHandle::getOrCreate(rangeToReplace);
- return m_client.shouldInsertText(toAPI(page), toAPI(text), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo);
+ return m_client.shouldInsertText(toAPI(&page), toAPI(text), toAPI(rangeToReplaceHandle.get()), toAPI(action), m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldDeleteRange(WebPage* page, Range* range)
+bool InjectedBundlePageEditorClient::shouldDeleteRange(WebPage& page, Range* range)
{
if (m_client.shouldDeleteRange) {
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
- return m_client.shouldDeleteRange(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
+ return m_client.shouldDeleteRange(toAPI(&page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldChangeSelectedRange(WebPage* page, Range* fromRange, Range* toRange, EAffinity affinity, bool stillSelecting)
+bool InjectedBundlePageEditorClient::shouldChangeSelectedRange(WebPage& page, Range* fromRange, Range* toRange, EAffinity affinity, bool stillSelecting)
{
if (m_client.shouldChangeSelectedRange) {
RefPtr<InjectedBundleRangeHandle> fromRangeHandle = InjectedBundleRangeHandle::getOrCreate(fromRange);
RefPtr<InjectedBundleRangeHandle> toRangeHandle = InjectedBundleRangeHandle::getOrCreate(toRange);
- return m_client.shouldChangeSelectedRange(toAPI(page), toAPI(fromRangeHandle.get()), toAPI(toRangeHandle.get()), toAPI(affinity), stillSelecting, m_client.base.clientInfo);
+ return m_client.shouldChangeSelectedRange(toAPI(&page), toAPI(fromRangeHandle.get()), toAPI(toRangeHandle.get()), toAPI(affinity), stillSelecting, m_client.base.clientInfo);
}
return true;
}
-bool InjectedBundlePageEditorClient::shouldApplyStyle(WebPage* page, CSSStyleDeclaration* style, Range* range)
+bool InjectedBundlePageEditorClient::shouldApplyStyle(WebPage& page, CSSStyleDeclaration* style, Range* range)
{
if (m_client.shouldApplyStyle) {
+ RefPtr<InjectedBundleCSSStyleDeclarationHandle> styleHandle = InjectedBundleCSSStyleDeclarationHandle::getOrCreate(style);
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
- return m_client.shouldApplyStyle(toAPI(page), toAPI(style), toAPI(rangeHandle.get()), m_client.base.clientInfo);
+ return m_client.shouldApplyStyle(toAPI(&page), toAPI(styleHandle.get()), toAPI(rangeHandle.get()), m_client.base.clientInfo);
}
return true;
}
-void InjectedBundlePageEditorClient::didBeginEditing(WebPage* page, StringImpl* notificationName)
+void InjectedBundlePageEditorClient::didBeginEditing(WebPage& page, StringImpl* notificationName)
{
if (m_client.didBeginEditing)
- m_client.didBeginEditing(toAPI(page), toAPI(notificationName), m_client.base.clientInfo);
+ m_client.didBeginEditing(toAPI(&page), toAPI(notificationName), m_client.base.clientInfo);
}
-void InjectedBundlePageEditorClient::didEndEditing(WebPage* page, StringImpl* notificationName)
+void InjectedBundlePageEditorClient::didEndEditing(WebPage& page, StringImpl* notificationName)
{
if (m_client.didEndEditing)
- m_client.didEndEditing(toAPI(page), toAPI(notificationName), m_client.base.clientInfo);
+ m_client.didEndEditing(toAPI(&page), toAPI(notificationName), m_client.base.clientInfo);
}
-void InjectedBundlePageEditorClient::didChange(WebPage* page, StringImpl* notificationName)
+void InjectedBundlePageEditorClient::didChange(WebPage& page, StringImpl* notificationName)
{
if (m_client.didChange)
- m_client.didChange(toAPI(page), toAPI(notificationName), m_client.base.clientInfo);
+ m_client.didChange(toAPI(&page), toAPI(notificationName), m_client.base.clientInfo);
}
-void InjectedBundlePageEditorClient::didChangeSelection(WebPage* page, StringImpl* notificationName)
+void InjectedBundlePageEditorClient::didChangeSelection(WebPage& page, StringImpl* notificationName)
{
if (m_client.didChangeSelection)
- m_client.didChangeSelection(toAPI(page), toAPI(notificationName), m_client.base.clientInfo);
+ m_client.didChangeSelection(toAPI(&page), toAPI(notificationName), m_client.base.clientInfo);
}
-void InjectedBundlePageEditorClient::willWriteToPasteboard(WebPage* page, Range* range)
+void InjectedBundlePageEditorClient::willWriteToPasteboard(WebPage& page, Range* range)
{
if (m_client.willWriteToPasteboard) {
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
- m_client.willWriteToPasteboard(toAPI(page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
+ m_client.willWriteToPasteboard(toAPI(&page), toAPI(rangeHandle.get()), m_client.base.clientInfo);
}
}
-void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage* page, Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer>>& pasteboardData)
+void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage& page, Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer>>& pasteboardData)
{
if (m_client.getPasteboardDataForRange) {
RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range);
WKArrayRef types = 0;
WKArrayRef data = 0;
- m_client.getPasteboardDataForRange(toAPI(page), toAPI(rangeHandle.get()), &types, &data, m_client.base.clientInfo);
+ m_client.getPasteboardDataForRange(toAPI(&page), toAPI(rangeHandle.get()), &types, &data, m_client.base.clientInfo);
RefPtr<API::Array> typesArray = adoptRef(toImpl(types));
RefPtr<API::Array> dataArray = adoptRef(toImpl(data));
@@ -164,10 +172,10 @@ void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage* page, Ra
}
}
-void InjectedBundlePageEditorClient::didWriteToPasteboard(WebPage* page)
+void InjectedBundlePageEditorClient::didWriteToPasteboard(WebPage& page)
{
if (m_client.didWriteToPasteboard)
- m_client.didWriteToPasteboard(toAPI(page), m_client.base.clientInfo);
+ m_client.didWriteToPasteboard(toAPI(&page), m_client.base.clientInfo);
}
} // namespace WebKit
View Lorry Controller Status