#include <string>
#include <utility>
+#include "android_webview/browser/aw_browser_permission_request_delegate.h"
#include "android_webview/browser/browser_view_renderer.h"
+#include "android_webview/browser/browser_view_renderer_client.h"
#include "android_webview/browser/find_helper.h"
+#include "android_webview/browser/gl_view_renderer_manager.h"
#include "android_webview/browser/icon_helper.h"
#include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
+#include "android_webview/browser/shared_renderer_state.h"
+#include "android_webview/native/permission/permission_request_handler_client.h"
+#include "base/android/jni_weak_ref.h"
#include "base/android/scoped_java_ref.h"
-#include "base/android/jni_helper.h"
#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
class SkBitmap;
class TabContents;
+struct AwDrawGLInfo;
namespace content {
class WebContents;
class AwContentsContainer;
class AwContentsClientBridge;
+class AwPdfExporter;
class AwWebContentsDelegate;
+class HardwareRenderer;
+class PermissionRequestHandler;
// Native side of java-class of same name.
// Provides the ownership of and access to browser components required for
class AwContents : public FindHelper::Listener,
public IconHelper::Listener,
public AwRenderViewHostExtClient,
- public BrowserViewRenderer::Client {
+ public BrowserViewRendererClient,
+ public PermissionRequestHandlerClient,
+ public AwBrowserPermissionRequestDelegate {
public:
// Returns the AwContents instance associated with |web_contents|, or NULL.
static AwContents* FromWebContents(content::WebContents* web_contents);
jobject contents_client_bridge,
jobject io_thread_client,
jobject intercept_navigation_delegate);
- jint GetWebContents(JNIEnv* env, jobject obj);
- jint GetAwContentsClientBridge(JNIEnv* env, jobject obj);
+ jlong GetWebContents(JNIEnv* env, jobject obj);
void Destroy(JNIEnv* env, jobject obj);
void DocumentHasImages(JNIEnv* env, jobject obj, jobject message);
void GenerateMHTML(JNIEnv* env, jobject obj, jstring jpath, jobject callback);
+ void CreatePdfExporter(JNIEnv* env, jobject obj, jobject pdfExporter);
void AddVisitedLinks(JNIEnv* env, jobject obj, jobjectArray jvisited_links);
base::android::ScopedJavaLocalRef<jbyteArray> GetCertificate(
JNIEnv* env, jobject obj);
jboolean is_hardware_accelerated,
jint scroll_x,
jint scroll_y,
- jint clip_left,
- jint clip_top,
- jint clip_right,
- jint clip_bottom);
- void SetGlobalVisibleRect(JNIEnv* env,
- jobject obj,
- jint visible_left,
- jint visible_top,
- jint visible_right,
- jint visible_bottom);
- jint GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
- jint CapturePicture(JNIEnv* env, jobject obj, int width, int height);
+ jint visible_left,
+ jint visible_top,
+ jint visible_right,
+ jint visible_bottom);
+ jlong GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
+ jlong CapturePicture(JNIEnv* env, jobject obj, int width, int height);
void EnableOnNewPicture(JNIEnv* env, jobject obj, jboolean enabled);
+ void ClearView(JNIEnv* env, jobject obj);
+ void SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
+ jstring url, jstring extra_headers);
+ void SendCheckRenderThreadResponsiveness(JNIEnv* env, jobject obj);
+
+ void DrawGL(AwDrawGLInfo* draw_info);
- // Geolocation API support
- void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
- void HideGeolocationPrompt(const GURL& origin);
void InvokeGeolocationCallback(JNIEnv* env,
jobject obj,
jboolean value,
jstring origin);
+ // PermissionRequestHandlerClient implementation.
+ virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE;
+ virtual void OnPermissionRequestCanceled(
+ AwPermissionRequest* request) OVERRIDE;
+
+ PermissionRequestHandler* GetPermissionRequestHandler() {
+ return permission_request_handler_.get();
+ }
+
+ void PreauthorizePermission(JNIEnv* env,
+ jobject obj,
+ jstring origin,
+ jlong resources);
+
+ // AwBrowserPermissionRequestDelegate implementation.
+ virtual void RequestProtectedMediaIdentifierPermission(
+ const GURL& origin,
+ const base::Callback<void(bool)>& callback) OVERRIDE;
+ virtual void CancelProtectedMediaIdentifierPermissionRequests(
+ const GURL& origin) OVERRIDE;
+ virtual void RequestGeolocationPermission(
+ const GURL& origin,
+ const base::Callback<void(bool)>& callback) OVERRIDE;
+ virtual void CancelGeolocationPermissionRequests(
+ const GURL& origin) OVERRIDE;
+
+
// Find-in-page API and related methods.
void FindAllAsync(JNIEnv* env, jobject obj, jstring search_string);
void FindNext(JNIEnv* env, jobject obj, jboolean forward);
void ClearMatches(JNIEnv* env, jobject obj);
FindHelper* GetFindHelper();
+ // Per WebView Cookie Policy
+ bool AllowThirdPartyCookies();
+
// FindHelper::Listener implementation.
virtual void OnFindResultReceived(int active_ordinal,
int match_count,
virtual void OnWebLayoutContentsSizeChanged(
const gfx::Size& contents_size) OVERRIDE;
- // BrowserViewRenderer::Client implementation.
- virtual bool RequestDrawGL(jobject canvas) OVERRIDE;
+ // BrowserViewRendererClient implementation.
+ virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) OVERRIDE;
virtual void PostInvalidate() OVERRIDE;
- virtual void UpdateGlobalVisibleRect() OVERRIDE;
virtual void OnNewPicture() OVERRIDE;
virtual gfx::Point GetLocationOnScreen() OVERRIDE;
- virtual void SetMaxContainerViewScrollOffset(
- gfx::Vector2d new_value) OVERRIDE;
virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
virtual bool IsFlingActive() const OVERRIDE;
- virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE;
- virtual void SetContentsSize(gfx::SizeF contents_size_dip) OVERRIDE;
+ virtual void UpdateScrollState(gfx::Vector2d max_scroll_offset,
+ gfx::SizeF contents_size_dip,
+ float page_scale_factor,
+ float min_page_scale_factor,
+ float max_page_scale_factor) OVERRIDE;
virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
+ const BrowserViewRenderer* GetBrowserViewRenderer() const;
+
void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
- jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
+ jlong ReleasePopupAwContents(JNIEnv* env, jobject obj);
void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y);
void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale);
- void SetFixedLayoutSize(JNIEnv* env,
- jobject obj,
- jint width_dip,
- jint height_dip);
void SetSaveFormData(bool enabled);
- // Sets the java delegate
- void SetAwAutofillManagerDelegate(jobject delegate);
+ // Sets the java client
+ void SetAwAutofillClient(jobject client);
void SetJsOnlineProperty(JNIEnv* env, jobject obj, jboolean network_up);
- void TrimMemory(JNIEnv* env, jobject obj, jint level);
+ void TrimMemory(JNIEnv* env, jobject obj, jint level, jboolean visible);
private:
+ void InitDataReductionProxyIfNecessary();
void InitAutofillIfNecessary(bool enabled);
- void SetAndroidWebViewRendererPrefs();
+
+ void InitializeHardwareDrawIfNeeded();
+ void ReleaseHardwareDrawIfNeeded();
+
+ // Geolocation API support
+ void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
+ void HideGeolocationPrompt(const GURL& origin);
JavaObjectWeakGlobalRef java_ref_;
scoped_ptr<content::WebContents> web_contents_;
scoped_ptr<FindHelper> find_helper_;
scoped_ptr<IconHelper> icon_helper_;
scoped_ptr<AwContents> pending_contents_;
- scoped_ptr<BrowserViewRenderer> browser_view_renderer_;
+ SharedRendererState shared_renderer_state_;
+ BrowserViewRenderer browser_view_renderer_;
+ scoped_ptr<HardwareRenderer> hardware_renderer_;
+ scoped_ptr<AwPdfExporter> pdf_exporter_;
+ scoped_ptr<PermissionRequestHandler> permission_request_handler_;
// GURL is supplied by the content layer as requesting frame.
// Callback is supplied by the content layer, and is invoked with the result
// The first element in the list is always the currently pending request.
std::list<OriginCallback> pending_geolocation_prompts_;
+ base::Lock render_thread_lock_;
+ GLViewRendererManager::Key renderer_manager_key_;
+
DISALLOW_COPY_AND_ASSIGN(AwContents);
};
projects / platform / framework / web / crosswalk.git / blobdiff