Changeset 127817 in webkit

Timestamp:

Sep 6, 2012 9:18:53 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Implement a color picker
​https://bugs.webkit.org/show_bug.cgi?id=96001

Patch by Crystal Zhang <​haizhang@rim.com> on 2012-09-06
Reviewed by Rob Buis.

Source/WebKit:

Add color picker files into building system.

• PlatformBlackBerry.cmake:

Source/WebKit/blackberry:

Add files for color picker, replace old hook to AIR color picker.

• WebCoreSupport/ColorPickerClient.cpp: Added.

(WebCore):
(WebCore::ColorPickerClient::ColorPickerClient):
(WebCore::ColorPickerClient::~ColorPickerClient):
(WebCore::ColorPickerClient::generateHTML):
(WebCore::ColorPickerClient::closePopup):
(WebCore::ColorPickerClient::contentSize):
(WebCore::ColorPickerClient::htmlSource):
(WebCore::ColorPickerClient::setValueAndClosePopup):
(WebCore::ColorPickerClient::didClosePopup):
(WebCore::ColorPickerClient::writeDocument):

• WebCoreSupport/ColorPickerClient.h: Added.

(WebKit):
(WebCore):
(ColorPickerClient):

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::openColorPopup):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformBlackBerry.cmake (modified) (1 diff)
• blackberry/ChangeLog (modified) (1 diff)
• blackberry/WebCoreSupport/ColorPickerClient.cpp (added)
• blackberry/WebCoreSupport/ColorPickerClient.h (added)
• blackberry/WebKitSupport/InputHandler.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-09-06  Crystal Zhang  <haizhang@rim.com>
+
+        [BlackBerry]  Implement a color picker
+        https://bugs.webkit.org/show_bug.cgi?id=96001
+
+        Reviewed by Rob Buis.
+
+        Add color picker files into building system.
+
+        * PlatformBlackBerry.cmake:
+
 2012-09-06  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit/PlatformBlackBerry.cmake

@@ -93 +93 @@
     blackberry/WebCoreSupport/SelectPopupClient.cpp
     blackberry/WebCoreSupport/DatePickerClient.cpp
+    blackberry/WebCoreSupport/ColorPickerClient.cpp
     blackberry/WebKitSupport/AboutData.cpp
     blackberry/WebKitSupport/BackingStoreCompositingSurface.cpp

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-06  Crystal Zhang  <haizhang@rim.com>
+
+        [BlackBerry]  Implement a color picker
+        https://bugs.webkit.org/show_bug.cgi?id=96001
+
+        Reviewed by Rob Buis.
+
+        Add files for color picker, replace old hook to AIR color picker.
+
+        * WebCoreSupport/ColorPickerClient.cpp: Added.
+        (WebCore):
+        (WebCore::ColorPickerClient::ColorPickerClient):
+        (WebCore::ColorPickerClient::~ColorPickerClient):
+        (WebCore::ColorPickerClient::generateHTML):
+        (WebCore::ColorPickerClient::closePopup):
+        (WebCore::ColorPickerClient::contentSize):
+        (WebCore::ColorPickerClient::htmlSource):
+        (WebCore::ColorPickerClient::setValueAndClosePopup):
+        (WebCore::ColorPickerClient::didClosePopup):
+        (WebCore::ColorPickerClient::writeDocument):
+        * WebCoreSupport/ColorPickerClient.h: Added.
+        (WebKit):
+        (WebCore):
+        (ColorPickerClient):
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::openColorPopup):
+
 2012-09-06  Genevieve Mak  <gmak@rim.com>
 

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

@@ -24 +24 @@
 #include "CSSStyleDeclaration.h"
 #include "Chrome.h"
+#include "ColorPickerClient.h"
 #include "DOMSupport.h"
 #include "DatePickerClient.h"
@@ -978 +979 @@
     m_currentFocusElementType = TextPopup;
 
-    // FIXME: Need to add pagePopup support and the colour dialog.
-    // PR 180778
+    // Check if popup already exists, close it if does.
+    m_webPage->m_page->chrome()->client()->closePagePopup(0);
+    ColorPickerClient* client = new ColorPickerClient(element->value(), m_webPage, element);
+    m_webPage->m_page->chrome()->client()->openPagePopup(client,  WebCore::IntRect());
+    return true;
 }