#include <vector>
#include "base/android/jni_android.h"
-#include "base/android/jni_helper.h"
-#include "base/basictypes.h"
+#include "base/android/jni_weak_ref.h"
#include "base/compiler_specific.h"
#include "base/i18n/rtl.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/android/content_view_core.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/events/gesture_detection/filtered_gesture_provider.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/rect_f.h"
#include "url/gurl.h"
}
namespace content {
+class GinJavaBridgeDispatcherHost;
class RenderWidgetHostViewAndroid;
struct MenuItem;
// TODO(jrg): this is a shell. Upstream the rest.
class ContentViewCoreImpl : public ContentViewCore,
- public ui::GestureProviderClient,
- public NotificationObserver,
public WebContentsObserver {
public:
static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
jobject obj,
WebContents* web_contents,
ui::ViewAndroid* view_android,
- ui::WindowAndroid* window_android);
+ ui::WindowAndroid* window_android,
+ jobject java_bridge_retained_object_set);
// ContentViewCore implementation.
virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
virtual void ShowPastePopup(int x, int y) OVERRIDE;
virtual void GetScaledContentBitmap(
float scale,
- jobject bitmap_config,
+ SkColorType color_type,
gfx::Rect src_subrect,
const base::Callback<void(bool, const SkBitmap&)>& result_callback)
OVERRIDE;
virtual float GetDpiScale() const OVERRIDE;
virtual void PauseVideo() OVERRIDE;
virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;
+ virtual void RequestTextSurroundingSelection(
+ int max_length,
+ const base::Callback<void(const base::string16& content,
+ int start_offset,
+ int end_offset)>& callback) OVERRIDE;
// --------------------------------------------------------------------------
// Methods called from Java via JNI
jstring url,
jint load_url_type,
jint transition_type,
+ jstring j_referrer_url,
+ jint referrer_policy,
jint ua_override_option,
jstring extra_headers,
jbyteArray post_data,
jstring base_url_for_data_url,
jstring virtual_url_for_data_url,
- jboolean can_load_local_resources);
- base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
- base::android::ScopedJavaLocalRef<jstring> GetTitle(
- JNIEnv* env, jobject obj) const;
- jboolean IsIncognito(JNIEnv* env, jobject obj);
+ jboolean can_load_local_resources,
+ jboolean is_renderer_initiated);
void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
jboolean OnTouchEvent(JNIEnv* env,
jobject obj,
jint pointer_id_0,
jint pointer_id_1,
jfloat touch_major_0,
- jfloat touch_major_1);
+ jfloat touch_major_1,
+ jfloat raw_pos_x,
+ jfloat raw_pos_y,
+ jint android_tool_type_0,
+ jint android_tool_type_1,
+ jint android_button_state,
+ jboolean is_touch_handle_event);
jboolean SendMouseMoveEvent(JNIEnv* env,
jobject obj,
jlong time_ms,
jfloat x1, jfloat y1,
jfloat x2, jfloat y2);
void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
+ void HideTextHandles(JNIEnv* env, jobject obj);
- void ResetGestureDetectors(JNIEnv* env, jobject obj);
- void IgnoreRemainingTouchEvents(JNIEnv* env, jobject obj);
- void OnWindowFocusLost(JNIEnv* env, jobject obj);
- void SetDoubleTapSupportForPageEnabled(JNIEnv* env,
- jobject obj,
- jboolean enabled);
+ void ResetGestureDetection(JNIEnv* env, jobject obj);
void SetDoubleTapSupportEnabled(JNIEnv* env, jobject obj, jboolean enabled);
void SetMultiTouchZoomSupportEnabled(JNIEnv* env,
jobject obj,
jboolean enabled);
- void LoadIfNecessary(JNIEnv* env, jobject obj);
- void RequestRestoreLoad(JNIEnv* env, jobject obj);
- void StopLoading(JNIEnv* env, jobject obj);
- void Reload(JNIEnv* env, jobject obj, jboolean check_for_repost);
- void ReloadIgnoringCache(JNIEnv* env, jobject obj, jboolean check_for_repost);
- void CancelPendingReload(JNIEnv* env, jobject obj);
- void ContinuePendingReload(JNIEnv* env, jobject obj);
void ClearHistory(JNIEnv* env, jobject obj);
- void EvaluateJavaScript(JNIEnv* env,
- jobject obj,
- jstring script,
- jobject callback,
- jboolean start_renderer);
- int GetNativeImeAdapter(JNIEnv* env, jobject obj);
+ void PostMessageToFrame(JNIEnv* env, jobject obj, jstring frame_id,
+ jstring message, jstring source_origin, jstring target_origin);
+ long GetNativeImeAdapter(JNIEnv* env, jobject obj);
void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
- void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);
jint GetBackgroundColor(JNIEnv* env, jobject obj);
void SetBackgroundColor(JNIEnv* env, jobject obj, jint color);
- void OnShow(JNIEnv* env, jobject obj);
- void OnHide(JNIEnv* env, jobject obj);
void ClearSslPreferences(JNIEnv* env, jobject /* obj */);
void SetUseDesktopUserAgent(JNIEnv* env,
jobject /* obj */,
jboolean state,
jboolean reload_on_state_change);
bool GetUseDesktopUserAgent(JNIEnv* env, jobject /* obj */);
- void Show();
- void Hide();
void SetAllowJavascriptInterfacesInspection(JNIEnv* env,
jobject obj,
jboolean allow);
jobject obj,
jobject object,
jstring name,
- jclass safe_annotation_clazz,
- jobject retained_object_set);
+ jclass safe_annotation_clazz);
void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
int GetNavigationHistory(JNIEnv* env, jobject obj, jobject history);
void GetDirectedNavigationHistory(JNIEnv* env,
jint max_entries);
base::android::ScopedJavaLocalRef<jstring>
GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, jobject obj);
- void UpdateVSyncParameters(JNIEnv* env, jobject obj, jlong timebase_micros,
- jlong interval_micros);
- void OnVSync(JNIEnv* env, jobject /* obj */, jlong frame_time_micros);
- jboolean OnAnimate(JNIEnv* env, jobject /* obj */, jlong frame_time_micros);
void WasResized(JNIEnv* env, jobject obj);
- jboolean IsRenderWidgetHostViewReady(JNIEnv* env, jobject obj);
- void ExitFullscreen(JNIEnv* env, jobject obj);
- void UpdateTopControlsState(JNIEnv* env,
- jobject obj,
- bool enable_hiding,
- bool enable_showing,
- bool animate);
- void ShowImeIfNeeded(JNIEnv* env, jobject obj);
-
- void ShowInterstitialPage(JNIEnv* env,
- jobject obj,
- jstring jurl,
- jint delegate);
- jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
void SetAccessibilityEnabled(JNIEnv* env, jobject obj, bool enabled);
jint width,
jint height);
+ void SetBackgroundOpaque(JNIEnv* env, jobject jobj, jboolean opaque);
+
jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj);
// --------------------------------------------------------------------------
// Public methods that call to Java via JNI
// --------------------------------------------------------------------------
- void OnSmartClipDataExtracted(const base::string16& result);
+ void OnSmartClipDataExtracted(const base::string16& text,
+ const base::string16& html,
+ const gfx::Rect& clip_rect);
// Creates a popup menu with |items|.
// |multiple| defines if it should support multi-select.
// If not |multiple|, |selected_item| sets the initially selected item.
// Otherwise, item's "checked" flag selects it.
- void ShowSelectPopupMenu(const std::vector<MenuItem>& items,
+ void ShowSelectPopupMenu(const gfx::Rect& bounds,
+ const std::vector<MenuItem>& items,
int selected_item,
bool multiple);
-
- void OnTabCrashed();
+ // Hides a visible popup menu.
+ void HideSelectPopupMenu();
// All sizes and offsets are in CSS pixels as cached by the renderer.
void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset,
const gfx::Vector2dF& content_offset,
float overdraw_bottom_height);
- void UpdateImeAdapter(long native_ime_adapter, int text_input_type,
+ void UpdateImeAdapter(long native_ime_adapter,
+ int text_input_type,
+ int text_input_flags,
const std::string& text,
- int selection_start, int selection_end,
- int composition_start, int composition_end,
- bool show_ime_if_needed, bool require_ack);
+ int selection_start,
+ int selection_end,
+ int composition_start,
+ int composition_end,
+ bool show_ime_if_needed,
+ bool is_non_ime_change);
void SetTitle(const base::string16& title);
void OnBackgroundColorChanged(SkColor color);
bool HasFocus();
- void ConfirmTouchEvent(InputEventAckState ack_result);
void OnGestureEventAck(const blink::WebGestureEvent& event,
InputEventAckState ack_result);
bool FilterInputEvent(const blink::WebInputEvent& event);
void OnSelectionChanged(const std::string& text);
- void OnSelectionBoundsChanged(
- const ViewHostMsg_SelectionBounds_Params& params);
+ void OnSelectionEvent(SelectionEventType event,
+ const gfx::PointF& anchor_position);
+ scoped_ptr<TouchHandleDrawable> CreatePopupTouchHandleDrawable();
void StartContentIntent(const GURL& content_url);
// Returns the viewport size after accounting for the viewport offset.
gfx::Size GetViewSize() const;
+ void SetAccessibilityEnabledInternal(bool enabled);
+
+ bool IsFullscreenRequiredForOrientationLock() const;
+
// --------------------------------------------------------------------------
// Methods called from native code
// --------------------------------------------------------------------------
void AttachLayer(scoped_refptr<cc::Layer> layer);
void RemoveLayer(scoped_refptr<cc::Layer> layer);
- void AddBeginFrameSubscriber();
- void RemoveBeginFrameSubscriber();
- void SetNeedsAnimate();
+
+ void SelectBetweenCoordinates(const gfx::PointF& start,
+ const gfx::PointF& end);
private:
class ContentViewUserData;
friend class ContentViewUserData;
virtual ~ContentViewCoreImpl();
- // NotificationObserver implementation.
- virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) OVERRIDE;
-
// WebContentsObserver implementation.
virtual void RenderViewReady() OVERRIDE;
- virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
-
- // ui::GestureProviderClient implementation.
- virtual void OnGestureEvent(const ui::GestureEventData& gesture) OVERRIDE;
+ virtual void RenderViewHostChanged(RenderViewHost* old_host,
+ RenderViewHost* new_host) OVERRIDE;
+ virtual void WebContentsDestroyed() OVERRIDE;
// --------------------------------------------------------------------------
// Other private methods and data
blink::WebGestureEvent MakeGestureEvent(
blink::WebInputEvent::Type type, int64 time_ms, float x, float y) const;
- void SendBeginFrame(base::TimeTicks frame_time);
-
gfx::Size GetViewportSizePix() const;
gfx::Size GetViewportSizeOffsetPix() const;
void DeleteScaledSnapshotTexture();
+ bool OnMotionEvent(const ui::MotionEvent& event);
void SendGestureEvent(const blink::WebGestureEvent& event);
// Update focus state of the RenderWidgetHostView.
// Send device_orientation_ to renderer.
void SendOrientationChangeEventInternal();
- // Utility method for synthesizing a touch cancel event and dispatching it
- // through the touch pipeline.
- void CancelActiveTouchSequenceIfNecessary();
-
float dpi_scale() const { return dpi_scale_; }
// A weak reference to the Java ContentViewCore object.
JavaObjectWeakGlobalRef java_ref_;
- NotificationRegistrar notification_registrar_;
-
// Reference to the current WebContents used to determine how and what to
// display in the ContentViewCore.
WebContentsImpl* web_contents_;
// Device scale factor.
float dpi_scale_;
- // Variables used to keep track of frame timestamps and deadlines.
- base::TimeDelta vsync_interval_;
- base::TimeDelta expected_browser_composite_time_;
-
// The Android view that can be used to add and remove decoration layers
// like AutofillPopup.
ui::ViewAndroid* view_android_;
// The owning window that has a hold of main application activity.
ui::WindowAndroid* window_android_;
- // Provides gesture synthesis given a stream of touch events (derived from
- // Android MotionEvent's) and touch event acks.
- ui::FilteredGestureProvider gesture_provider_;
-
// The cache of device's current orientation set from Java side, this value
// will be sent to Renderer once it is ready.
int device_orientation_;
- bool geolocation_needs_pause_;
+ bool accessibility_enabled_;
+
+ // Manages injecting Java objects.
+ scoped_ptr<GinJavaBridgeDispatcherHost>
+ java_bridge_dispatcher_host_;
DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
};
projects / platform / framework / web / crosswalk.git / blobdiff