Changeset 118785 in webkit

Timestamp:

May 29, 2012 9:06:16 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] WebKit-side implementation of SelectionOverlay
​https://bugs.webkit.org/show_bug.cgi?id=87605

Patch by Arvid Nilsson <​anilsson@rim.com> on 2012-05-29
Reviewed by Rob Buis.

Source/WebKit:

Add SelectionOverlay to the build system.

PR #160263

• PlatformBlackBerry.cmake:

Source/WebKit/blackberry:

Leverage the new WebOverlay API to move SelectionOverlay to the WebKit
library, so we always draw selection regardless of which embedder is
integrating WebKit.

PR #160263

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::init):
(BlackBerry::WebKit::WebPage::selectionOverlay):
(WebKit):

• Api/WebPage.h:

(WebKit):

• Api/WebPage_p.h:

(WebPagePrivate):

• Api/WebSelectionOverlay.h: Added.

(WebKit):

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):

• WebKitSupport/SelectionOverlay.cpp: Added.

(WebKit):
(BlackBerry::WebKit::SelectionOverlay::SelectionOverlay):
(BlackBerry::WebKit::SelectionOverlay::~SelectionOverlay):
(BlackBerry::WebKit::SelectionOverlay::draw):
(BlackBerry::WebKit::SelectionOverlay::hide):
(BlackBerry::WebKit::SelectionOverlay::notifySyncRequired):
(BlackBerry::WebKit::SelectionOverlay::paintContents):

• WebKitSupport/SelectionOverlay.h: Added.

(WebKit):
(SelectionOverlay):
(BlackBerry::WebKit::SelectionOverlay::create):
(BlackBerry::WebKit::SelectionOverlay::notifyAnimationStarted):
(BlackBerry::WebKit::SelectionOverlay::showDebugBorders):
(BlackBerry::WebKit::SelectionOverlay::showRepaintCounter):
(BlackBerry::WebKit::SelectionOverlay::contentsVisible):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformBlackBerry.cmake (modified) (1 diff)
• blackberry/Api/WebPage.cpp (modified) (5 diffs)
• blackberry/Api/WebPage.h (modified) (2 diffs)
• blackberry/Api/WebPage_p.h (modified) (1 diff)
• blackberry/Api/WebSelectionOverlay.h (added)
• blackberry/ChangeLog (modified) (1 diff)
• blackberry/WebKitSupport/SelectionHandler.cpp (modified) (2 diffs)
• blackberry/WebKitSupport/SelectionOverlay.cpp (added)
• blackberry/WebKitSupport/SelectionOverlay.h (added)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-05-29  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] WebKit-side implementation of SelectionOverlay
+        https://bugs.webkit.org/show_bug.cgi?id=87605
+
+        Reviewed by Rob Buis.
+
+        Add SelectionOverlay to the build system.
+
+        PR #160263
+
+        * PlatformBlackBerry.cmake:
+
 2012-05-29  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebKit/PlatformBlackBerry.cmake

@@ -91 +91 @@
     blackberry/WebKitSupport/RenderQueue.cpp
     blackberry/WebKitSupport/SelectionHandler.cpp
+    blackberry/WebKitSupport/SelectionOverlay.cpp
     blackberry/WebKitSupport/SurfacePool.cpp
     blackberry/WebKitSupport/TouchEventHandler.cpp

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -43 +43 @@
 #include "DatabaseSync.h"
 #include "DatabaseTracker.h"
+#include "DefaultTapHighlight.h"
 #include "DeviceMotionClientBlackBerry.h"
 #include "DeviceOrientationClientBlackBerry.h"
@@ -101 +102 @@
 #include "ScrollTypes.h"
 #include "SelectionHandler.h"
+#include "SelectionOverlay.h"
 #include "Settings.h"
 #include "Storage.h"
@@ -135 +137 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-#include "DefaultTapHighlight.h"
 #include "FrameLayers.h"
 #include "WebPageCompositor_p.h"
@@ -510 +511 @@
 #if USE(ACCELERATED_COMPOSITING)
     m_tapHighlight = DefaultTapHighlight::create(this);
+    m_selectionOverlay = SelectionOverlay::create(this);
 #endif
 
@@ -6209 +6211 @@
 }
 
+WebSelectionOverlay* WebPage::selectionOverlay() const
+{
+    return d->m_selectionOverlay.get();
+}
+
 void WebPage::addOverlay(WebOverlay* overlay)
 {

trunk/Source/WebKit/blackberry/Api/WebPage.h

@@ -68 +68 @@
 class WebPageGroupLoadDeferrer;
 class WebPagePrivate;
+class WebSelectionOverlay;
 class WebSettings;
 class WebTapHighlight;
@@ -340 +341 @@
     void setTapHighlight(WebTapHighlight*);
 
+    WebSelectionOverlay* selectionOverlay() const;
+
     // Adds an overlay that can be modified on the WebKit thread, and
     // whose attributes can be overridden on the compositing thread.

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -433 +433 @@
     WebSettings* m_webSettings;
     OwnPtr<WebTapHighlight> m_tapHighlight;
+    OwnPtr<WebSelectionOverlay> m_selectionOverlay;
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-29  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] WebKit-side implementation of SelectionOverlay
+        https://bugs.webkit.org/show_bug.cgi?id=87605
+
+        Reviewed by Rob Buis.
+
+        Leverage the new WebOverlay API to move SelectionOverlay to the WebKit
+        library, so we always draw selection regardless of which embedder is
+        integrating WebKit.
+
+        PR #160263
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):
+        (BlackBerry::WebKit::WebPage::selectionOverlay):
+        (WebKit):
+        * Api/WebPage.h:
+        (WebKit):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * Api/WebSelectionOverlay.h: Added.
+        (WebKit):
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+        * WebKitSupport/SelectionOverlay.cpp: Added.
+        (WebKit):
+        (BlackBerry::WebKit::SelectionOverlay::SelectionOverlay):
+        (BlackBerry::WebKit::SelectionOverlay::~SelectionOverlay):
+        (BlackBerry::WebKit::SelectionOverlay::draw):
+        (BlackBerry::WebKit::SelectionOverlay::hide):
+        (BlackBerry::WebKit::SelectionOverlay::notifySyncRequired):
+        (BlackBerry::WebKit::SelectionOverlay::paintContents):
+        * WebKitSupport/SelectionOverlay.h: Added.
+        (WebKit):
+        (SelectionOverlay):
+        (BlackBerry::WebKit::SelectionOverlay::create):
+        (BlackBerry::WebKit::SelectionOverlay::notifyAnimationStarted):
+        (BlackBerry::WebKit::SelectionOverlay::showDebugBorders):
+        (BlackBerry::WebKit::SelectionOverlay::showRepaintCounter):
+        (BlackBerry::WebKit::SelectionOverlay::contentsVisible):
+
 2012-05-29  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

@@ -33 +33 @@
 #include "WebPageClient.h"
 #include "WebPage_p.h"
+#include "WebSelectionOverlay.h"
 
 #include "htmlediting.h"
@@ -925 +926 @@
                     startCaret.x(), startCaret.y(), startCaret.width(), startCaret.height(), endCaret.x(), endCaret.y(), endCaret.width(), endCaret.height());
 
+    if (m_webPage->m_selectionOverlay)
+        m_webPage->m_selectionOverlay->draw(visibleSelectionRegion);
 
     m_webPage->m_client->notifySelectionDetailsChanged(startCaret, endCaret, visibleSelectionRegion, inputNodeOverridesTouch());