mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef:
- Fix ASSERT in CefBrowserImpl::UIT_GetPagesCount() when no default printer is configured (Issue #20). - Remove non-existent WebFrame objects while iterating over the bound object list in CefJSContainer::BindToJavascript(). WebFrame objects are destroyed when navigating from a page with more frames to a page with less frames. If we don't remove the non-existent frames they will remain in the list until the browser window is destroyed. - Don't call UIT_* functions from class destructors as destruction may occur on a different thread. libcef: Update due to underlying chromium changes. - Header file locations changed from third_party/WebKit/WebKit to webkit/api as a result of WebKit unforking. - Project file locations changed due to GYP now being used for WebKit builds. - Add simple_clipboard_impl.cc in the libcef directory because it has been moved from webkit/glue to test_shell. - Changes related to navigation. - New parameters added to WebViewDelegate methods. libcef_dll: Update due to underlying chromium changes. - webkit_resources.rc and webkit_strings_en-US.rc moved from grit_derived_sources to obj/global_intermediate/webkit. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@24 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
57
libcef/simple_clipboard_impl.cc
Normal file
57
libcef/simple_clipboard_impl.cc
Normal file
@@ -0,0 +1,57 @@
|
||||
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "precompiled_libcef.h"
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "base/clipboard.h"
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/string16.h"
|
||||
#include "googleurl/src/gurl.h"
|
||||
#include "webkit/glue/scoped_clipboard_writer_glue.h"
|
||||
|
||||
#include "SkBitmap.h"
|
||||
|
||||
// Clipboard glue
|
||||
|
||||
#if defined(OS_WIN)
|
||||
void ScopedClipboardWriterGlue::WriteBitmapFromPixels(
|
||||
const void* pixels, const gfx::Size& size) {
|
||||
ScopedClipboardWriter::WriteBitmapFromPixels(pixels, size);
|
||||
}
|
||||
#endif
|
||||
|
||||
ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
|
||||
}
|
||||
|
||||
namespace webkit_glue {
|
||||
|
||||
base::LazyInstance<Clipboard> clipboard(base::LINKER_INITIALIZED);
|
||||
|
||||
Clipboard* ClipboardGetClipboard() {
|
||||
return clipboard.Pointer();
|
||||
}
|
||||
|
||||
bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format) {
|
||||
return ClipboardGetClipboard()->IsFormatAvailable(format);
|
||||
}
|
||||
|
||||
void ClipboardReadText(string16* result) {
|
||||
ClipboardGetClipboard()->ReadText(result);
|
||||
}
|
||||
|
||||
void ClipboardReadAsciiText(std::string* result) {
|
||||
ClipboardGetClipboard()->ReadAsciiText(result);
|
||||
}
|
||||
|
||||
void ClipboardReadHTML(string16* markup, GURL* url) {
|
||||
std::string url_str;
|
||||
ClipboardGetClipboard()->ReadHTML(markup, url ? &url_str : NULL);
|
||||
if (url)
|
||||
*url = GURL(url_str);
|
||||
}
|
||||
|
||||
} // namespace webkit_glue
|
Reference in New Issue
Block a user