# SVN revision while Blink is still in SVN.
blink_upstream_rev = '191638' #TODO(TK) : need to update revision number
-efl_integration_branch = 'origin/dev/m49_2623'
+efl_integration_branch = 'origin/dev/m50_2661'
ct_git = 'ssh://165.213.202.130:29418/webplatform'
crosswalk_git = 'https://github.com/crosswalk-project'
-Duse_system_libxslt=1
-Duse_system_re2=1
-Duse_system_zlib=1
- -Duse_system_icu=1
"
+ # [M50_2661] Temporary using the icu of internal chformium instead of system.
+ # The icu of system doesn't support utrie2.h
+ # FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-967
+ SYSTEM_DEPS+="-Duse_system_icu=0
+ "
+
if [ "$target" == "mobile" ]; then
SYSTEM_DEPS+="-Duse_system_bzip2=1
-Duse_system_libexif=1
+++ /dev/null
-diff --git a/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_denoiser.h b/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_denoiser.h
-index bc676e9..1cd1e6d 100644
---- a/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_denoiser.h
-+++ b/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_denoiser.h
-@@ -73,7 +73,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
- // This function is used by both c and sse2 denoiser implementations.
- // Define it as a static function within the scope where vp9_denoiser.h
- // is referenced.
--static int total_adj_strong_thresh(BLOCK_SIZE bs, int increase_denoising) {
-+inline static int total_adj_strong_thresh(BLOCK_SIZE bs, int increase_denoising) {
- return (1 << num_pels_log2_lookup[bs]) * (increase_denoising ? 3 : 2);
- }
- #endif
}
#endif
+#if !defined(EWK_BRINGUP)
+ // [M50_2661] This file will be removed with another patch. To avoid build
+ // break, the following code is commented.
+ // FIXME: http://165.213.149.170/jira/browse/TWF-893
uint32_t sync_point =
context_provider_->ContextGL()->InsertSyncPointCHROMIUM();
base::Passed(&frame->gl_frame_data));
context_provider()->ContextSupport()->SignalSyncPoint(sync_point, closure);
+#endif
client_->DidSwapBuffers();
int parent_view_x = 0, parent_view_y = 0;
evas_object_geometry_get(parent_view_, &parent_view_x, &parent_view_y, 0, 0);
- float device_scale_factor = gfx::Screen::GetNativeScreen()->
+ float device_scale_factor = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
event->canvas.x = target_rect_x + (parent_view_x * device_scale_factor);
event->canvas.y = target_rect_y + (parent_view_y * device_scale_factor);
void RenderWidgetHostViewBase::GetDefaultScreenInfo(
blink::WebScreenInfo* results) {
- const gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
+ const gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
results->rect = display.bounds();
results->availableRect = display.work_area();
SetDoubleTapSupportEnabled(touch_events_enabled_);
- device_scale_factor_ = gfx::Screen::GetNativeScreen()->
+ device_scale_factor_ = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
host_->SetView(this);
composition_text.underlines);
host_->ImeSetComposition(
- composition_text.text, underlines, composition_text.selection.start(),
- composition_text.selection.end());
+ composition_text.text, underlines, gfx::Range::InvalidRange(),
+ composition_text.selection.start(), composition_text.selection.end());
}
void RenderWidgetHostViewEfl::ConfirmComposition(base::string16& text) {
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/browser/web_contents/web_contents_view_efl.h"
#include "content/common/content_export.h"
-#include "cc/layers/delegated_frame_provider.h"
-#include "cc/layers/delegated_frame_resource_collection.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_ack.h"
#include "cc/output/copy_output_request.h"
float GetDeviceScaleFactor() {
static float device_scale_factor = 0.0f;
if (!device_scale_factor) {
- device_scale_factor = gfx::Screen::GetNativeScreen()->
+ device_scale_factor = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
}
return device_scale_factor;
gfx::Rect truncated_end(end.edge_top_rounded(), gfx::Size(0, end.GetHeight()));
static float device_scale_factor =
- gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor();
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
truncated_start = ConvertRectToPixel(device_scale_factor, truncated_start);
truncated_end = ConvertRectToPixel(device_scale_factor, truncated_end);
}
float device_scale_factor =
- gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor();
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
gfx::PointF base = gfx::ScalePoint(
gfx::PointF(stationary_handle_->GetBasePosition()), 1 / device_scale_factor);
gfx::PointF extent = gfx::ScalePoint(
case SelectionHandleEfl::HANDLE_TYPE_LEFT:
case SelectionHandleEfl::HANDLE_TYPE_RIGHT: {
float device_scale_factor =
- gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor();
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
gfx::PointF extent = gfx::ScalePoint(
gfx::PointF(handle->GetBasePosition()), 1 / device_scale_factor);
#include "content/browser/dom_storage/dom_storage_context_wrapper.h"
#include "content/browser/dom_storage/session_storage_namespace_impl.h"
#include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/web_contents_view.h"
#include "content/public/browser/browser_context.h"
// is invalid and the process must be terminated.
int render_process_id = source_site_instance->GetProcess()->GetID();
bool did_match_process = false;
- frame_tree_.ForEach(
- base::Bind(&FindMatchingProcess, render_process_id, &did_match_process));
+ for (FrameTreeNode* node : frame_tree_.Nodes())
+ base::Bind(&FindMatchingProcess, render_process_id, &did_match_process, node);
+
if (!did_match_process) {
RenderProcessHost* rph = source_site_instance->GetProcess();
base::ProcessHandle process_handle = rph->GetHandle();
// delete the RenderView that had already been created.
Send(new ViewMsg_Close(route_id));
}
- GetRenderViewHost()->GetProcess()->ResumeRequestsForView(route_id);
- GetRenderViewHost()->GetProcess()->ResumeRequestsForView(
- main_frame_route_id);
+ ResourceDispatcherHostImpl::ResumeBlockedRequestsForRouteFromUI(
+ GlobalFrameRoutingId(render_process_id, route_id));
+ ResourceDispatcherHostImpl::ResumeBlockedRequestsForRouteFromUI(
+ GlobalFrameRoutingId(render_process_id, main_frame_route_id));
}
// This function does not exist in WebContentsImpl. The decision regarding
RenderViewHostImpl* rvhi =
static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
- ViewMsg_Resize_Params params;
+ ResizeParams params;
params.screen_info = screen_info;
params.new_size = new_size;
params.physical_backing_size = backing_size;
parent_view_(static_cast<Evas_Object*>(web_contents->GetNativeView())),
page_scale_factor_(1.0f),
drag_initialized_(false) {
- device_scale_factor_ = gfx::Screen::GetNativeScreen()->
+ device_scale_factor_ = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
SetDragCallbacks();
}
drag_failed_(false),
drag_started_(false),
page_scale_factor_(1.0f) {
- device_scale_factor_ = gfx::Screen::GetNativeScreen()->
+ device_scale_factor_ = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
}
'<(DEPTH)/third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
- '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
],
'sources': [
'<(DEPTH)/content/renderer/android/renderer_date_time_picker.h',
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/gpu_host_messages.h"
#include "content/gpu/gpu_process.h"
#include "content/gpu/shared_mailbox_manager.h"
#include "ui/gl/gl_shared_context_efl.h"
: InProcessGpuThread(params, sync_point_manager_override) { }
void Init() override {
- gpu_process_ = new content::GpuProcess();
+ gpu_process_ = new content::GpuProcess(base::ThreadPriority::NORMAL);
// The process object takes ownership of the thread object, so do not
// save and delete the pointer.
gpu_process_->set_main_thread(new GpuChildThreadEfl(params_,
"third_party",
"WebKit",
"Source",
- "build",
+ "devtools",
"scripts"))
sys.path.append(rjsmin_path)
import rjsmin
return adoptRef(new RenderThemeChromiumTizen());
}
-LayoutTheme& LayoutTheme::theme()
+LayoutTheme& LayoutTheme::nativeTheme()
{
DEFINE_STATIC_REF(LayoutTheme, renderTheme, (RenderThemeChromiumTizen::create()));
return *renderTheme;
}
}
-gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
+gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
// Flipped image is not used on ChromeOS.
- DCHECK_EQ(rtl, RTL_DISABLED);
return GetImageNamed(resource_id);
}
#include "ecore_x_wayland_wrapper.h"
#include "content/browser/renderer_host/dip_util.h"
-#include "ui/gfx/screen_type_delegate.h"
#include "ui/base/x/x11_util.h"
#include "ui/gfx/device_display_info_efl.h"
#include "ui/gfx/geometry/rect.h"
static bool installed = false;
if (!installed) {
installed = true;
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, new ui::ScreenEfl());
+ gfx::Screen::SetScreenInstance(new ui::ScreenEfl());
}
}
{
'target_name': 'ozone_efl',
'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/ui/ozone/ozone.gyp:ozone_common',
+ ],
'conditions': [
['use_wayland==0', {
'dependencies': [
#endif
}
-const int32_t* SurfaceFactoryEfl::GetEGLSurfaceProperties(
- const int32_t* desired_list) {
- static const EGLint kConfigAttribs[] = {
- EGL_BUFFER_SIZE, 32,
- EGL_ALPHA_SIZE, 8,
- EGL_BLUE_SIZE, 8,
- EGL_GREEN_SIZE, 8,
- EGL_RED_SIZE, 8,
- EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
- EGL_NONE
- };
- return kConfigAttribs;
-}
-
} // namespace ui
AddGLLibraryCallback add_gl_library,
SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
intptr_t GetNativeDisplay() override;
- const int32_t* GetEGLSurfaceProperties(const int32_t* desired_list) override;
};
} // namespace ui
{
}
-void AccessTokenStoreEfl::LoadAccessTokens(const LoadAccessTokensCallbackType& callback)
+void AccessTokenStoreEfl::LoadAccessTokens(const LoadAccessTokensCallback& callback)
{
BrowserThread::PostTaskAndReply(BrowserThread::UI,
FROM_HERE,
system_request_context_ = EwkGlobalData::GetInstance()->GetSystemRequestContextGetter();
}
-void AccessTokenStoreEfl::RespondOnOriginatingThread(const LoadAccessTokensCallbackType& callback)
+void AccessTokenStoreEfl::RespondOnOriginatingThread(const LoadAccessTokensCallback& callback)
{
- AccessTokenSet access_token_set;
- callback.Run(access_token_set, system_request_context_);
+ AccessTokenMap access_token_map;
+ callback.Run(access_token_map, system_request_context_);
}
void AccessTokenStoreEfl::SaveAccessToken(const GURL& /*server_url*/, const base::string16& /*access_token*/)
AccessTokenStoreEfl();
// AccessTokenStore
- virtual void LoadAccessTokens(const LoadAccessTokensCallbackType& callback) override;
+ virtual void LoadAccessTokens(const LoadAccessTokensCallback& callback) override;
virtual void SaveAccessToken(const GURL& server_url, const base::string16& access_token) override;
private:
virtual ~AccessTokenStoreEfl();
void GetRequestContextOnUIThread();
- void RespondOnOriginatingThread(const LoadAccessTokensCallbackType& callback);
+ void RespondOnOriginatingThread(const LoadAccessTokensCallback& callback);
net::URLRequestContextGetter* system_request_context_;
if (request->isSuspended())
ignore_result(request.release());
else if (!request->isDecided()) // Reject permission if request is not suspended and not decided
- callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
+ callback.Run(PermissionStatus::DENIED);
}
}
#include "base/strings/utf_string_conversions.h"
#include "common/web_contents_utils.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/common/notification_resources.h"
#include "content/public/common/platform_notification_data.h"
#include "eweb_view.h"
#include "private/ewk_notification_private.h"
void NotificationControllerEfl::DisplayNotification(
BrowserContext* browser_context,
const GURL& origin,
- const SkBitmap& icon,
const PlatformNotificationData& notification_data,
+ const NotificationResources& notification_resources,
scoped_ptr<DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) {
new Ewk_Notification(base::UTF16ToUTF8(notification_data.body),
notification_data.tag,
base::UTF16ToUTF8(notification_data.title),
- icon,
+ notification_resources.notification_icon,
notification_data.silent,
notificationUniqueId,
origin);
void NotificationControllerEfl:: DisplayPersistentNotification(
BrowserContext* browser_context,
- int64_t service_worker_registration_id,
+ int64_t persistent_notification_id,
const GURL& origin,
- const SkBitmap& icon,
- const PlatformNotificationData& notification_data) {
+ const PlatformNotificationData& notification_data,
+ const NotificationResources& notification_resources) {
NOTIMPLEMENTED();
}
if (!web_view) {
LOG(ERROR) << "Dropping PermissionNotification request caused by lack "
"of the WebView";
- result_callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
+ result_callback.Run(PermissionStatus::DENIED);
return;
}
scoped_ptr<Ewk_Notification_Permission_Request> notification_permission(
if (!web_view->IsNotificationPermissionCallbackSet()) {
LOG(ERROR) << "Dropping PermissionNotification request caused by lack "
"of the Notification Permission Callback";
- result_callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
+ result_callback.Run(PermissionStatus::DENIED);
return;
}
}
} else {
if (web_notification_permission == blink::WebNotificationPermissionAllowed) {
- result_callback.Run(PermissionStatus::PERMISSION_STATUS_GRANTED);
+ result_callback.Run(PermissionStatus::GRANTED);
} else {
- result_callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
+ result_callback.Run(PermissionStatus::DENIED);
}
}
}
void DisplayNotification(
BrowserContext* browser_context,
const GURL& origin,
- const SkBitmap& icon,
const PlatformNotificationData& notification_data,
+ const NotificationResources& notification_resources,
scoped_ptr<DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override;
// the user. This method must be called on the UI thread.
void DisplayPersistentNotification(
BrowserContext* browser_context,
- int64_t service_worker_registration_id,
+ int64_t persistent_notification_id,
const GURL& origin,
- const SkBitmap& icon,
- const PlatformNotificationData& notification_data) override;
+ const PlatformNotificationData& notification_data,
+ const NotificationResources& notification_resources) override;
// Closes the persistent notification identified by
// |persistent_notification_id|. This method must be called on the UI thread.
int PermissionManagerEfl::RequestPermission(PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) {
#if !defined(EWK_BRINGUP)
// [M48_2564] Temporary disabling the codes for switching to new chromium
const std::vector<PermissionType>& permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- bool user_gesture,
const base::Callback<void(
const std::vector<PermissionStatus>&)>& callback) {
NOTIMPLEMENTED();
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
- return PERMISSION_STATUS_DENIED;
+ return PermissionStatus::DENIED;
}
void PermissionManagerEfl::ResetPermission(PermissionType permission,
PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) override;
int RequestPermissions(
const std::vector<PermissionType>& permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- bool user_gesture,
const base::Callback<void(
const std::vector<PermissionStatus>&)>& callback) override;
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/pref_service_factory.h"
#include "base/synchronization/waitable_event.h"
#include "browser/autofill/personal_data_manager_factory.h"
#include "browser/geolocation/geolocation_permission_context_efl.h"
#include "components/autofill/core/browser/personal_data_manager.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/pref_service_factory.h"
#include "components/user_prefs/user_prefs.h"
#include "components/visitedlink/browser/visitedlink_master.h"
#include "content/common/paths_efl.h"
pref_registry->RegisterBooleanPref(kAutofillWalletImportEnabled, true);
pref_registry->RegisterBooleanPref(kPasswordManagerSavingEnabled, true);
- base::PrefServiceFactory pref_service_factory;
+ PrefServiceFactory pref_service_factory;
pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore));
pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
user_pref_service_ = std::move(pref_service_factory.Create(pref_registry));
#include "content/public/browser/download_manager.h"
#include "content/public/browser/navigation_entry.h"
#include "eweb_view.h"
-#include "net/base/net_util.h"
#include "net/base/filename_util.h"
#include "content/common/paths_efl.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
void CookieManager::DeleteSessionCookiesOnIOThread() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
- scoped_refptr<net::CookieMonster> cookie_monster = GetCookieMonster();
- if (cookie_monster.get())
- cookie_monster->DeleteSessionCookiesAsync(base::Callback<void(int)>());
+ scoped_refptr<net::CookieStore> cookie_store = GetCookieStore();
+ if (cookie_store.get())
+ cookie_store->DeleteSessionCookiesAsync(base::Callback<void(int)>());
}
-static void DeleteCookiesOnIOThread(scoped_refptr<net::CookieMonster> cookie_monster,
+static void DeleteCookiesOnIOThread(scoped_refptr<net::CookieStore> cookie_store,
const std::string& url,
const std::string& cookie_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (url.empty()) { // Delete all cookies.
- cookie_monster->DeleteAllAsync(net::CookieMonster::DeleteCallback());
+ cookie_store->DeleteAllAsync(net::CookieMonster::DeleteCallback());
}
GURL gurl(url);
if (!gurl.is_valid())
return;
if (cookie_name.empty()) {
// Delete all matching host cookies.
- cookie_monster->DeleteAllForHostAsync(gurl,
- net::CookieMonster::DeleteCallback());
+ cookie_store->DeleteAllCreatedBetweenForHostAsync(base::Time(), base::Time::Max(), gurl,
+ net::CookieMonster::DeleteCallback());
} else {
// Delete all matching host and domain cookies.
- cookie_monster->DeleteCookieAsync(gurl, cookie_name, base::Closure());
+ cookie_store->DeleteCookieAsync(gurl, cookie_name, base::Closure());
}
}
const std::string& cookie_name)
{
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- scoped_refptr<net::CookieMonster> cookie_monster = GetCookieMonster();
- if (cookie_monster.get()) {
+ scoped_refptr<net::CookieStore> cookie_store = GetCookieStore();
+ if (cookie_store.get()) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(DeleteCookiesOnIOThread,
- cookie_monster,
+ cookie_store,
url,
cookie_name));
}
void CookieManager::GetHostNamesWithCookiesAsync(AsyncHostnamesGetCb callback, void *data) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
host_callback_queue_.push(new EwkGetHostCallback(callback, data));
- scoped_refptr<net::CookieMonster> cookie_monster = GetCookieMonster();
- if (cookie_monster.get()) {
+ scoped_refptr<net::CookieStore> cookie_store = GetCookieStore();
+ if (cookie_store.get()) {
BrowserThread::PostTask(BrowserThread::IO,
FROM_HERE,
base::Bind(&CookieManager::FetchCookiesOnIOThread,
GetSharedThis(),
- cookie_monster));
+ cookie_store));
}
}
-void CookieManager::FetchCookiesOnIOThread(scoped_refptr<net::CookieMonster> cookie_monster) {
+void CookieManager::FetchCookiesOnIOThread(scoped_refptr<net::CookieStore> cookie_store) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- if (cookie_monster.get()) {
- cookie_monster->GetAllCookiesAsync(base::Bind(&CookieManager::OnFetchComplete,
- GetSharedThis()));
+ if (cookie_store.get()) {
+ cookie_store->GetAllCookiesAsync(base::Bind(&CookieManager::OnFetchComplete,
+ GetSharedThis()));
} else {
OnFetchComplete(net::CookieList());
}
completion->Signal();
}
-static void GetCookieValueOnIOThread(scoped_refptr<net::CookieMonster> cookie_monster,
+static void GetCookieValueOnIOThread(scoped_refptr<net::CookieStore> cookie_store,
const GURL& host,
std::string* result,
base::WaitableEvent* completion) {
net::CookieOptions options;
options.set_include_httponly();
- if (cookie_monster.get()) {
- cookie_monster->GetCookiesWithOptionsAsync(host,
- options,
- base::Bind(SignalGetCookieValueCompleted,
- completion,
- result));
+ if (cookie_store.get()) {
+ cookie_store->GetCookiesWithOptionsAsync(host,
+ options,
+ base::Bind(SignalGetCookieValueCompleted,
+ completion,
+ result));
} else {
DCHECK(completion);
completion->Signal();
std::string CookieManager::GetCookiesForURL(const std::string& url) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- scoped_refptr<net::CookieMonster> cookie_monster = GetCookieMonster();
- if (!cookie_monster.get())
+ scoped_refptr<net::CookieStore> cookie_store = GetCookieStore();
+ if (!cookie_store.get())
return std::string();
std::string cookie_value;
base::WaitableEvent completion(false, false);
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(GetCookieValueOnIOThread,
- cookie_monster,
+ cookie_store,
GURL(url),
&cookie_value,
&completion));
return scoped_refptr<content::URLRequestContextGetterEfl>(request_context_getter_.get());
}
-scoped_refptr<net::CookieMonster> CookieManager::GetCookieMonster() const {
+scoped_refptr<net::CookieStore> CookieManager::GetCookieStore() const {
scoped_refptr<content::URLRequestContextGetterEfl> request_context_getter = GetContextGetter();
if (request_context_getter.get()) {
return request_context_getter->
GetURLRequestContext()->
- cookie_store()->
- GetCookieMonster();
+ cookie_store();
} else {
- return scoped_refptr<net::CookieMonster>();
+ return scoped_refptr<net::CookieStore>();
}
}
const GURL& first_party_url,
bool setting_cookie);
// Fetch the cookies. This must be called in the IO thread.
- void FetchCookiesOnIOThread(scoped_refptr<net::CookieMonster> cookie_monster);
+ void FetchCookiesOnIOThread(scoped_refptr<net::CookieStore> cookie_store);
void OnFetchComplete(const net::CookieList& cookies);
scoped_refptr<CookieManager> GetSharedThis();
scoped_refptr<content::URLRequestContextGetterEfl> GetContextGetter() const;
- scoped_refptr<net::CookieMonster> GetCookieMonster() const;
+ scoped_refptr<net::CookieStore> GetCookieStore() const;
scoped_refptr<content::URLRequestContextGetterEfl> request_context_getter_;
//cookie policy information
base::Lock lock_;
#include "base/synchronization/waitable_event.h"
#include "components/autofill/content/browser/content_autofill_driver.h"
-#include "content/browser/memory/memory_pressure_controller.h"
+#include "content/browser/memory/memory_pressure_controller_impl.h"
#include "content/public/browser/appcache_service.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
// Also, newer chromium rebases (m49+) have a new API for this named
// MemoryPressureController::SendPressureNotification. Use it when available.
DLOG(WARNING) << "Releasing as much memory as possible.";
- content::MemoryPressureController::GetInstance()->
+ content::MemoryPressureControllerImpl::GetInstance()->
SimulatePressureNotificationInAllProcesses(
base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
}
}
void EWebView::Suspend() {
-
CHECK(web_contents_);
RenderViewHost *rvh = web_contents_->GetRenderViewHost();
- content::ResourceDispatcherHost* rdh = content::ResourceDispatcherHost::Get();
+ RenderFrameHost* rfh = web_contents_->GetMainFrame();
CHECK(rvh);
- CHECK(rdh);
+ CHECK(rfh);
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
- base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
- base::Unretained(rdh),
- rvh->GetProcess()->GetID(), rvh->GetRoutingID()));
+ base::Bind(&content::ResourceDispatcherHost::BlockRequestsForFrameFromUI, rfh));
- RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
- if (render_view_host)
- render_view_host->Send(new EwkViewMsg_SuspendScheduledTask(render_view_host->GetRoutingID()));
+ if (rvh)
+ rvh->Send(new EwkViewMsg_SuspendScheduledTask(rvh->GetRoutingID()));
}
void EWebView::Resume() {
CHECK(web_contents_);
RenderViewHost *rvh = web_contents_->GetRenderViewHost();
- content::ResourceDispatcherHost* rdh = content::ResourceDispatcherHost::Get();
+ RenderFrameHost *rfh = web_contents_->GetMainFrame();
CHECK(rvh);
- CHECK(rdh);
+ CHECK(rfh);
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
- base::Bind(&content::ResourceDispatcherHost::ResumeBlockedRequestsForRoute,
- base::Unretained(rdh),
- rvh->GetProcess()->GetID(), rvh->GetRoutingID()));
+ base::Bind(&content::ResourceDispatcherHost::ResumeBlockedRequestsForFrameFromUI, rfh));
- RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
- if (render_view_host)
- render_view_host->Send(new EwkViewMsg_ResumeScheduledTasks(render_view_host->GetRoutingID()));
+ if (rvh)
+ rvh->Send(new EwkViewMsg_ResumeScheduledTasks(rvh->GetRoutingID()));
}
double EWebView::GetTextZoomFactor() const {
}
void EWebView::SelectLinkText(const gfx::Point& touch_point) {
- float device_scale_factor = gfx::Screen::GetNativeScreen()->
+ float device_scale_factor = gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
render_view_host->Send(new ViewMsg_SelectLinkText(
}
void EWebView::EvasToBlinkCords(int x, int y, int* view_x, int* view_y) {
- DCHECK(gfx::Screen::GetNativeScreen());
+ DCHECK(gfx::Screen::GetScreen());
Evas_Coord tmpX, tmpY;
evas_object_geometry_get(evas_object_, &tmpX, &tmpY, NULL, NULL);
if (view_x) {
*view_x = x - tmpX;
- *view_x /= gfx::Screen::GetNativeScreen()->
+ *view_x /= gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
}
if (view_y) {
*view_y = y - tmpY;
- *view_y /= gfx::Screen::GetNativeScreen()->
+ *view_y /= gfx::Screen::GetScreen()->
GetPrimaryDisplay().device_scale_factor();
}
}
void EWebView::ExitFullscreen() {
WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents_.get());
- wci->ExitFullscreen();
+ wci->ExitFullscreen(false);
}
double EWebView::GetScale() {
Name: chromium-ewk
Description: EWK API based on chromium-efl engine
-Version: 49.2623.0.8-1
+Version: 50.2661.0.14-1
Requires: chromium-efl
Libs: -L${libdir} -lchromium-ewk
Cflags: -I${includedir}/chromium-ewk
void _Ewk_Geolocation_Permission_Request::runCallback(bool allowed) {
callback_.Run(allowed?
- content::PermissionStatus::PERMISSION_STATUS_GRANTED:
- content::PermissionStatus::PERMISSION_STATUS_DENIED);
+ content::PermissionStatus::GRANTED:
+ content::PermissionStatus::DENIED);
}
decided_ = true;
callback_.Run(allow?
- content::PermissionStatus::PERMISSION_STATUS_GRANTED:
- content::PermissionStatus::PERMISSION_STATUS_DENIED);
+ content::PermissionStatus::GRANTED:
+ content::PermissionStatus::DENIED);
if (suspended_) {
// If decision was suspended, then it was not deleted by the creator
if (response_headers->EnumerateHeader(NULL, "Set-Cookie", &set_cookie_))
cookie_ = set_cookie_;
- void* iter = NULL;
+ size_t iter = 0;
std::string name;
std::string value;
response_headers_ = eina_hash_string_small_new(FreeStringShare);
#include "renderer/render_view_observer_efl.h"
#include "components/visitedlink/renderer/visitedlink_slave.h"
#include "content/public/renderer/content_renderer_client.h"
+#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
const content::RenderView* render_view =
content::RenderView::FromWebView(frame->view());
bool result = false;
- GURL referrer_url(GURL(request.httpHeaderField(blink::WebString::fromUTF8("Referer"))));
+ GURL referrer_url(blink::WebStringToGURL(
+ request.httpHeaderField(blink::WebString::fromUTF8("Referer"))));
blink::WebReferrerPolicy referrer_policy =
request.isNull() ? frame->document().referrerPolicy() : request.referrerPolicy();
int render_view_id = render_view->GetRoutingID();
#include "third_party/WebKit/public/web/WebView.h"
namespace skia {
- typedef PlatformCanvas VectorCanvas;
+ typedef SkCanvas VectorCanvas;
}
namespace {
#include "content/renderer/external_popup_menu.h"
#include "common/render_messages_ewk.h"
#include "renderer/content_renderer_client_efl.h"
+#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebDocument.h"
void RenderFrameObserverEfl::WillSubmitForm(
const blink::WebFormElement& form) {
- GURL url(form.action());
+ GURL url(blink::WebStringToGURL(form.action()));
Send(new EwkHostMsg_FormSubmit(render_frame()->GetRoutingID(), url));
}
#include "third_party/WebKit/public/web/WebDataSource.h"
#include "third_party/WebKit/public/web/WebFormElement.h"
#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebFrameContentDumper.h"
#include "third_party/WebKit/public/web/WebHitTestResult.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
blink::WebFrame* frame = render_view()->GetWebView()->mainFrame();
if (!frame)
return;
- blink::WebString content = frame->contentAsText(INT_MAX);
+
+ // WebFrameContentDumper should only be used for testing purposes. See http://crbug.com/585164.
+ blink::WebString content = blink::WebFrameContentDumper::dumpFrameTreeAsText(frame->toWebLocalFrame(), INT_MAX);
Send(new EwkHostMsg_PlainTextGetContents(render_view()->GetRoutingID(), content.utf8(), plain_text_get_callback_id));
}
#include "text_encoding_map_efl.h"
+#include <algorithm>
#include <string>
namespace {
if (persistent_store.get() && persist_session_cookies)
cookie_monster->SetPersistSessionCookies(true);
- cookie_monster->SetEnableFileScheme(true);
+
+ std::vector<std::string> schemes;
+ for (int i = 0; i < net::CookieMonster::kDefaultCookieableSchemesCount; ++i)
+ schemes.push_back(std::string(net::CookieMonster::kDefaultCookieableSchemes[i]));
+ schemes.push_back(url::kFileScheme);
+ cookie_monster->SetCookieableSchemes(schemes);
cookie_store_path_ = path;
}
NULL,
NULL);
cookie_store_= CreateCookieStore(config);
- cookie_store_->GetCookieMonster()->SetPersistSessionCookies(persist_session_cookies);
- cookie_store_->GetCookieMonster()->SetEnableFileScheme(true);
+ net::CookieMonster* cookie_monster = static_cast<net::CookieMonster*>(
+ cookie_store_.get());
+ cookie_monster->SetPersistSessionCookies(persist_session_cookies);
+
+ std::vector<std::string> schemes;
+ for (int i = 0; i < net::CookieMonster::kDefaultCookieableSchemesCount; ++i)
+ schemes.push_back(std::string(net::CookieMonster::kDefaultCookieableSchemes[i]));
+ schemes.push_back(url::kFileScheme);
+ cookie_monster->SetCookieableSchemes(schemes);
+
DCHECK(url_request_context_);
url_request_context_->set_cookie_store(cookie_store_.get());
}
#include "web_contents_delegate_efl.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/utf_string_conversions.h"
#include "browser/favicon/favicon_database.h"
#include "browser/inputpicker/color_chooser_efl.h"
#include "browser/policy_response_delegate_efl.h"
#include "common/render_messages_ewk.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
+#include "components/prefs/pref_service.h"
#include "content/browser/renderer_host/render_widget_host_view_efl.h"
#include "content/common/content_switches_internal.h"
#include "content/common/date_time_suggestion.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/filename_util.h"
#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
#include "net/url_request/url_request_error_job.h"
#include "net/url_request/url_request_file_dir_job.h"
#include "net/url_request/url_request_file_job.h"
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="49.2623.0.8">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="50.2661.0.14">
<label> mini browser application for chromium-efl package </label>
<author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
<description> mini browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="49.2623.0.8">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="50.2661.0.14">
<label> mini browser application for chromium-efl package </label>
<author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
<description> mini browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="49.2623.0.8"
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="50.2661.0.14"
<label> micro browser application for chromium-efl package </label>
<author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
<description> micro browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="49.2623.0.8">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.chromium-efl" version="50.2661.0.14">
<label> micro browser application for chromium-efl package </label>
<author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
<description> micro browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="49.2623.0.8">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="50.2661.0.14">
<label>uBrowser application for chromium-efl package</label>
<author href="www.samsung.com" email="p.tworek@samsung.com">SRPOL</author>
<description>Small reference browser application for chromium-efl port</description>
%define _binary_payload w3.gzdio
Name: chromium-efl-libs
-%define ChromiumVersion 49.2623.0
-%define Week 8
+%define ChromiumVersion 50.2661.0
+%define Week 14
Version: %{ChromiumVersion}.%{Week}
Release: 1
Summary: Chromium-based app runtime, private libraries
Name: chromium-efl
Summary: Chromium EFL
# Set by by scripts/update-chromium-version.sh
-%define ChromiumVersion 49.2623.0
-%define Week 8
+%define ChromiumVersion 50.2661.0
+%define Week 14
Version: %{ChromiumVersion}.%{Week}
Release: 1
# The 'Group' should be specified as one of the following valid group list.
Source0: %{name}-%{version}.tar.gz
Source1: content_shell.in
+# [M50_2661] Temporary enabling the nodebug option by default.
+# The size of libchromium-ewk.so exceeds 2GB with debug information.
+# Because of this size, the QEMU cannot generate the rpm package.
+# FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-891
+%define nodebug 1
+
%if 0%{?nodebug}
%global __debug_install_post %{nil}
%global debug_package %{nil}
%define _binary_payload w3.gzdio
Name: crosswalk-bin
-Version: 15.49.2623.0
+Version: 15.50.2661.0
Release: 0
Summary: Chromium-based app runtime
License: (BSD-3-Clause and LGPL-2.1+)
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
<Id>kmcele1k1p</Id>
- <Version>49.2623.0.8</Version>
+ <Version>50.2661.0.14</Version>
<Type>C++App</Type>
<Descriptions>
<Description Locale="eng-PH"/>
'tizen_multimedia_eme_support%': 1,
'enable_web_speech%': 0,
+ 'rtc_use_h264%' : 0, # override value in third_party/webrtc/build/common.gypi
# [M44_2403] Temporary disabling the tizen_disable_gpu_thread for switching to new chromium
# FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14046
projects / platform / framework / web / chromium-efl.git / commitdiff