bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcef: Update due to underlying chromium changes.

Browse Source 
- WebEditingClient merged into WebViewClient requiring changes to BrowserWebViewDelegate.
- Remove webkit_glue_plugins.patch for RegisterInternalPlugin() issue 173107 which has been committed as Chromium rev 26595.


git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@48 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2009-09-22 16:34:27 +00:00
parent 51181e1004
commit 07e81ab0a0
7 changed files with 95 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
libcef/browser_webview_delegate.cc
View File

@ -88,6 +88,7 @@ using WebKit::WebPopupMenu;
using WebKit::WebRange;
using WebKit::WebRect;
using WebKit::WebScreenInfo;
using WebKit::WebSecurityOrigin;
using WebKit::WebSize;
using WebKit::WebString;
using WebKit::WebTextAffinity;
@ -178,6 +179,66 @@ void BrowserWebViewDelegate::didStopLoading() {
}
}
bool BrowserWebViewDelegate::shouldBeginEditing(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldEndEditing(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldInsertNode(const WebNode& node,
const WebRange& range,
WebEditingAction action) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldInsertText(const WebString& text,
const WebRange& range,
WebEditingAction action) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldChangeSelectedRange(const WebRange& from_range,
const WebRange& to_range,
WebTextAffinity affinity,
bool still_selecting) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldDeleteRange(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldApplyStyle(const WebString& style,
const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::isSmartInsertDeleteEnabled() {
return smart_insert_delete_enabled_;
}
bool BrowserWebViewDelegate::isSelectTrailingWhitespaceEnabled() {
return select_trailing_whitespace_enabled_;
}
void BrowserWebViewDelegate::didBeginEditing() {
}
void BrowserWebViewDelegate::didChangeSelection(bool is_empty_selection) {
}
void BrowserWebViewDelegate::didChangeContents() {
}
void BrowserWebViewDelegate::didExecuteCommand(
const WebKit::WebString& command_name) {
}
void BrowserWebViewDelegate::didEndEditing() {
}
void BrowserWebViewDelegate::runModalAlertDialog(
WebFrame* frame, const WebString& message) {
std::wstring messageStr = UTF16ToWideHack(message);
@ -332,66 +393,6 @@ WebScreenInfo BrowserWebViewDelegate::screenInfo() {
return WebScreenInfo();
}
// WebEditingClient ----------------------------------------------------------
// The output from these methods in layout test mode should match that
// expected by the layout tests. See EditingDelegate.m in DumpRenderTree.
bool BrowserWebViewDelegate::shouldBeginEditing(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldEndEditing(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldInsertNode(const WebNode& node,
const WebRange& range,
WebEditingAction action) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldInsertText(const WebString& text,
const WebRange& range,
WebEditingAction action) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldChangeSelectedRange(const WebRange& from_range,
const WebRange& to_range,
WebTextAffinity affinity,
bool still_selecting) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldDeleteRange(const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::shouldApplyStyle(const WebString& style,
const WebRange& range) {
return browser_->UIT_AllowEditing();
}
bool BrowserWebViewDelegate::isSmartInsertDeleteEnabled() {
return smart_insert_delete_enabled_;
}
bool BrowserWebViewDelegate::isSelectTrailingWhitespaceEnabled() {
return select_trailing_whitespace_enabled_;
}
void BrowserWebViewDelegate::didBeginEditing() {
}
void BrowserWebViewDelegate::didChangeSelection(bool is_empty_selection) {
}
void BrowserWebViewDelegate::didChangeContents() {
}
void BrowserWebViewDelegate::didEndEditing() {
}
// WebFrameClient ------------------------------------------------------------
WebPlugin* BrowserWebViewDelegate::createPlugin(
@ -670,7 +671,7 @@ void BrowserWebViewDelegate::didDisplayInsecureContent(WebFrame* frame) {
}
void BrowserWebViewDelegate::didRunInsecureContent(
WebFrame* frame, const WebString& security_origin) {
WebFrame* frame, const WebKit::WebSecurityOrigin& origin) {
}
void BrowserWebViewDelegate::didExhaustMemoryAvailableForScript(WebFrame* frame) {