This commit resolves compiler and linker errors to enable EFL port.
Change-Id: Ic83ff065fadee8e83b2d4b81b851457982571462
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
void GLES2ImplementationEfl::OrderingBarrierCHROMIUM() {}
+void GLES2ImplementationEfl::MultiDrawArraysWEBGL(GLenum /* mode */,
+ const GLint* /* firsts */,
+ const GLsizei* /* counts */,
+ GLsizei /* drawcount */) {
+ NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawArraysInstancedWEBGL(
+ GLenum /* mode */,
+ const GLint* /* firsts */,
+ const GLsizei* /* counts */,
+ const GLsizei* /* instance_counts */,
+ GLsizei /* drawcount */) {
+ NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawElementsWEBGL(
+ GLenum /* mode */,
+ const GLsizei* /* counts */,
+ GLenum /* type */,
+ const GLsizei* /* offsets */,
+ GLsizei /* drawcount */) {
+ NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawElementsInstancedWEBGL(
+ GLenum /* mode */,
+ const GLsizei* /* counts */,
+ GLenum /* type */,
+ const GLsizei* /* offsets */,
+ const GLsizei* /* instance_counts */,
+ GLsizei /* drawcount */) {
+ NOTIMPLEMENTED();
+}
+
void GLES2ImplementationEfl::StencilFunc(GLenum func, GLint ref, GLuint mask) {
evas_gl_api_->glStencilFunc(func, ref, mask);
}
return 0;
}
-void GLES2ImplementationEfl::ScheduleDCLayerSharedStateCHROMIUM(
- GLfloat /* opacity */,
- GLboolean /* is_clipped */,
- const GLfloat* /* clip_rect */,
+void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
+ GLuint /* y_texture_id */,
+ GLuint /* uv_texture_id */,
GLint /* z_order */,
- const GLfloat* /* transform */) {
+ GLint /* content_x */,
+ GLint /* content_y */,
+ GLint /* content_width */,
+ GLint /* content_height */,
+ GLint /* quad_x */,
+ GLint /* quad_y */,
+ GLint /* quad_width */,
+ GLint /* quad_height */,
+ GLfloat /* transform_c1r1 */,
+ GLfloat /* transform_c2r1 */,
+ GLfloat /* transform_c1r2 */,
+ GLfloat /* transform_c2r2 */,
+ GLfloat /* transform_tx */,
+ GLfloat /* transform_ty */,
+ GLboolean /* is_clipped */,
+ GLint /* clip_x */,
+ GLint /* clip_y */,
+ GLint /* clip_width */,
+ GLint /* clip_height */,
+ GLuint /* protected_video_type */) {
NOTIMPLEMENTED();
}
-void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
- GLsizei /* num_textures */,
- const GLuint* /* contents_texture_ids */,
- const GLfloat* /* contents_rect */,
- GLuint /* background_color */,
- GLuint /* edge_aa_mask */,
- const GLfloat* /* bounds_rect */,
- GLuint /* filter */,
- bool /* is_protected_video */) {
+void GLES2ImplementationEfl::SetActiveURLCHROMIUM(const char* /* url */) {
NOTIMPLEMENTED();
}
NOTIMPLEMENTED();
}
+GLuint GLES2ImplementationEfl::CreateAndTexStorage2DSharedImageCHROMIUM(
+ const GLbyte* /* mailbox */) {
+ NOTIMPLEMENTED();
+ return 0;
+}
+
+void GLES2ImplementationEfl::BeginSharedImageAccessDirectCHROMIUM(
+ GLuint /* texture */,
+ GLenum /* mode */) {
+ NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::EndSharedImageAccessDirectCHROMIUM(
+ GLuint /* texture */) {
+ NOTIMPLEMENTED();
+}
+
#endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_
void ShallowFinishCHROMIUM() override;
void ShallowFlushCHROMIUM() override;
void OrderingBarrierCHROMIUM() override;
+void MultiDrawArraysWEBGL(GLenum mode,
+ const GLint* firsts,
+ const GLsizei* counts,
+ GLsizei drawcount) override;
+void MultiDrawArraysInstancedWEBGL(GLenum mode,
+ const GLint* firsts,
+ const GLsizei* counts,
+ const GLsizei* instance_counts,
+ GLsizei drawcount) override;
+void MultiDrawElementsWEBGL(GLenum mode,
+ const GLsizei* counts,
+ GLenum type,
+ const GLsizei* offsets,
+ GLsizei drawcount) override;
+void MultiDrawElementsInstancedWEBGL(GLenum mode,
+ const GLsizei* counts,
+ GLenum type,
+ const GLsizei* offsets,
+ const GLsizei* instance_counts,
+ GLsizei drawcount) override;
void StencilFunc(GLenum func, GLint ref, GLuint mask) override;
void StencilFuncSeparate(GLenum face,
GLenum func,
void CommitOverlayPlanesCHROMIUM(GLuint64 swap_id, GLbitfield flags) override;
void FlushDriverCachesCHROMIUM() override;
GLuint GetLastFlushIdCHROMIUM() override;
-void ScheduleDCLayerSharedStateCHROMIUM(GLfloat opacity,
- GLboolean is_clipped,
- const GLfloat* clip_rect,
- GLint z_order,
- const GLfloat* transform) override;
-void ScheduleDCLayerCHROMIUM(GLsizei num_textures,
- const GLuint* contents_texture_ids,
- const GLfloat* contents_rect,
- GLuint background_color,
- GLuint edge_aa_mask,
- const GLfloat* bounds_rect,
- GLuint filter,
- bool is_protected_video) override;
+void ScheduleDCLayerCHROMIUM(GLuint y_texture_id,
+ GLuint uv_texture_id,
+ GLint z_order,
+ GLint content_x,
+ GLint content_y,
+ GLint content_width,
+ GLint content_height,
+ GLint quad_x,
+ GLint quad_y,
+ GLint quad_width,
+ GLint quad_height,
+ GLfloat transform_c1r1,
+ GLfloat transform_c2r1,
+ GLfloat transform_c1r2,
+ GLfloat transform_c2r2,
+ GLfloat transform_tx,
+ GLfloat transform_ty,
+ GLboolean is_clipped,
+ GLint clip_x,
+ GLint clip_y,
+ GLint clip_width,
+ GLint clip_height,
+ GLuint protected_video_type) override;
+void SetActiveURLCHROMIUM(const char* url) override;
void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override;
void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override;
GLuint GenPathsCHROMIUM(GLsizei range) override;
GLint baseViewIndex,
GLsizei numViews) override;
void MaxShaderCompilerThreadsKHR(GLuint count) override;
+GLuint CreateAndTexStorage2DSharedImageCHROMIUM(const GLbyte* mailbox) override;
+void BeginSharedImageAccessDirectCHROMIUM(GLuint texture, GLenum mode) override;
+void EndSharedImageAccessDirectCHROMIUM(GLuint texture) override;
#endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_
return false;
}
-void RenderWidgetHostViewEfl::EnsureSurfaceSynchronizedForLayoutTest() {
+void RenderWidgetHostViewEfl::EnsureSurfaceSynchronizedForWebTest() {
NOTIMPLEMENTED();
}
return viz::FrameSinkId();
}
-const viz::LocalSurfaceId& RenderWidgetHostViewEfl::GetLocalSurfaceId() const {
- return viz::ParentLocalSurfaceIdAllocator::InvalidLocalSurfaceId();
+const viz::LocalSurfaceIdAllocation&
+RenderWidgetHostViewEfl::GetLocalSurfaceIdAllocation() const {
+ return viz::ParentLocalSurfaceIdAllocator::InvalidLocalSurfaceIdAllocation();
}
void RenderWidgetHostViewEfl::UpdateBackgroundColor() {
DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
SkColorGetA(color) == SK_AlphaTRANSPARENT);
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
host_->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
+#endif // EWK_BRINGUP
}
SkColor RenderWidgetHostViewEfl::background_color() const {
gfx::NativeView GetNativeView() const override;
gfx::NativeViewAccessible GetNativeViewAccessible() override;
bool IsSurfaceAvailableForCopy() const override;
+ void EnsureSurfaceSynchronizedForWebTest() override;
void Show() override;
void Hide() override;
bool IsShowing() override;
SkColor background_color() const;
void TakeFallbackContentFrom(RenderWidgetHostView* view) override;
viz::SurfaceId GetCurrentSurfaceId() const override;
- void EnsureSurfaceSynchronizedForLayoutTest() override;
const viz::FrameSinkId& GetFrameSinkId() const override;
- const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
+ const viz::LocalSurfaceIdAllocation& GetLocalSurfaceIdAllocation()
+ const override;
void UpdateBackgroundColor() override;
void UpdateBackgroundColorFromRenderer(SkColor color);
void DidOverscroll(const ui::DidOverscrollParams& params) override;
gfx::Rect GetBoundsInRootWindow() override;
void RenderProcessGone(base::TerminationStatus, int) override;
- bool OnMessageReceived(const IPC::Message&) override;
+ bool OnMessageReceived(const IPC::Message&);
void OnFilteredMessageReceived(const IPC::Message&);
#include "ipc/struct_constructor_macros.h"
#include "content/common/message_generator_efl.h"
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "content/common/message_generator_efl.h"
-
// Generate param traits write methods.
#include "ipc/param_traits_write_macros.h"
namespace IPC {
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
+#include "cc/base/switches.h"
+#include "components/js_dialogs_efl/javascript_dialog_manager_efl.h"
+#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/shell/browser/web_test/web_test_javascript_dialog_manager.h"
#include "content/shell/common/shell_switches.h"
-#include "content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h"
-#include "components/js_dialogs_efl/javascript_dialog_manager_efl.h"
#include "efl/window_factory.h"
#include "ui/gl/gl_switches.h"
-#include "cc/base/switches.h"
namespace content {
WebContents* source) {
if (!dialog_manager_) {
if (switches::IsRunWebTestsSwitchPresent()) {
- dialog_manager_.reset(new LayoutTestJavaScriptDialogManager);
+ dialog_manager_.reset(new WebTestJavaScriptDialogManager);
} else {
dialog_manager_.reset(new JavaScriptDialogManagerEfl);
}
return false;
}
-void* GLES2ImplementationEfl::MapTransferCacheEntry(size_t serialized_size) {
+void* GLES2ImplementationEfl::MapTransferCacheEntry(uint32_t serialized_size) {
NOTIMPLEMENTED();
return nullptr;
}
uint32_t texture_id) override {}
bool ThreadsafeDiscardableTextureIsDeletedForTracing(
uint32_t texture_id) override;
- void* MapTransferCacheEntry(size_t serialized_size) override;
+ void* MapTransferCacheEntry(uint32_t serialized_size) override;
void UnmapAndCreateTransferCacheEntry(uint32_t type, uint32_t id) override {}
bool ThreadsafeLockTransferCacheEntry(uint32_t entry_type,
uint32_t entry_id) override;
void OnPreShutdown() override;
uint64_t GetSequenceNumber(ClipboardType type) const override;
- bool IsFormatAvailable(const FormatType& format,
+ bool IsFormatAvailable(const ClipboardFormatType& format,
ClipboardType type) const override;
void Clear(ClipboardType type) override;
void ReadAvailableTypes(ClipboardType type,
void ReadCustomData(ClipboardType clipboard_type,
const base::string16& type,
base::string16* result) const override;
- void ReadData(const FormatType& format, std::string* result) const override;
+ void ReadData(const ClipboardFormatType& format,
+ std::string* result) const override;
void WriteText(const char* text_data, size_t text_len) override;
void WriteHTML(const char* markup_data,
void WriteBitmap(const SkBitmap& bitmap) override;
- void WriteData(const FormatType& format,
+ void WriteData(const ClipboardFormatType& format,
const char* data_data,
size_t data_len) override;
};
# For //ui/base target
external_ui_base_includes = [ "//third_party/mojo/src/" ]
external_ui_base_sources = [
+ "clipboard/clipboard_aura.cc",
+ "clipboard/clipboard_aura.h",
+ "clipboard/clipboard_format_type_aura.cc",
"//ui/base/nine_image_painter_factory.h",
"//tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc",
- "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc",
- "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h",
"//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.cc",
"//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h",
]
+# FIXME: ewk_bringup definition should be removed.
+if (!ewk_bringup) {
+ sources += [
+ "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc",
+ "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h",
+ ]
+}
+
# EWK_BRINGUP
#if (use_x11) {
# if (!wayland_bringup) {
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/dom_storage_context.h"
-#include "content/public/browser/local_storage_usage_info.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/storage_usage_info.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/disk_cache.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "storage/browser/quota/quota_manager.h"
-//#include "storage/common/quota/quota_types.h"
using content::BrowserThread;
}
void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo(
- const std::vector<content::LocalStorageUsageInfo>& infos) {
+ const std::vector<content::StorageUsageInfo>& infos) {
DCHECK(waiting_for_clear_local_storage_);
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
for (size_t i = 0; i < infos.size(); ++i) {
#include "base/time/time.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-//#include "storage/common/quota/quota_types.h"
#include "url/gurl.h"
#include "url/origin.h"
class AppCacheService;
class BrowserContext;
class DOMStorageContext;
-struct LocalStorageUsageInfo;
+struct StorageUsageInfo;
class StoragePartition;
}
namespace disk_cache {
void ClearLocalStorageOnUIThread();
// Callback to deal with the list gathered in ClearLocalStorageOnUIThread.
- void OnGotLocalStorageUsageInfo(const std::vector<content::LocalStorageUsageInfo>&);
+ void OnGotLocalStorageUsageInfo(
+ const std::vector<content::StorageUsageInfo>&);
// Invoked on the IO thread to delete all storage types managed by the quota
// system: AppCache, Databases, FileSystems.
};
RenderMessageFilterEfl::RenderMessageFilterEfl(int render_process_id)
- : BrowserMessageFilter(kFilteredMessageClasses,
- arraysize(kFilteredMessageClasses))
- , render_process_id_(render_process_id) {
-}
+ : BrowserMessageFilter(kFilteredMessageClasses,
+ base::size(kFilteredMessageClasses)),
+ render_process_id_(render_process_id) {}
RenderMessageFilterEfl::~RenderMessageFilterEfl() { }
#include "browser/web_cache_efl/web_cache_manager_efl.h"
#include "base/logging.h"
-#include "base/sys_info.h"
-#include "common/render_messages_ewk.h"
+#include "base/system/sys_info.h"
#include "common/cache_params_efl.h"
+#include "common/render_messages_ewk.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
content::NotificationRegistrar registrar_;
};
-
WebViewBrowserMessageFilter::WebViewBrowserMessageFilter(
content::WebContents* web_contents)
: BrowserMessageFilter(kFilteredMessageClasses,
- arraysize(kFilteredMessageClasses)),
- private_(new WebViewBrowserMessageFilterPrivate(web_contents)) {
-}
+ base::size(kFilteredMessageClasses)),
+ private_(new WebViewBrowserMessageFilterPrivate(web_contents)) {}
WebViewBrowserMessageFilter::~WebViewBrowserMessageFilter() {
// Due to NotificationRegistrar private_ shall be destroyed in UI thread
return *(geolocation_permission_context_.get());
}
+ClientHintsControllerDelegate*
+BrowserContextEfl::GetClientHintsControllerDelegate() {
+ return nullptr;
+}
+
BackgroundFetchDelegate* BrowserContextEfl::GetBackgroundFetchDelegate() {
return nullptr;
}
const HTTPCustomHeadersEflMap GetHTTPCustomHeadersEflMap() const;
net::HostResolver* GetHostResolver();
- net::URLRequestContext* GetRequestContext() override;
+ net::URLRequestContext* GetRequestContext();
void set_url_request_context_getter(URLRequestContextGetterEfl* getter);
scoped_refptr<CookieManager> GetCookieManager() const;
}
PushMessagingService* GetPushMessagingService() override { return 0; }
base::FilePath GetPath() const override;
- base::FilePath GetCachePath() const override;
+ base::FilePath GetCachePath() const;
BackgroundSyncController* GetBackgroundSyncController() override;
net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
URLRequestInterceptorScopedVector request_interceptors) override {
return nullptr;
}
+ ClientHintsControllerDelegate* GetClientHintsControllerDelegate() override;
BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate() override;
class ContentClientEfl : public content::ContentClient {
public:
// ContentClient implementation.
- virtual std::string GetProduct() const override;
- virtual std::string GetUserAgent() const override;
+ std::string GetProduct() const;
+ std::string GetUserAgent() const;
virtual base::string16 GetLocalizedString(int message_id) const override;
virtual base::StringPiece GetDataResource(
int resource_id,
// Notification message carrying undo stack size after executing undo
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyUndo,
int, /* render view ID */
- size_t /* size of the undo stack */)
+ uint32_t /* size of the undo stack */)
// Notification message carrying redo stack size after executing redo
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRedo,
int, /* render view ID */
- size_t /* size of the redo stack */)
+ uint32_t /* size of the redo stack */)
// Notification message carrying undo stack size after registering undo
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRegisterUndo,
int, /* render view ID */
- size_t /* size of the undo stack */)
+ uint32_t /* size of the undo stack */)
// Notification message carrying redo stack size after registering redo
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRegisterRedo,
int, /* render view ID */
- size_t /* size of the redo stack */)
+ uint32_t /* size of the redo stack */)
// Notification message carrying undo stack size after clearing undo stack
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyClearUndo,
int, /* render view ID */
- size_t /* size of the undo stack */)
+ uint32_t /* size of the undo stack */)
// Notification message carrying redo stack size after clearing redo stack
IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyClearRedo,
int, /* render view ID */
- size_t /* size of the redo stack */)
+ uint32_t /* size of the redo stack */)
#include "ipc/struct_constructor_macros.h"
#include "common/message_generator_ewk.h"
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "common/message_generator_ewk.h"
-
// Generate param traits write methods.
#include "ipc/param_traits_write_macros.h"
namespace IPC {
NavigationPolicyParams::NavigationPolicyParams()
: render_view_id(-1),
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
policy(blink::kWebNavigationPolicyIgnore),
+#endif
type(blink::kWebNavigationTypeOther),
should_replace_current_entry(false),
is_main_frame(false),
const blink::mojom::WindowFeatures& features,
bool user_gesture,
bool opener_suppressed,
- bool* no_javascript_access) override;
+ bool* no_javascript_access);
virtual void ResourceDispatcherHostCreated() override;
#include "net/base/filename_util.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "private/ewk_context_menu_private.h"
-#include "third_party/blink/public/platform/web_referrer_policy.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/clipboard_helper_efl.h"
content::OpenURLParams params(
url,
content::Referrer(web_contents_.GetVisibleURL(),
- blink::kWebReferrerPolicyAlways),
+ network::mojom::ReferrerPolicy::kAlways),
-1, /* -1 to indicate the main frame */
disposition, ui::PAGE_TRANSITION_LINK, false);
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/dom_storage_context.h"
-#include "content/public/browser/local_storage_usage_info.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/storage_usage_info.h"
#include "net/http/http_cache.h"
#include "net/proxy_resolution/proxy_config_service_fixed.h"
#include "net/proxy_resolution/proxy_resolution_service.h"
DCHECK(user_data_);
}
- void Dispatch(
- const std::vector<content::LocalStorageUsageInfo>& local_storage) {
+ void Dispatch(const std::vector<content::StorageUsageInfo>& local_storage) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
Eina_List* lorigins = NULL;
- std::vector<content::LocalStorageUsageInfo>::const_iterator it;
+ std::vector<content::StorageUsageInfo>::const_iterator it;
for (it = local_storage.begin(); it != local_storage.end(); it++) {
- _Ewk_Security_Origin* origin = new _Ewk_Security_Origin(it->origin);
+ _Ewk_Security_Origin* origin =
+ new _Ewk_Security_Origin(it->origin.GetURL());
lorigins = eina_list_append(lorigins, origin);
}
content::StoragePartition* partition =
BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
- partition->GetDOMStorageContext()->DeleteLocalStorage(origin,
- base::DoNothing());
+ partition->GetDOMStorageContext()->DeleteLocalStorage(
+ url::Origin::Create(origin), base::DoNothing());
}
void EWebContext::WebStorageOriginsAllGet(
}
bool EWebView::SetUserAgent(const char* userAgent) {
- const content::NavigationController& controller =
- web_contents_->GetController();
+ content::NavigationController& controller = web_contents_->GetController();
bool override = userAgent && strlen(userAgent);
for (int i = 0; i < controller.GetEntryCount(); ++i)
controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override);
const char* EWebView::GetUserAgent() const {
if (!web_contents_->GetUserAgentOverride().empty())
user_agent_ = web_contents_->GetUserAgentOverride();
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
else
user_agent_ = content::GetContentClientExport()->GetUserAgent();
+#endif
return user_agent_.c_str();
}
NavigationEntry* navigationEntry = navigationController.GetEntryAtIndex(i);
sessions::SerializedNavigationEntry serializedEntry =
sessions::ContentSerializedNavigationBuilder::FromNavigationEntry(
- i, *navigationEntry);
+ i, navigationEntry);
serializedEntry.WriteToPickle(MAX_SESSION_ENTRY_SIZE, &sessionPickle);
}
content::StartBrowserTaskScheduler();
content::BrowserTaskExecutor::Create();
- instance_->browser_main_runner_ = BrowserMainRunner::Create();
+ instance_->browser_main_runner_ = BrowserMainRunner::Create().get();
instance_->browser_main_runner_->Initialize(main_funtion_params);
base::ThreadRestrictions::SetIOAllowed(true);
}
std::string HttpUserAgentSettingsEfl::GetUserAgent() const {
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
return content::GetContentClientExport()->GetUserAgent();
+#else
+ return std::string();
+#endif
}
work_scheduled_ = false;
}
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
Delegate* delegate = base::MessageLoopForUI::current();
// Added as part M67 bringup need to check why
if (!delayed_work_time.is_null())
ScheduleDelayedWork(delayed_work_time);
+#endif // EWK_BRINGUP
}
void MessagePumpForUIEfl::DoDelayedWork() {
}
void _Ewk_Back_Forward_List::UpdateItemWithEntry(
- const content::NavigationEntry* entry) {
+ content::NavigationEntry* entry) {
if (entry) {
CacheMap::iterator it = cache_.find(entry);
if (it != cache_.end()) {
Update(entry);
}
- void Update(const content::NavigationEntry* entry) {
+ void Update(content::NavigationEntry* entry) {
if (entry) {
url_ = entry->GetURL();
original_url_ = entry->GetUserTypedURL();
void NewPageCommited(int prev_entry_index,
content::NavigationEntry* new_entry);
- void UpdateItemWithEntry(const content::NavigationEntry* entry);
+ void UpdateItemWithEntry(content::NavigationEntry* entry);
void ClearCache();
// FIXME: EWK_BRINGUP: Check the need.
#include <content/public/browser/browser_thread.h>
#include "base/callback.h"
-#include "content/public/common/media_stream_request.h"
+#include "content/public/browser/media_stream_request.h"
#include "private/ewk_security_origin_private.h"
#include "public/ewk_security_origin.h"
#include "web_contents_delegate_efl.h"
blink::WebFrame* frame,
v8::Handle<v8::Context> context,
int world_id) {
- const content::RenderView* render_view = content::RenderView::FromWebView(
- frame->View());
+ content::RenderView* render_view =
+ content::RenderView::FromWebView(frame->View());
if (widget_) {
widget_->StartSession(context, render_view->GetRoutingID(),
frame->ToWebLocalFrame()
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect) {
- const content::RenderView* render_view =
+ content::RenderView* render_view =
content::RenderView::FromWebView(frame->View());
bool result = false;
GURL referrer_url(blink::WebStringToGURL(
request.HttpHeaderField(blink::WebString::FromUTF8("Referer"))));
- blink::WebReferrerPolicy referrer_policy =
+ network::mojom::ReferrerPolicy referrer_policy =
request.IsNull()
? frame->ToWebLocalFrame()->GetDocument().GetReferrerPolicy()
: request.GetReferrerPolicy();
namespace {
-typedef blink::WebContentSecurityPolicyType SecurityPolicyType;
-
-static_assert(
- static_cast<int>(SecurityPolicyType::kWebContentSecurityPolicyTypeReport) ==
- static_cast<int>(EWK_REPORT_ONLY),
- "mismatching enums : EWK_REPORT_ONLY");
-static_assert(static_cast<int>(
- SecurityPolicyType::kWebContentSecurityPolicyTypeEnforce) ==
+typedef blink::mojom::ContentSecurityPolicyType SecurityPolicyType;
+
+static_assert(static_cast<int>(SecurityPolicyType::kReport) ==
+ static_cast<int>(EWK_REPORT_ONLY),
+ "mismatching enums : EWK_REPORT_ONLY");
+static_assert(static_cast<int>(SecurityPolicyType::kEnforce) ==
static_cast<int>(EWK_ENFORCE_POLICY),
"mismatching enums : EWK_ENFORCE_POLICY");
if (!render_view() || !render_view()->GetWebView())
return false;
-
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
const blink::WebHitTestResult web_hit_test_result =
render_view()->GetWebView()->HitTestResultAt(
blink::WebPoint(view_x, view_y));
+#else
+ blink::WebHitTestResult web_hit_test_result;
+#endif
if (web_hit_test_result.GetNode().IsNull())
return false;
return;
// Hide selection and autofill popups.
+#if !defined(EWK_BRINGUP) // FIXME: m73 bringup
view->HidePopups();
+#endif
view->SetTextZoomFactor(zoom_factor);
}
#ifndef TextEncodingMapEfl_h
#define TextEncodingMapEfl_h
-#include "base/memory/singleton.h"
-
#include <Eina.h>
-#include "base/containers/hash_tables.h"
+#include <unordered_set>
+
+#include "base/memory/singleton.h"
namespace base {
template <typename T> struct DefaultSingletonTraits;
private:
friend struct base::DefaultSingletonTraits<TextEncodingMapEfl>;
TextEncodingMapEfl();
- base::hash_set<std::string> encoding_name_set_;
+ std::unordered_set<std::string> encoding_name_set_;
};
#endif // TextEncodingRegistry_h
if (use_aura) {
deps += [ "//ui/events" ]
sources += [ "window_tracker_template.h" ]
+ } else {
+ sources -= [
+ "cursor/cursor.cc",
+ "cursor/cursor.h",
+ ]
}
if (!use_aura || !is_linux) {
typedef ui::Cursor NativeCursor;
typedef void* NativeView;
typedef void* NativeWindow;
-typedef SkRegion* NativeRegion;
typedef ui::Event* NativeEvent;
constexpr NativeView kNullNativeView = nullptr;
constexpr NativeWindow kNullNativeWindow = nullptr;