from:"mifenton"

[webkit-changes] [151233] trunk/Source/WebKit/blackberry

2013-06-05 Thread mifenton

Title: [151233] trunk/Source/WebKit/blackberry








Revision 151233
Author mifen...@rim.com
Date 2013-06-05 12:38:55 -0700 (Wed, 05 Jun 2013)


Log Message
[BlackBerry] Selection handles are inverted on directional selections
https://bugs.webkit.org/show_bug.cgi?id=117269

Reviewed by Rob Buis.

PR 336178

Don't invert the handles leave them in the visual order.

Internally Reviewed by Nima Ghanavatian.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (151232 => 151233)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-06-05 19:18:46 UTC (rev 151232)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-06-05 19:38:55 UTC (rev 151233)
@@ -1,3 +1,19 @@
+2013-06-05  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Selection handles are inverted on directional selections
+https://bugs.webkit.org/show_bug.cgi?id=117269
+
+Reviewed by Rob Buis.
+
+PR 336178
+
+Don't invert the handles leave them in the visual order.
+
+Internally Reviewed by Nima Ghanavatian.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+
 2013-06-03  Andrew Lo  a...@rim.com
 
 [BlackBerry] Expose show debug borders setting through BlackBerry::WebKit::WebPage


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (151232 => 151233)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-06-05 19:18:46 UTC (rev 151232)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-06-05 19:38:55 UTC (rev 151233)
@@ -1237,13 +1237,6 @@
 }
 }
 
-if (!frame-selection()-selection().isBaseFirst()) {
-// End handle comes before start, invert the caret reference points.
-WebCore::IntRect tmpCaret(startCaret);
-startCaret = endCaret;
-endCaret = tmpCaret;
-}
-
 SelectionLog(Platform::LogLevelInfo,
 SelectionHandler::selectionPositionChanged Start Rect=%s End Rect=%s,
 Platform::IntRect(startCaret).toString().c_str(),






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [151115] trunk/Source/WebKit/blackberry

2013-06-03 Thread mifenton

Title: [151115] trunk/Source/WebKit/blackberry








Revision 151115
Author mifen...@rim.com
Date 2013-06-03 10:17:38 -0700 (Mon, 03 Jun 2013)


Log Message
[BlackBerry] ROI details are not always cleared when using back navigation.
https://bugs.webkit.org/show_bug.cgi?id=117159

Reviewed by Carlos Garcia Campos.

PR 328557.

Secondary change to ensure when restoreViewState is triggered
ROI is reset.

Internally Reviewed by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::restoreViewState):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (151114 => 151115)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-06-03 15:45:21 UTC (rev 151114)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-06-03 17:17:38 UTC (rev 151115)
@@ -1,3 +1,20 @@
+2013-06-03  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] ROI details are not always cleared when using back navigation.
+https://bugs.webkit.org/show_bug.cgi?id=117159
+
+Reviewed by Carlos Garcia Campos.
+
+PR 328557.
+
+Secondary change to ensure when restoreViewState is triggered
+ROI is reset.
+
+Internally Reviewed by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::restoreViewState):
+
 2013-05-29  Otto Derek Cheung  otche...@rim.com
 
 [BlackBerry] Add more cellular technologies into the NetworkInfo enum


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (151114 => 151115)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-06-03 15:45:21 UTC (rev 151114)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-06-03 17:17:38 UTC (rev 151115)
@@ -2688,6 +2688,9 @@
 void InputHandler::restoreViewState()
 {
 setInputModeEnabled();
+
+// Make sure we reset the selection / FCC state.
+m_webPage-m_selectionHandler-selectionPositionChanged();
 }
 
 void InputHandler::showTextInputTypeSuggestionBox(bool allowEmptyPrefix)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [151118] trunk/Source/WebKit/blackberry

2013-06-03 Thread mifenton

Title: [151118] trunk/Source/WebKit/blackberry








Revision 151118
Author mifen...@rim.com
Date 2013-06-03 10:57:23 -0700 (Mon, 03 Jun 2013)


Log Message
[BlackBerry] Selection handles are not cleared when displaying error pages.
https://bugs.webkit.org/show_bug.cgi?id=117158

Reviewed by Carlos Garcia Campos.

PR 342159.

Add explicit cancel of selection state when loading an error page
as it is not always cleared.

Internally Reviewed by Nima Ghanavatian.

* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailProvisionalLoad):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (151117 => 151118)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-06-03 17:31:24 UTC (rev 151117)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-06-03 17:57:23 UTC (rev 151118)
@@ -1,5 +1,22 @@
 2013-06-03  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Selection handles are not cleared when displaying error pages.
+https://bugs.webkit.org/show_bug.cgi?id=117158
+
+Reviewed by Carlos Garcia Campos.
+
+PR 342159.
+
+Add explicit cancel of selection state when loading an error page
+as it is not always cleared.
+
+Internally Reviewed by Nima Ghanavatian.
+
+* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailProvisionalLoad):
+
+2013-06-03  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] ROI details are not always cleared when using back navigation.
 https://bugs.webkit.org/show_bug.cgi?id=117159
 


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (151117 => 151118)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp	2013-06-03 17:31:24 UTC (rev 151117)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp	2013-06-03 17:57:23 UTC (rev 151118)
@@ -53,6 +53,7 @@
 #include ProgressTracker.h
 #include ResourceBuffer.h
 #include ScopePointer.h
+#include SelectionHandler.h
 #if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
 #include Settings.h
 #endif
@@ -742,6 +743,10 @@
 m_frame-loader()-history()-provisionalItem()-viewState().shouldSaveViewState = false;
 }
 
+// PR 342159. This can be called in such a way that the selection is not cancelled on
+// the content page. Explicitly cancel the selection.
+m_webPagePrivate-m_client-cancelSelectionVisuals();
+
 m_loadingErrorPage = true;
 m_frame-loader()-load(FrameLoadRequest(m_frame, originalRequest, errorData));
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150637] trunk/Source/WebKit/blackberry

2013-05-24 Thread mifenton

Title: [150637] trunk/Source/WebKit/blackberry








Revision 150637
Author mifen...@rim.com
Date 2013-05-24 05:47:18 -0700 (Fri, 24 May 2013)


Log Message
[BlackBerry] Respect tabindex when using form controls.
https://bugs.webkit.org/show_bug.cgi?id=116676

Reviewed by Xan Lopez.

PR 337419.

Update form control navigation tracking to take tabindex
order into account when calculating next and previous nodes.

The order to follow is tab index 1 - N, followed by all items
without a tab index or tab index 0 in rendering order to match
with standard desktop behavior.

Internally Reviewed by Genevieve Mak and Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (150636 => 150637)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 08:41:00 UTC (rev 150636)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 12:47:18 UTC (rev 150637)
@@ -1,3 +1,24 @@
+2013-05-24  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Respect tabindex when using form controls.
+https://bugs.webkit.org/show_bug.cgi?id=116676
+
+Reviewed by Xan Lopez.
+
+PR 337419.
+
+Update form control navigation tracking to take tabindex
+order into account when calculating next and previous nodes.
+
+The order to follow is tab index 1 - N, followed by all items
+without a tab index or tab index 0 in rendering order to match
+with standard desktop behavior.
+
+Internally Reviewed by Genevieve Mak and Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+
 2013-05-24  Jeff Rogers  jrog...@rim.com
 
 [BlackBerry] Remove SKIA leftovers from WebPage.cpp


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (150636 => 150637)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-24 08:41:00 UTC (rev 150636)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-24 12:47:18 UTC (rev 150637)
@@ -947,35 +947,104 @@
 if (formElementCount  2)
 return;
 
-InputLog(Platform::LogLevelInfo, InputHandler::updateFormState form has %d fields, formElementCount);
+m_hasSubmitButton = true;
 
-m_hasSubmitButton = true;
+// Walk all elements in the form to determine next/prev elements.
+// For each element in the form we need to do the following:
+// If it's the focus node, use render order to try to find the next/prev directly.
+// For all other nodes:
+// 1) If the focused node has a specific tab index, compare the elements tab
+//index with the current prev/next looking for the best match.
+// 2) If the focused node does not have a tab index, update the maximum
+//tab index value, required for prev navigation.
+int focusTabIndex = static_castNode*(m_currentFocusElement.get())-tabIndex();
+int prevTabIndex = -1;
+int nextTabIndex = std::numeric_limitsshort::max() + 1;
+InputLog(Platform::LogLevelInfo, InputHandler::updateFormState form has %d fields and tabIndex %d, formElementCount, focusTabIndex);
+
+Element* firstInFieldWithoutTabIndex = 0;
+Element* highestTabIndexElement = 0;
 for (int focusElementId = 0; focusElementId  formElementCount; focusElementId++) {
-if (toHTMLElement(formElementList[focusElementId]) != m_currentFocusElement)
-continue;
+// Check for the focused element, and if we don't have any target nodes, use the form order next
+// and previous as placeholders. In a form without provided tab indices, this will determine the
+// control fields.
+Element* element = const_castHTMLElement*(toHTMLElement(formElementList[focusElementId]));
+if (element == m_currentFocusElement) {
+InputLog(Platform::LogLevelInfo, InputHandler::updateFormState found focused element.);
 
-// Found the focused element, get the next and previous elements if they exist.
+// If the focus tab index is set for the node, don't use the logical ordering.
+// Jump from last tab index to un-ordered is done separately.
+if (focusTabIndex)
+continue;
 
-// Previous
-for (int previousElementId = focusElementId - 1; previousElementId = 0; previousElementId--) {
-Element* element = const_castHTMLElement*(toHTMLElement(formElementList[previousElementId]));
-if (DOMSupport::isTextBasedContentEditableElement(element)  !DOMSupport::isElementReadOnly(element)) {
-m_previousFocusableTextElement = element;
-InputLog(Platform::LogLevelInfo, InputHandler::updateFormState found previous element);
-break;
+// Get the next/prev

[webkit-changes] [150641] trunk/Source/WebKit/blackberry

2013-05-24 Thread mifenton

Title: [150641] trunk/Source/WebKit/blackberry








Revision 150641
Author mifen...@rim.com
Date 2013-05-24 08:51:18 -0700 (Fri, 24 May 2013)


Log Message
[BlackBerry] Fix bad type warning in InputHandler log.
https://bugs.webkit.org/show_bug.cgi?id=116720

Reviewed by Carlos Garcia Campos.

Fix warning in inputLog string.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::handleKeyboardInput):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (150640 => 150641)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 14:48:21 UTC (rev 150640)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 15:51:18 UTC (rev 150641)
@@ -1,5 +1,17 @@
 2013-05-24  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Fix bad type warning in InputHandler log.
+https://bugs.webkit.org/show_bug.cgi?id=116720
+
+Reviewed by Carlos Garcia Campos.
+
+Fix warning in inputLog string.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::handleKeyboardInput):
+
+2013-05-24  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Respect tabindex when using form controls.
 https://bugs.webkit.org/show_bug.cgi?id=116676
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (150640 => 150641)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-24 14:48:21 UTC (rev 150640)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-24 15:51:18 UTC (rev 150641)
@@ -1798,7 +1798,7 @@
 bool InputHandler::handleKeyboardInput(const Platform::KeyboardEvent keyboardEvent, bool changeIsPartOfComposition)
 {
 InputLog(Platform::LogLevelInfo,
-InputHandler::handleKeyboardInput received character='%lc', type=%d,
+InputHandler::handleKeyboardInput received character='%c', type=%d,
 keyboardEvent.character(), keyboardEvent.type());
 
 // Clearing the m_shouldNotifyWebView state on any KeyboardEvent.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150587] trunk/Source/WebKit/blackberry

2013-05-23 Thread mifenton

Title: [150587] trunk/Source/WebKit/blackberry








Revision 150587
Author mifen...@rim.com
Date 2013-05-23 08:55:18 -0700 (Thu, 23 May 2013)


Log Message
[BlackBerry] Validate form data before doing direct submission.
https://bugs.webkit.org/show_bug.cgi?id=116674

Reviewed by Xan Lopez.

PR 314202.

Check validation of the input form before triggering direct submission.

Internally Reviewed by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::submitForm):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (150586 => 150587)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-23 15:20:13 UTC (rev 150586)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-23 15:55:18 UTC (rev 150587)
@@ -1,3 +1,19 @@
+2013-05-23  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Validate form data before doing direct submission.
+https://bugs.webkit.org/show_bug.cgi?id=116674
+
+Reviewed by Xan Lopez.
+
+PR 314202.
+
+Check validation of the input form before triggering direct submission.
+
+Internally Reviewed by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::submitForm):
+
 2013-05-23  Rob Buis  rb...@rim.com
 
 [BlackBerry] Properly fill the ResourceError in FrameLoaderClientBlackBerry::cannotShowURLError


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (150586 => 150587)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-23 15:20:13 UTC (rev 150586)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-23 15:55:18 UTC (rev 150587)
@@ -1008,15 +1008,18 @@
 return;
 
 InputLog(Platform::LogLevelInfo, InputHandler::submitForm triggered);
-if (elementType(m_currentFocusElement.get()) == InputTypeTextArea)
-formElement-submit();
-else {
+
+if (elementType(m_currentFocusElement.get()) != InputTypeTextArea) {
 handleKeyboardInput(Platform::KeyboardEvent(KEYCODE_RETURN, Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
 
-// Confirm that implicit submission was accepted.
-if (isActiveTextEdit())
-formElement-submit();
+// Did this clear the focus? If so, form was submitted or invalid.
+if (!isActiveTextEdit())
+return;
 }
+
+// Validate form data and if valid, submit.
+if (formElement-checkValidity())
+formElement-submit();
 }
 
 static void addInputStyleMaskForKeyboardType(int64_t inputMask, VirtualKeyboardType keyboardType)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150257] trunk/Source/WebKit/blackberry

2013-05-17 Thread mifenton

Title: [150257] trunk/Source/WebKit/blackberry








Revision 150257
Author mifen...@rim.com
Date 2013-05-17 08:08:46 -0700 (Fri, 17 May 2013)


Log Message
[BlackBerry] Remove stale comment for select mouse handling.
https://bugs.webkit.org/show_bug.cgi?id=116309

Reviewed by Rob Buis.

PR 135935.

Remove a FIXME that has been invalidated by a change
to our touch - mouse model.

Internally Rubberstamped by Genevieve Mak.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (150256 => 150257)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-17 14:33:39 UTC (rev 150256)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-17 15:08:46 UTC (rev 150257)
@@ -3962,10 +3962,6 @@
 // because we use a pop up dialog to handle the actual selections. This prevents options from
 // being selected prior to displaying the pop up dialog. The contents of the listbox are for
 // display only.
-//
-// FIXME: We explicitly do not forward this event to WebCore so as to preserve symmetry with
-// the MouseEventReleased handling (below). This has the side-effect that mousedown events
-// are not fired for human generated mouse press events. See RIM Bug #1579.
 
 // We do focus select/option on mouse down so that a Focus event is fired and have the
 // element painted in its focus state on repaint.
@@ -3977,9 +3973,8 @@
 } else
 eventHandler-handleMousePressEvent(mouseEvent);
 } else if (mouseEvent.type() == WebCore::PlatformEvent::MouseReleased) {
-// FIXME: For select and options elements, we explicitly do not forward this event to WebCore so
-// as to preserve symmetry with the MouseEventPressed handling (above). This has the side-effect that
-// mouseup events are not fired on such elements for human generated mouse release events. See RIM Bug #1579.
+// Do not send the mouse event if this is a popup field as the mouse down has been
+// suppressed and symmetry should be maintained.
 if (!m_inputHandler-didNodeOpenPopup(node))
 eventHandler-handleMouseReleaseEvent(mouseEvent);
 }


Modified: trunk/Source/WebKit/blackberry/ChangeLog (150256 => 150257)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-17 14:33:39 UTC (rev 150256)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-17 15:08:46 UTC (rev 150257)
@@ -1,3 +1,20 @@
+2013-05-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove stale comment for select mouse handling.
+https://bugs.webkit.org/show_bug.cgi?id=116309
+
+Reviewed by Rob Buis.
+
+PR 135935.
+
+Remove a FIXME that has been invalidated by a change
+to our touch - mouse model.
+
+Internally Rubberstamped by Genevieve Mak.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
+
 2013-05-17  Alberto Garcia  agar...@igalia.com
 
 [BlackBerry] DumpRenderTreeSupport: fix build in setMockDeviceOrientation()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150233] trunk/Source/WebKit/blackberry

2013-05-16 Thread mifenton

Title: [150233] trunk/Source/WebKit/blackberry








Revision 150233
Author mifen...@rim.com
Date 2013-05-16 19:53:15 -0700 (Thu, 16 May 2013)


Log Message
[BlackBerry] Optimize caret bounds calculation when leaving an input field.
https://bugs.webkit.org/show_bug.cgi?id=116224

Reviewed by Rob Buis.

PR 340132.

If the caret is no longer active in the field, do not allow it
to go into the single line input logic and calculate the node
bounding box.

Internally Reviewed By Gen Mak

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (150232 => 150233)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-17 02:50:22 UTC (rev 150232)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-17 02:53:15 UTC (rev 150233)
@@ -1,3 +1,21 @@
+2013-05-16  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Optimize caret bounds calculation when leaving an input field.
+https://bugs.webkit.org/show_bug.cgi?id=116224
+
+Reviewed by Rob Buis.
+
+PR 340132.
+
+If the caret is no longer active in the field, do not allow it
+to go into the single line input logic and calculate the node
+bounding box.
+
+Internally Reviewed By Gen Mak
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):
+
 2013-05-16  Mary Wu  mary...@torchmobile.com.cn
 
 [BlackBerry] Unable to download blob resource


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (150232 => 150233)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-05-17 02:50:22 UTC (rev 150232)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-05-17 02:53:15 UTC (rev 150233)
@@ -1303,7 +1303,7 @@
 SelectionHandler::caretPositionChanged caret Rect %s,
 Platform::IntRect(caretLocation).toString().c_str());
 
-bool isSingleLineInput = !m_webPage-m_inputHandler-isMultilineInputMode();
+bool isSingleLineInput = m_caretActive  !m_webPage-m_inputHandler-isMultilineInputMode();
 WebCore::IntRect nodeBoundingBox = isSingleLineInput ? m_webPage-m_inputHandler-boundingBoxForInputField() : WebCore::IntRect();
 
 if (!nodeBoundingBox.isEmpty()) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150238] trunk/Source/WebCore

2013-05-16 Thread mifenton

Title: [150238] trunk/Source/WebCore








Revision 150238
Author mifen...@rim.com
Date 2013-05-16 20:20:24 -0700 (Thu, 16 May 2013)


Log Message
[BlackBerry] Strip invoke URLs when writing to the clipboard.
https://bugs.webkit.org/show_bug.cgi?id=116226

Reviewed by Rob Buis.

PR 333516.

Invoke URLs should not be included in the paste data.

Internally Reviewed by Gen Mak.

* platform/blackberry/PasteboardBlackBerry.cpp:
(WebCore::Pasteboard::writeSelection):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (150237 => 150238)

--- trunk/Source/WebCore/ChangeLog	2013-05-17 03:18:00 UTC (rev 150237)
+++ trunk/Source/WebCore/ChangeLog	2013-05-17 03:20:24 UTC (rev 150238)
@@ -1,3 +1,19 @@
+2013-05-16  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Strip invoke URLs when writing to the clipboard.
+https://bugs.webkit.org/show_bug.cgi?id=116226
+
+Reviewed by Rob Buis.
+
+PR 333516.
+
+Invoke URLs should not be included in the paste data.
+
+Internally Reviewed by Gen Mak.
+
+* platform/blackberry/PasteboardBlackBerry.cpp:
+(WebCore::Pasteboard::writeSelection):
+
 2013-05-16  Eduardo Lima Mitev  el...@igalia.com
 
 Missing UNUSED_PARAM macro for textPosition argument in WebKitAccessibleInterfaceText


Modified: trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp (150237 => 150238)

--- trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp	2013-05-17 03:18:00 UTC (rev 150237)
+++ trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp	2013-05-17 03:20:24 UTC (rev 150238)
@@ -65,6 +65,12 @@
 {
 WTF::String text = shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame-editor()-selectedTextForClipboard() : frame-editor()-selectedText();
 WTF::String html = createMarkup(selectedRange, 0, AnnotateForInterchange);
+DEFINE_STATIC_LOCAL(AtomicString, invokeString, (href=""
+size_t startOfInvoke = html.find(invokeString);
+if (startOfInvoke != notFound) {
+size_t endOfInvoke = html.find(\, startOfInvoke + invokeString.length()) + 1;
+html.remove(startOfInvoke, endOfInvoke - startOfInvoke);
+}
 WTF::String url = ""
 
 BlackBerry::Platform::Clipboard::write(text, html, url);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149806] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149806] trunk/Source/WebKit/blackberry








Revision 149806
Author mifen...@rim.com
Date 2013-05-09 08:11:56 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Styles fixes required for InputHandler based on updated
check-webkit-style.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
(BlackBerry::WebKit::InputHandler::ensureFocusPluginElementVisible):
(BlackBerry::WebKit::InputHandler::setPopupListIndexes):
(BlackBerry::WebKit::InputHandler::firstSpanInString):
(BlackBerry::WebKit::InputHandler::setTextAttributes):
* WebKitSupport/InputHandler.h:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149805 => 149806)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 14:26:28 UTC (rev 149805)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:11:56 UTC (rev 149806)
@@ -1,3 +1,22 @@
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Styles fixes required for InputHandler based on updated
+check-webkit-style.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+(BlackBerry::WebKit::InputHandler::ensureFocusPluginElementVisible):
+(BlackBerry::WebKit::InputHandler::setPopupListIndexes):
+(BlackBerry::WebKit::InputHandler::firstSpanInString):
+(BlackBerry::WebKit::InputHandler::setTextAttributes):
+* WebKitSupport/InputHandler.h:
+
 2013-05-08  Eli Fidler  efid...@blackberry.com
 
 [BlackBerry] Fix usage of BlackBerry::Platform::String


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (149805 => 149806)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-09 14:26:28 UTC (rev 149805)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-09 15:11:56 UTC (rev 149806)
@@ -701,7 +701,7 @@
 textCheckingResult.length = 0;
 
 span_t* span = spannableString-spans;
-for (unsigned int i = 0; i  spannableString-spans_count; i++) {
+for (unsigned i = 0; i  spannableString-spans_count; i++) {
 if (!span)
 break;
 if (span-end  span-start) {
@@ -1353,8 +1353,9 @@
 // The scroll location we should go to given the zoom required, could be adjusted later.
 WebCore::FloatPoint offset(selectionFocusRect.location().x() - m_webPage-scrollPosition().x(), selectionFocusRect.location().y() - m_webPage-scrollPosition().y());
 double inverseScale = zoomScaleRequired / m_webPage-currentScale();
-WebCore::IntPoint destinationScrollLocation = WebCore::IntPoint(max(0, static_castint(roundf(selectionFocusRect.location().x() - offset.x() / inverseScale))),
-max(0, static_castint(roundf(selectionFocusRect.location().y() - offset.y() / inverseScale;
+WebCore::IntPoint destinationScrollLocation = WebCore::IntPoint(
+max(0, static_castint(roundf(selectionFocusRect.location().x() - offset.x() / inverseScale))),
+max(0, static_castint(roundf(selectionFocusRect.location().y() - offset.y() / inverseScale;
 
 if (elementFrame != mainFrame) { // Element is in a subframe.
 // Remove any scroll offset within the subframe to get the point relative to the main frame.
@@ -1420,9 +1421,7 @@
 static const int s_focusRectPaddingSize = Graphics::Screen::primaryScreen()-heightInMMToPixels(12);
 selectionFocusRect.inflate(std::ceilf(viewportAccessor-documentFromPixelContents(Platform::FloatSize(0, s_focusRectPaddingSize)).height()));
 
-WebCore::IntRect revealRect(layer-getRectToExpose(actualScreenRect, selectionFocusRect,
- horizontalScrollAlignment,
- verticalScrollAlignment));
+WebCore::IntRect revealRect(layer-getRectToExpose(actualScreenRect, selectionFocusRect, horizontalScrollAlignment, verticalScrollAlignment));
 
 // Don't constrain scroll position when animation finishes.
 shouldConstrainScrollingToContentEdge = false;
@@ -1496,8 +1495,8 @@
 // is at the center of the screen. FIXME: If the element was partially on screen
 // we might want to just bring the offscreen portion into view, someone needs

[webkit-changes] [149808] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149808] trunk/Source/WebKit/blackberry








Revision 149808
Author mifen...@rim.com
Date 2013-05-09 08:26:03 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update InRegionScrollableArea, TileIndexHash
and TouchEventHandler to match check-webkit-style updates.

* WebKitSupport/InRegionScrollableArea.cpp:
* WebKitSupport/TileIndexHash.h:
* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::drawTapHighlight):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/TileIndexHash.h
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149807 => 149808)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:16:58 UTC (rev 149807)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:26:03 UTC (rev 149808)
@@ -5,6 +5,21 @@
 
 Reviewed by Rob Buis.
 
+Update InRegionScrollableArea, TileIndexHash
+and TouchEventHandler to match check-webkit-style updates.
+
+* WebKitSupport/InRegionScrollableArea.cpp:
+* WebKitSupport/TileIndexHash.h:
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::drawTapHighlight):
+
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
 Styles fixes required for InputHandler based on updated
 check-webkit-style.
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (149807 => 149808)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp	2013-05-09 15:16:58 UTC (rev 149807)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp	2013-05-09 15:26:03 UTC (rev 149808)
@@ -22,8 +22,8 @@
 #include DOMSupport.h
 #include Document.h
 #include Frame.h
+#include InRegionScroller_p.h
 #include LayerWebKitThread.h
-#include InRegionScroller_p.h
 #include RenderBox.h
 #include RenderLayer.h
 #include RenderLayerBacking.h


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TileIndexHash.h (149807 => 149808)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TileIndexHash.h	2013-05-09 15:16:58 UTC (rev 149807)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TileIndexHash.h	2013-05-09 15:26:03 UTC (rev 149808)
@@ -42,13 +42,11 @@
 static TileIndex emptyValue() { return TileIndex(); }
 static void constructDeletedValue(TileIndex slot)
 {
-new (slot) TileIndex(std::numeric_limitsunsigned int::max() - 1,
-  std::numeric_limitsunsigned int::max() - 1);
+new (slot) TileIndex(std::numeric_limitsunsigned::max() - 1, std::numeric_limitsunsigned::max() - 1);
 }
 static bool isDeletedValue(const TileIndex value)
 {
-return value.i() == (std::numeric_limitsunsigned int::max() - 1)
-value.j() == (std::numeric_limitsunsigned int::max() - 1);
+return value.i() == (std::numeric_limitsunsigned::max() - 1)  value.j() == (std::numeric_limitsunsigned::max() - 1);
 }
 };
 } // namespace WTF


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp (149807 => 149808)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2013-05-09 15:16:58 UTC (rev 149807)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2013-05-09 15:26:03 UTC (rev 149808)
@@ -291,8 +291,8 @@
 Color highlightColor = element-renderStyle()-tapHighlightColor();
 
 m_webPage-m_tapHighlight-draw(region,
-highlightColor.red(), highlightColor.green(), highlightColor.blue(), highlightColor.alpha(),
-shouldHideTapHighlightRightAfterScrolling);
+highlightColor.red(), highlightColor.green(), highlightColor.blue(), highlightColor.alpha(),
+shouldHideTapHighlightRightAfterScrolling);
 }
 
 void TouchEventHandler::playSoundIfAnchorIsTarget() const






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149809] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149809] trunk/Source/WebKit/blackberry








Revision 149809
Author mifen...@rim.com
Date 2013-05-09 08:35:07 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update FatFingers to match check-webkit-style updates.

* WebKitSupport/FatFingers.cpp:
(BlackBerry::WebKit::FatFingers::checkFingerIntersection):
(BlackBerry::WebKit::FatFingers::checkForClickableElement):
* WebKitSupport/FatFingers.h:
(FatFingersResult):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149808 => 149809)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:35:07 UTC (rev 149809)
@@ -5,6 +5,21 @@
 
 Reviewed by Rob Buis.
 
+Update FatFingers to match check-webkit-style updates.
+
+* WebKitSupport/FatFingers.cpp:
+(BlackBerry::WebKit::FatFingers::checkFingerIntersection):
+(BlackBerry::WebKit::FatFingers::checkForClickableElement):
+* WebKitSupport/FatFingers.h:
+(FatFingersResult):
+
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
 Update InRegionScrollableArea, TileIndexHash
 and TouchEventHandler to match check-webkit-style updates.
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp (149808 => 149809)

--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp	2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp	2013-05-09 15:35:07 UTC (rev 149809)
@@ -242,8 +242,7 @@
 // 'remainingFingerRegion' and 'intersectingRegions' will always be in main frame contents
 // coordinates.
 // Thus, before comparing, we need to map the former to main frame contents coordinates.
-bool FatFingers::checkFingerIntersection(const IntRectRegion region, const IntRectRegion remainingFingerRegion,
- Node* node, VectorIntersectingRegion intersectingRegions)
+bool FatFingers::checkFingerIntersection(const IntRectRegion region, const IntRectRegion remainingFingerRegion, Node* node, VectorIntersectingRegion intersectingRegions)
 {
 ASSERT(node);
 
@@ -347,10 +346,7 @@
 return foundOne;
 }
 
-bool FatFingers::checkForClickableElement(Element* curElement,
-  VectorIntersectingRegion intersectingRegions,
-  IntRectRegion remainingFingerRegion,
-  RenderLayer* lowestPositionedEnclosingLayerSoFar)
+bool FatFingers::checkForClickableElement(Element* curElement, VectorIntersectingRegion intersectingRegions, IntRectRegion remainingFingerRegion, RenderLayer* lowestPositionedEnclosingLayerSoFar)
 {
 ASSERT(curElement);
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h (149808 => 149809)

--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h	2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h	2013-05-09 15:35:07 UTC (rev 149809)
@@ -76,22 +76,22 @@
 typedef HashMapRefPtrWebCore::Document, ListHashSetRefPtrWebCore::Node   CachedRectHitTestResults;
 
 bool checkFingerIntersection(const Platform::IntRectRegion,
- const Platform::IntRectRegion remainingFingerRegion,
- WebCore::Node*,
- VectorIntersectingRegion intersectingRegions);
+const Platform::IntRectRegion remainingFingerRegion,
+WebCore::Node*,
+VectorIntersectingRegion intersectingRegions);
 
 bool findIntersectingRegions(WebCore::Document*,
- VectorIntersectingRegion intersectingRegions,
- Platform::IntRectRegion remainingFingerRegion);
+VectorIntersectingRegion intersectingRegions,
+Platform::IntRectRegion remainingFingerRegion);
 
 bool checkForClickableElement(WebCore::Element*,
-  VectorIntersectingRegion intersectingRegions,
-  Platform::IntRectRegion remainingFingerRegion,
-  WebCore::RenderLayer* lowestPositionedEnclosingLayerSoFar);
+VectorIntersectingRegion intersectingRegions,
+Platform::IntRectRegion remainingFingerRegion,
+WebCore::RenderLayer* lowestPositionedEnclosingLayerSoFar);
 
 bool checkForText(WebCore::Node*,
-  VectorIntersectingRegion intersectingRegions,
-

[webkit-changes] [149811] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149811] trunk/Source/WebKit/blackberry








Revision 149811
Author mifen...@rim.com
Date 2013-05-09 08:43:21 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update DOMSupport to match check-webkit-style updates.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::isTextInputElement):
(BlackBerry::WebKit::DOMSupport::isPasswordElement):
(BlackBerry::WebKit::DOMSupport::convertPointToFrame):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149810 => 149811)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:42:09 UTC (rev 149810)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:43:21 UTC (rev 149811)
@@ -1,3 +1,17 @@
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Update DOMSupport to match check-webkit-style updates.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::isTextInputElement):
+(BlackBerry::WebKit::DOMSupport::isPasswordElement):
+(BlackBerry::WebKit::DOMSupport::convertPointToFrame):
+
 2013-05-09  Xuefei Ren  x...@blackberry.com
 
 [BLACKBERRY]fix regression in Webpage


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (149810 => 149811)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2013-05-09 15:42:09 UTC (rev 149810)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2013-05-09 15:43:21 UTC (rev 149811)
@@ -103,14 +103,14 @@
 bool isTextInputElement(Element* element)
 {
 return element-isTextFormControl()
-   || element-hasTagName(HTMLNames::textareaTag)
-   || element-isContentEditable();
+|| element-hasTagName(HTMLNames::textareaTag)
+|| element-isContentEditable();
 }
 
 bool isPasswordElement(const Element* element)
 {
 return element  element-hasTagName(HTMLNames::inputTag)
-static_castconst HTMLInputElement*(element)-isPasswordField();
+ static_castconst HTMLInputElement*(element)-isPasswordField();
 }
 
 WTF::String inputElementText(Element* element)
@@ -473,8 +473,9 @@
 
 // Requested point is outside of target frame, return InvalidPoint.
 if (clampToTargetFrame  !targetFrameRect.contains(targetPoint))
-targetPoint = IntPoint(targetPoint.x()  targetFrameRect.x() ? targetFrameRect.x() : std::min(targetPoint.x(), targetFrameRect.maxX()),
-targetPoint.y()  targetFrameRect.y() ? targetFrameRect.y() : std::min(targetPoint.y(), targetFrameRect.maxY()));
+targetPoint = IntPoint(
+targetPoint.x()  targetFrameRect.x() ? targetFrameRect.x() : std::min(targetPoint.x(), targetFrameRect.maxX()),
+targetPoint.y()  targetFrameRect.y() ? targetFrameRect.y() : std::min(targetPoint.y(), targetFrameRect.maxY()));
 else if (!targetFrameRect.contains(targetPoint))
 return InvalidPoint;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149815] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149815] trunk/Source/WebKit/blackberry








Revision 149815
Author mifen...@rim.com
Date 2013-05-09 09:02:27 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update ColorPickerClient and PagePopupBlackBerry
to match check-webkit-style updates.

* WebCoreSupport/ColorPickerClient.cpp:
(WebCore::ColorPickerClient::generateHTML):
* WebCoreSupport/PagePopupBlackBerry.cpp:
(WebCore::setValueAndClosePopupCallback):
(WebCore::PagePopupBlackBerry::installDOMFunction):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp
trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149814 => 149815)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 15:51:21 UTC (rev 149814)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 16:02:27 UTC (rev 149815)
@@ -1,3 +1,19 @@
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Update ColorPickerClient and PagePopupBlackBerry
+to match check-webkit-style updates.
+
+* WebCoreSupport/ColorPickerClient.cpp:
+(WebCore::ColorPickerClient::generateHTML):
+* WebCoreSupport/PagePopupBlackBerry.cpp:
+(WebCore::setValueAndClosePopupCallback):
+(WebCore::PagePopupBlackBerry::installDOMFunction):
+
 2013-05-09  Alberto Garcia  agar...@igalia.com
 
 [BlackBerry] Upstream the input popups


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp (149814 => 149815)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp	2013-05-09 15:51:21 UTC (rev 149814)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp	2013-05-09 16:02:27 UTC (rev 149815)
@@ -52,11 +52,9 @@
 StringBuilder source;
 source.appendLiteral(style\n);
 // Include CSS file.
-source.append(popupControlBlackBerryCss,
-sizeof(popupControlBlackBerryCss));
+source.append(popupControlBlackBerryCss, sizeof(popupControlBlackBerryCss));
 source.appendLiteral(/style\nstyle);
-source.append(colorControlBlackBerryCss,
-sizeof(colorControlBlackBerryCss));
+source.append(colorControlBlackBerryCss, sizeof(colorControlBlackBerryCss));
 source.appendLiteral(/style/headbody\n);
 source.appendLiteral(script\n);
 source.appendLiteral(window.addEventListener('load', function showIt() {);


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp (149814 => 149815)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp	2013-05-09 15:51:21 UTC (rev 149814)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp	2013-05-09 16:02:27 UTC (rev 149815)
@@ -98,9 +98,7 @@
 writer-end();
 }
 
-static JSValueRef setValueAndClosePopupCallback(JSContextRef context,
-JSObjectRef, JSObjectRef, size_t argumentCount,
-const JSValueRef arguments[], JSValueRef*)
+static JSValueRef setValueAndClosePopupCallback(JSContextRef context, JSObjectRef, JSObjectRef, size_t argumentCount, const JSValueRef arguments[], JSValueRef*)
 {
 JSValueRef jsRetVal = JSValueMakeUndefined(context);
 if (argumentCount = 0)
@@ -112,8 +110,7 @@
 strArgs[sizeUTF8] = 0;
 JSStringGetUTF8CString(string, strArgs.data(), sizeUTF8);
 JSStringRelease(string);
-JSObjectRef popUpObject = JSValueToObject(context,
-arguments[argumentCount - 1], 0);
+JSObjectRef popUpObject = JSValueToObject(context, arguments[argumentCount - 1], 0);
 PagePopupBlackBerry::SharedClientPointer* client = reinterpret_castPagePopupBlackBerry::SharedClientPointer*(JSObjectGetPrivate(popUpObject));
 
 // Check the weak pointer as the owner page may have destroyed the popup.
@@ -158,12 +155,9 @@
 
 JSContextRef context = ::toRef(exec);
 JSObjectRef globalObject = JSContextGetGlobalObject(context);
-JSStringRef functionName = JSStringCreateWithUTF8CString(
-setValueAndClosePopup);
-JSObjectRef function = JSObjectMakeFunctionWithCallback(context,
-functionName, setValueAndClosePopupCallback);
-JSObjectSetProperty(context, globalObject, functionName, function,
-kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly, 0);
+JSStringRef functionName = JSStringCreateWithUTF8CString(setValueAndClosePopup);
+JSObjectRef function = JSObjectMakeFunctionWithCallback(context, functionName, setValueAndClosePopupCallback);
+JSObjectSetProperty(context, globalObject, functionName, function, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly, 0);
 
 // Register client into DOM

[webkit-changes] [149818] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149818] trunk/Source/WebKit/blackberry








Revision 149818
Author mifen...@rim.com
Date 2013-05-09 09:16:32 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update ChromeClientBlackBerry, CredentialManager, FrameLoaderClientBlackBerry,
GeolocationClientBlackBerry and IconDatabaseClientBlackberry to
match check-webkit-style updates.

* WebCoreSupport/ChromeClientBlackBerry.h:
(ChromeClientBlackBerry):
* WebCoreSupport/CredentialManager.h:
(CredentialManager):
* WebCoreSupport/CredentialTransformData.cpp:
* WebCoreSupport/FrameLoaderClientBlackBerry.h:
(WebCore::FrameLoaderClientBlackBerry::assignIdentifierToInitialRequest):
(FrameLoaderClientBlackBerry):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveAuthenticationChallenge):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidCancelAuthenticationChallenge):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveContentLength):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoading):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailLoading):
* WebCoreSupport/GeolocationClientBlackBerry.cpp:
(GeolocationClientBlackBerry::onLocationUpdate):
* WebCoreSupport/GeolocationClientBlackBerry.h:
(GeolocationClientBlackBerry):
* WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
(WebCore::IconDatabaseClientBlackBerry::initIconDatabase):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.h
trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.cpp
trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h
trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp
trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.h
trunk/Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149817 => 149818)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 16:13:05 UTC (rev 149817)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 16:16:32 UTC (rev 149818)
@@ -1,3 +1,34 @@
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Update ChromeClientBlackBerry, CredentialManager, FrameLoaderClientBlackBerry,
+GeolocationClientBlackBerry and IconDatabaseClientBlackberry to
+match check-webkit-style updates.
+
+* WebCoreSupport/ChromeClientBlackBerry.h:
+(ChromeClientBlackBerry):
+* WebCoreSupport/CredentialManager.h:
+(CredentialManager):
+* WebCoreSupport/CredentialTransformData.cpp:
+* WebCoreSupport/FrameLoaderClientBlackBerry.h:
+(WebCore::FrameLoaderClientBlackBerry::assignIdentifierToInitialRequest):
+(FrameLoaderClientBlackBerry):
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveAuthenticationChallenge):
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidCancelAuthenticationChallenge):
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveContentLength):
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoading):
+(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailLoading):
+* WebCoreSupport/GeolocationClientBlackBerry.cpp:
+(GeolocationClientBlackBerry::onLocationUpdate):
+* WebCoreSupport/GeolocationClientBlackBerry.h:
+(GeolocationClientBlackBerry):
+* WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
+(WebCore::IconDatabaseClientBlackBerry::initIconDatabase):
+
 2013-05-09  Jacky Jiang  zhaji...@blackberry.com
 
 Fix some compiler warnings (miscellaneous)


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h (149817 => 149818)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h	2013-05-09 16:13:05 UTC (rev 149817)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h	2013-05-09 16:16:32 UTC (rev 149818)
@@ -81,7 +81,7 @@
 virtual IntRect rootViewToScreen(const IntRect) const;
 virtual void contentsSizeChanged(Frame*, const IntSize) const;
 virtual void scrollRectIntoView(const IntRect, const ScrollView*) const;
-virtual void mouseDidMoveOverElement(const HitTestResult, unsigned int);
+virtual void mouseDidMoveOverElement(const HitTestResult, unsigned);
 virtual void setToolTip(const String, TextDirection);
 #if ENABLE(EVENT_MODE_METATAGS)
 virtual void didReceiveCursorEventMode(Frame*, CursorEventMode) const;


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.h (149817 => 149818)

---

[webkit-changes] [149819] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149819] trunk/Source/WebKit/blackberry








Revision 149819
Author mifen...@rim.com
Date 2013-05-09 09:51:23 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update BackingStore to match check-webkit-style updates.

Internally reviewed by Jakob Petsovits.

* Api/BackingStore.cpp:
(BlackBerry::WebKit::bestDivisor):
(BlackBerry::WebKit::BackingStorePrivate::repaint):
(BlackBerry::WebKit::BackingStorePrivate::shouldMoveLeft):
(BlackBerry::WebKit::BackingStorePrivate::shouldMoveRight):
(BlackBerry::WebKit::BackingStorePrivate::shouldMoveUp):
(BlackBerry::WebKit::BackingStorePrivate::shouldMoveDown):
(BlackBerry::WebKit::BackingStorePrivate::canMoveLeft):
(BlackBerry::WebKit::BackingStorePrivate::canMoveRight):
(BlackBerry::WebKit::BackingStorePrivate::canMoveUp):
(BlackBerry::WebKit::BackingStorePrivate::canMoveDown):
(BlackBerry::WebKit::BackingStorePrivate::indexOfTile):
(BlackBerry::WebKit::BackingStorePrivate::clearAndUpdateTileOfNotRenderedRegion):
(BlackBerry::WebKit::BackingStorePrivate::scrollBackingStore):
(BlackBerry::WebKit::BackingStoreGeometry::originOfTile):
(BlackBerry::WebKit::BackingStore::repaint):
* Api/BackingStore_p.h:
(BackingStoreGeometry):

Modified Paths

trunk/Source/WebKit/blackberry/Api/BackingStore.cpp
trunk/Source/WebKit/blackberry/Api/BackingStore_p.h
trunk/Source/WebKit/blackberry/ChangeLog




Diff

Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (149818 => 149819)

--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp	2013-05-09 16:16:32 UTC (rev 149818)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp	2013-05-09 16:51:23 UTC (rev 149819)
@@ -107,8 +107,8 @@
 
 // Compute best divisor given the ratio determined by size.
 static Divisor bestDivisor(Platform::IntSize size, int tileWidth, int tileHeight,
-   int minimumNumberOfTilesWide, int minimumNumberOfTilesHigh,
-   BackingStorePrivate::TileMatrixDirection direction)
+int minimumNumberOfTilesWide, int minimumNumberOfTilesHigh,
+BackingStorePrivate::TileMatrixDirection direction)
 {
 // The point of this function is to determine the number of tiles in each
 // dimension. We do this by looking to match the tile matrix width/height
@@ -428,13 +428,12 @@
 *hasSyncedToUserInterfaceThread = true;
 }
 
-void BackingStorePrivate::repaint(const Platform::IntRect windowRect,
-  bool contentChanged, bool immediate)
+void BackingStorePrivate::repaint(const Platform::IntRect windowRect, bool contentChanged, bool immediate)
 {
- // If immediate is true, then we're being asked to perform synchronously.
- // NOTE: WebCore::ScrollView will call this method with immediate:true and contentChanged:false.
- // This is a special case introduced specifically for the Apple's windows port and can be safely ignored I believe.
- // Now this method will be called from WebPagePrivate::repaint().
+// If immediate is true, then we're being asked to perform synchronously.
+// NOTE: WebCore::ScrollView will call this method with immediate:true and contentChanged:false.
+// This is a special case introduced specifically for the Apple's windows port and can be safely ignored I believe.
+// Now this method will be called from WebPagePrivate::repaint().
 
 if (contentChanged  !windowRect.isEmpty()) {
 // This windowRect is in document coordinates relative to the viewport,
@@ -605,29 +604,29 @@
 bool BackingStorePrivate::shouldMoveLeft(const Platform::IntRect backingStoreRect) const
 {
 return canMoveX(backingStoreRect)
- backingStoreRect.x()  visibleContentsRect().x()
- backingStoreRect.x()  expandedContentsRect().x();
+ backingStoreRect.x()  visibleContentsRect().x()
+ backingStoreRect.x()  expandedContentsRect().x();
 }
 
 bool BackingStorePrivate::shouldMoveRight(const Platform::IntRect backingStoreRect) const
 {
 return canMoveX(backingStoreRect)
- backingStoreRect.right()  visibleContentsRect().right()
- backingStoreRect.right()  expandedContentsRect().right();
+ backingStoreRect.right()  visibleContentsRect().right()
+ backingStoreRect.right()  expandedContentsRect().right();
 }
 
 bool BackingStorePrivate::shouldMoveUp(const Platform::IntRect backingStoreRect) const
 {
 return canMoveY(backingStoreRect)
- backingStoreRect.y()  visibleContentsRect().y()
- backingStoreRect.y()  expandedContentsRect().y();
+ backingStoreRect.y()  visibleContentsRect().y()
+ backingStoreRect.y()  expandedContentsRect().y();
 }
 
 bool BackingStorePrivate::shouldMoveDown(const Platform::IntRect backingStoreRect) const
 {
 return canMoveY(backingStoreRect)
- backingStoreRect.bottom()  visibleContentsRect().bottom()
-

[webkit-changes] [149820] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149820] trunk/Source/WebKit/blackberry








Revision 149820
Author mifen...@rim.com
Date 2013-05-09 09:54:24 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebPage and WebPageClient to match check-webkit-style updates.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
(BlackBerry::WebKit::WebPage::executeJavaScriptInIsolatedWorld):
(BlackBerry::WebKit::WebPagePrivate::zoomAboutPoint):
(BlackBerry::WebKit::WebPagePrivate::calculateReflowedScrollPosition):
(BlackBerry::WebKit::WebPagePrivate::centerOfVisibleContentsRect):
(BlackBerry::WebKit::WebPage::assignFocus):
(BlackBerry::WebKit::WebPagePrivate::resumeBackingStore):
(BlackBerry::WebKit::WebPagePrivate::setViewportSize):
(BlackBerry::WebKit::WebPage::deleteTextRelativeToCursor):
(BlackBerry::WebKit::WebPage::addVisitedLink):
(BlackBerry::WebKit::WebPagePrivate::findPatternStringForUrl):
(BlackBerry::WebKit::WebPage::notifySwipeEvent):
(BlackBerry::WebKit::WebPage::notifyScreenPowerStateChanged):
(BlackBerry::WebKit::WebPagePrivate::commitRootLayerIfNeeded):
(BlackBerry::WebKit::WebPagePrivate::setRootLayerWebKitThread):
(BlackBerry::WebKit::WebPagePrivate::releaseLayerResourcesCompositingThread):
* Api/WebPageClient.h:
* Api/WebPage_p.h:

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/Api/WebPage_p.h
trunk/Source/WebKit/blackberry/ChangeLog




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149819 => 149820)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-09 16:51:23 UTC (rev 149819)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-05-09 16:54:24 UTC (rev 149820)
@@ -653,7 +653,7 @@
 // unconditionally. It will allocate OpenGL objects lazily, so this incurs
 // no overhead in the unlikely case where the compositor is not needed.
 Platform::userInterfaceThreadMessageClient()-dispatchSyncMessage(
-createMethodCallMessage(WebPagePrivate::createCompositor, this));
+createMethodCallMessage(WebPagePrivate::createCompositor, this));
 #endif
 }
 
@@ -843,7 +843,7 @@
 
 bool WebPage::executeJavaScriptInIsolatedWorld(const std::wstring script, _javascript_DataType returnType, BlackBerry::Platform::String returnValue)
 {
-// On our platform wchar_t is unsigned int and UChar is unsigned short
+// On our platform wchar_t is unsigned and UChar is unsigned short
 // so we have to convert using ICU conversion function
 int lengthCopied = 0;
 UErrorCode error = U_ZERO_ERROR;
@@ -1242,7 +1242,7 @@
 updateViewportSize();
 
 IntPoint newScrollPosition(IntPoint(max(0, static_castint(roundf(anchor.x() - anchorOffset.x() / inverseScale))),
-max(0, static_castint(roundf(anchor.y() - anchorOffset.y() / inverseScale);
+max(0, static_castint(roundf(anchor.y() - anchorOffset.y() / inverseScale);
 
 if (m_webPage-settings()-textReflowMode() == WebSettings::TextReflowEnabled) {
 // This is a hack for email which has reflow always turned on.
@@ -1250,8 +1250,8 @@
 requestLayoutIfNeeded();
 if (m_currentPinchZoomNode)
 newScrollPosition = calculateReflowedScrollPosition(anchorOffset, scale == minimumScale() ? 1 : inverseScale);
- m_currentPinchZoomNode = 0;
- m_anchorInNodeRectRatio = FloatPoint(-1, -1);
+m_currentPinchZoomNode = 0;
+m_anchorInNodeRectRatio = FloatPoint(-1, -1);
 }
 
 setScrollPosition(newScrollPosition);
@@ -1304,7 +1304,7 @@
 IntRect reflowedRect = adjustRectOffsetForFrameOffset(nodeRect, m_currentPinchZoomNode.get());
 
 return IntPoint(max(0, static_castint(roundf(reflowedRect.x() + offsetX))),
-max(0, static_castint(roundf(reflowedRect.y() + offsetY - anchorOffset.y() / inverseScale;
+max(0, static_castint(roundf(reflowedRect.y() + offsetY - anchorOffset.y() / inverseScale;
 }
 
 void WebPagePrivate::setNeedsLayout()
@@ -1499,7 +1499,7 @@
 
 // The center of the visible contents rect in float.
 return FloatPoint(visibleContentsRect.x() + visibleContentsRect.width() / 2.0,
-  visibleContentsRect.y() + visibleContentsRect.height() / 2.0);
+visibleContentsRect.y() + visibleContentsRect.height() / 2.0);
 }
 
 IntRect WebPagePrivate::visibleContentsRect() const
@@ -2516,7 +2516,7 @@
 void WebPage::assignFocus(Platform::FocusDirection direction)
 {
 if (d-m_page-defersLoading())
-   return;
+return;
 d-assignFocus(direction);
 }
 
@@ -3489,7 +3489,7 @@
 m_backingStore-d-renderAndBlitVisibleContentsImmediately();
 } else {
 if (m_backingStore-d-isOpenGLCompositing())
-   setCompositorDrawsRootLayer(false);
+setCompositorDrawsRootLayer(false);

[webkit-changes] [149822] trunk/Source/WebCore

2013-05-09 Thread mifenton

Title: [149822] trunk/Source/WebCore








Revision 149822
Author mifen...@rim.com
Date 2013-05-09 10:59:20 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebCore/platform/blackberry to match check-webkit-style updates.

No functional changes.

* platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
* platform/blackberry/CookieManager.cpp:
(WebCore::CookieManager::getRawCookies):
* platform/blackberry/CookieMap.h:
(WebCore::CookieMap::count):
* platform/blackberry/CookieParser.cpp:
(WebCore::CookieParser::parseOneCookie):
* platform/blackberry/LoggingBlackBerry.cpp:
* platform/blackberry/PageClientBlackBerry.h:
(Platform):
(Graphics):
(WebCore):
* platform/blackberry/ParsedCookie.cpp:
(WebCore::ParsedCookie::appendWebCoreCookie):
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::paintSearchFieldCancelButton):
(WebCore::RenderThemeBlackBerry::paintButton):
(WebCore::RenderThemeBlackBerry::paintSliderThumb):
* platform/blackberry/SSLKeyGeneratorBlackBerry.cpp:
(WebCore::signedPublicKeyAndChallengeString):
* platform/blackberry/ScrollAnimatorBlackBerry.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h
trunk/Source/WebCore/platform/blackberry/CookieManager.cpp
trunk/Source/WebCore/platform/blackberry/CookieMap.h
trunk/Source/WebCore/platform/blackberry/CookieParser.cpp
trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h
trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp
trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (149821 => 149822)

--- trunk/Source/WebCore/ChangeLog	2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/ChangeLog	2013-05-09 17:59:20 UTC (rev 149822)
@@ -1,3 +1,36 @@
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Update WebCore/platform/blackberry to match check-webkit-style updates.
+
+No functional changes.
+
+* platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
+* platform/blackberry/CookieManager.cpp:
+(WebCore::CookieManager::getRawCookies):
+* platform/blackberry/CookieMap.h:
+(WebCore::CookieMap::count):
+* platform/blackberry/CookieParser.cpp:
+(WebCore::CookieParser::parseOneCookie):
+* platform/blackberry/LoggingBlackBerry.cpp:
+* platform/blackberry/PageClientBlackBerry.h:
+(Platform):
+(Graphics):
+(WebCore):
+* platform/blackberry/ParsedCookie.cpp:
+(WebCore::ParsedCookie::appendWebCoreCookie):
+* platform/blackberry/RenderThemeBlackBerry.cpp:
+(WebCore::RenderThemeBlackBerry::paintSearchFieldCancelButton):
+(WebCore::RenderThemeBlackBerry::paintButton):
+(WebCore::RenderThemeBlackBerry::paintSliderThumb):
+* platform/blackberry/SSLKeyGeneratorBlackBerry.cpp:
+(WebCore::signedPublicKeyAndChallengeString):
+* platform/blackberry/ScrollAnimatorBlackBerry.h:
+
 2013-05-09  Chris Rogers  crog...@google.com
 
 Require use of AudioBus::create() to avoid ref-counting issues


Modified: trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h (149821 => 149822)

--- trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h	2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h	2013-05-09 17:59:20 UTC (rev 149822)
@@ -43,8 +43,7 @@
 
 class ParsedCookie;
 
-class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient
- , public BlackBerry::Platform::ThreadTimerClient {
+class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient , public BlackBerry::Platform::ThreadTimerClient {
 public:
 static CookieDatabaseBackingStore* create() { return new CookieDatabaseBackingStore; }
 


Modified: trunk/Source/WebCore/platform/blackberry/CookieManager.cpp (149821 => 149822)

--- trunk/Source/WebCore/platform/blackberry/CookieManager.cpp	2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieManager.cpp	2013-05-09 17:59:20 UTC (rev 149822)
@@ -264,7 +264,7 @@
 if (m_shouldDumpAllCookies) {
 protocolsToSearch.append(m_managerMap.get(file));

[webkit-changes] [149823] trunk/Source/WebCore

2013-05-09 Thread mifenton

Title: [149823] trunk/Source/WebCore








Revision 149823
Author mifen...@rim.com
Date 2013-05-09 11:02:34 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebCore/platform/network/blackberry
to match check-webkit-style updates.

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::initialize):
(WebCore::NetworkJob::handleSetCookieHeader):
(WebCore::NetworkJob::sendResponseIfNeeded):
(WebCore::NetworkJob::shouldSendClientData):
* platform/network/blackberry/NetworkJob.h:
(NetworkJob):
* platform/network/blackberry/NetworkManager.cpp:
(WebCore::NetworkManager::startJob):
* platform/network/blackberry/rss/RSSFilterStream.cpp:
(WebCore::isRSSContent):
(WebCore::transcode):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp
trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h
trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (149822 => 149823)

--- trunk/Source/WebCore/ChangeLog	2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/ChangeLog	2013-05-09 18:02:34 UTC (rev 149823)
@@ -5,6 +5,29 @@
 
 Reviewed by Rob Buis.
 
+Update WebCore/platform/network/blackberry
+to match check-webkit-style updates.
+
+* platform/network/blackberry/NetworkJob.cpp:
+(WebCore::NetworkJob::initialize):
+(WebCore::NetworkJob::handleSetCookieHeader):
+(WebCore::NetworkJob::sendResponseIfNeeded):
+(WebCore::NetworkJob::shouldSendClientData):
+* platform/network/blackberry/NetworkJob.h:
+(NetworkJob):
+* platform/network/blackberry/NetworkManager.cpp:
+(WebCore::NetworkManager::startJob):
+* platform/network/blackberry/rss/RSSFilterStream.cpp:
+(WebCore::isRSSContent):
+(WebCore::transcode):
+
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
 Update WebCore/platform/blackberry to match check-webkit-style updates.
 
 No functional changes.


Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (149822 => 149823)

--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2013-05-09 18:02:34 UTC (rev 149823)
@@ -116,14 +116,14 @@
 }
 
 bool NetworkJob::initialize(int playerId,
-const String pageGroupName,
-const KURL url,
-const BlackBerry::Platform::NetworkRequest request,
-PassRefPtrResourceHandle handle,
-BlackBerry::Platform::NetworkStreamFactory* streamFactory,
-Frame* frame,
-int deferLoadingCount,
-int redirectCount)
+const String pageGroupName,
+const KURL url,
+const BlackBerry::Platform::NetworkRequest request,
+PassRefPtrResourceHandle handle,
+BlackBerry::Platform::NetworkStreamFactory* streamFactory,
+Frame* frame,
+int deferLoadingCount,
+int redirectCount)
 {
 BLACKBERRY_ASSERT(handle);
 BLACKBERRY_ASSERT(frame);
@@ -169,8 +169,8 @@
 
 BlackBerry::Platform::NetworkRequest::TargetType targetType = request.getTargetType();
 if ((targetType == BlackBerry::Platform::NetworkRequest::TargetIsMainFrame
- || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
- !m_isOverrideContentType) {
+|| targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
+ !m_isOverrideContentType) {
 RSSFilterStream* filter = new RSSFilterStream();
 filter-setWrappedStream(wrappedStream);
 wrappedStream = filter;
@@ -456,8 +456,8 @@
 KURL url = ""
 CookieManager manager = cookieManager();
 if ((manager.cookiePolicy() == CookieStorageAcceptPolicyOnlyFromMainDocumentDomain)
-   (m_handle-firstRequest().firstPartyForCookies() != url)
-   manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
+ (m_handle-firstRequest().firstPartyForCookies() != url)
+ manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
 return;
 manager.setCookies(url, value);
 }
@@ -749,9 +749,9 @@
 suggestedFilename = String(BlackBerry::Platform::LocalizeResource::getString(BlackBerry::Platform::FILENAME_UNTITLED)) + . + mimeExtension;
 } else {
 if (urlFilename.reverseFind('.') == notFound  !mimeExtension.isEmpty())
-

[webkit-changes] [149824] trunk/Source/WebCore

2013-05-09 Thread mifenton

Title: [149824] trunk/Source/WebCore








Revision 149824
Author mifen...@rim.com
Date 2013-05-09 11:13:53 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebCore/platform/graphics BlackBerry sources
to match check-webkit-style updates.

Internally reviewed by Jakob Petsovits.

* platform/graphics/blackberry/CanvasLayerWebKitThread.cpp:
* platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
(WebCore::GraphicsContext3D::readPixelsIMG):
(WebCore::GraphicsContext3D::paintToCanvas):
* platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
(WebCore::GraphicsLayerBlackBerry::updateLayerPosition):
* platform/graphics/blackberry/IntRectBlackBerry.cpp:
(WebCore::IntRect::IntRect):
* platform/graphics/blackberry/LayerCompositingThread.h:
(WTFderef):
* platform/graphics/blackberry/LayerFilterRenderer.cpp:
(WebCore::LayerFilterRenderer::initializeSharedGLObjects):
(WebCore::LayerFilterRenderer::actionsForOperations):
(WebCore::LayerFilterRenderer::applyActions):
* platform/graphics/blackberry/LayerRenderer.cpp:
(WebCore::LayerRenderer::setViewport):
(WebCore::LayerRenderer::compositeBuffer):
(WebCore::LayerRenderer::drawColor):
(WebCore::LayerRenderer::compositeLayersRecursive):
* platform/graphics/blackberry/LayerWebKitThread.cpp:
(WebCore::LayerWebKitThread::setFrame):
* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::play):
(WebCore::MediaPlayerPrivate::waitMetadataTimerFired):
* platform/image-decoders/blackberry/JPEGImageDecoder.cpp:
(WebCore::JPEGImageDecoder::JPEGImageDecoder):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp
trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp
trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp
trunk/Source/WebCore/platform/graphics/blackberry/IntRectBlackBerry.cpp
trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.h
trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp
trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp
trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp
trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp
trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (149823 => 149824)

--- trunk/Source/WebCore/ChangeLog	2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/ChangeLog	2013-05-09 18:13:53 UTC (rev 149824)
@@ -5,6 +5,45 @@
 
 Reviewed by Rob Buis.
 
+Update WebCore/platform/graphics BlackBerry sources
+to match check-webkit-style updates.
+
+Internally reviewed by Jakob Petsovits.
+
+* platform/graphics/blackberry/CanvasLayerWebKitThread.cpp:
+* platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
+(WebCore::GraphicsContext3D::readPixelsIMG):
+(WebCore::GraphicsContext3D::paintToCanvas):
+* platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
+(WebCore::GraphicsLayerBlackBerry::updateLayerPosition):
+* platform/graphics/blackberry/IntRectBlackBerry.cpp:
+(WebCore::IntRect::IntRect):
+* platform/graphics/blackberry/LayerCompositingThread.h:
+(WTFderef):
+* platform/graphics/blackberry/LayerFilterRenderer.cpp:
+(WebCore::LayerFilterRenderer::initializeSharedGLObjects):
+(WebCore::LayerFilterRenderer::actionsForOperations):
+(WebCore::LayerFilterRenderer::applyActions):
+* platform/graphics/blackberry/LayerRenderer.cpp:
+(WebCore::LayerRenderer::setViewport):
+(WebCore::LayerRenderer::compositeBuffer):
+(WebCore::LayerRenderer::drawColor):
+(WebCore::LayerRenderer::compositeLayersRecursive):
+* platform/graphics/blackberry/LayerWebKitThread.cpp:
+(WebCore::LayerWebKitThread::setFrame):
+* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
+(WebCore::MediaPlayerPrivate::play):
+(WebCore::MediaPlayerPrivate::waitMetadataTimerFired):
+* platform/image-decoders/blackberry/JPEGImageDecoder.cpp:
+(WebCore::JPEGImageDecoder::JPEGImageDecoder):
+
+2013-05-09  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
 Update WebCore/platform/network/blackberry
 to match check-webkit-style updates.
 


Modified: trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp (149823 => 149824)

--- trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp	2013-05-09 18:02:34 UTC (rev 149823)
+++

[webkit-changes] [149826] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149826] trunk/Source/WebKit/blackberry








Revision 149826
Author mifen...@rim.com
Date 2013-05-09 11:32:48 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update SelectionHandler to match check-webkit-style updates.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::shouldExtendSelectionInDirection):
(BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):
(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
(BlackBerry::WebKit::adjustCaretRects):
(BlackBerry::WebKit::SelectionHandler::clipPointToVisibleContainer):
(BlackBerry::WebKit::regionRectListContainsPoint):
* WebKitSupport/SelectionHandler.h:
(SelectionHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149825 => 149826)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 18:24:05 UTC (rev 149825)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-09 18:32:48 UTC (rev 149826)
@@ -1,3 +1,22 @@
+2013-05-09  Mike Fenton mifen...@rim.com
+
+[BlackBerry] Style updates required based on new check-webkit-style
+https://bugs.webkit.org/show_bug.cgi?id=115857
+
+Reviewed by Rob Buis.
+
+Update SelectionHandler to match check-webkit-style updates.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::shouldExtendSelectionInDirection):
+(BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):
+(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
+(BlackBerry::WebKit::adjustCaretRects):
+(BlackBerry::WebKit::SelectionHandler::clipPointToVisibleContainer):
+(BlackBerry::WebKit::regionRectListContainsPoint):
+* WebKitSupport/SelectionHandler.h:
+(SelectionHandler):
+
 2013-05-09  Mike Fenton  mifen...@rim.com
 
 [BlackBerry] Style updates required based on new check-webkit-style


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (149825 => 149826)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-05-09 18:24:05 UTC (rev 149825)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-05-09 18:32:48 UTC (rev 149826)
@@ -317,7 +317,7 @@
 
 if ((character == KEYCODE_LEFT || character == KEYCODE_RIGHT)
  (!inSameLine(selection.visibleStart(), tempSelection.selection().visibleStart())
-   || !inSameLine(selection.visibleEnd(), tempSelection.selection().visibleEnd(
+|| !inSameLine(selection.visibleEnd(), tempSelection.selection().visibleEnd(
 return false;
 
 return tempSelection.selection().selectionType() == VisibleSelection::RangeSelection;
@@ -372,10 +372,9 @@
 if (!focusedFrame-document()-focusedNode() || !focusedFrame-document()-focusedNode()-renderer())
 return 0;
 
-FrameSelection* controller = focusedFrame-selection();
+VisibleSelection activeSelection = focusedFrame-selection()-selection();
 
-WebCore::IntRect caretRect = isStartHandle ? controller-selection().visibleStart().absoluteCaretBounds()
-  : controller-selection().visibleEnd().absoluteCaretBounds();
+WebCore::IntRect caretRect = isStartHandle ? activeSelection.visibleStart().absoluteCaretBounds() : activeSelection.visibleEnd().absoluteCaretBounds();
 
 WebCore::IntRect nodeBoundingBox = focusedFrame-document()-focusedNode()-renderer()-absoluteBoundingBoxRect();
 nodeBoundingBox.inflate(-1);
@@ -390,7 +389,7 @@
 || (!isStartHandle  (character == KEYCODE_LEFT || character == KEYCODE_UP)))
 character = 0;
 
-VisiblePosition newVisiblePosition = isStartHandle ? controller-selection().extent() : controller-selection().base();
+VisiblePosition newVisiblePosition = isStartHandle ? activeSelection.extent() : activeSelection.base();
 // Extend the selection to the bounds of the box before doing incremental scroll if the point is outside the node.
 // Don't extend selection and handle the character at the same time.
 if (pointIsOutsideOfBoundingBoxInDirection(character, selectionPoint, nodeBoundingBox))
@@ -402,7 +401,7 @@
 newSelection = VisibleSelection(newSelection.base(), newVisiblePosition, true /* isDirectional */);
 
 // If no selection will be changed, return the character to extend using navigation.
-if (controller-selection() == newSelection)
+if (activeSelection == newSelection)
 return character;
 
 // Selection has been updated.
@@ -410,8 +409,7 @@
 }
 
 // Returns true if handled.
-bool SelectionHandler::updateOrHandleInputSelection(VisibleSelection newSelection, const WebCore::IntPoint

[webkit-changes] [149831] trunk/Source/WebKit/blackberry

2013-05-09 Thread mifenton

Title: [149831] trunk/Source/WebKit/blackberry








Revision 149831
Author mifen...@rim.com
Date 2013-05-09 12:00:22 -0700 (Thu, 09 May 2013)


Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update iInRegionScroller, WebKitTextCodec and WebPageCompositor
to match check-webkit-style updates.

* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::setScrollPositionCompositingThread):
* Api/InRegionScroller_p.h:
* Api/WebKitTextCodec.cpp:
(BlackBerry::WebKit::transcode):
* Api/WebPageCompositor.cpp:
(BlackBerry::WebKit::WebPageCompositor::render):
* Api/WebPageCompositor.h:
* Api/WebPageCompositor_p.h:
(WebPageCompositorPrivate):
* Api/WebSettings_p.h:

Modified Paths

trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp
trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h
trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp
trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp
trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h
trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h
trunk/Source/WebKit/blackberry/Api/WebSettings_p.h
trunk/Source/WebKit/blackberry/ChangeLog




Diff

Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (149830 => 149831)

--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp	2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp	2013-05-09 19:00:22 UTC (rev 149831)
@@ -134,8 +134,7 @@
 bounds = scrollLayer-bounds();
 
 // Position is offset on the layer by the layer anchor point.
-FloatPoint layerPosition(-scrollPosition.x() + anchor.x() * bounds.width(),
- -scrollPosition.y() + anchor.y() * bounds.height());
+FloatPoint layerPosition(-scrollPosition.x() + anchor.x() * bounds.width(), -scrollPosition.y() + anchor.y() * bounds.height());
 
 scrollLayer-override()-setPosition(FloatPoint(layerPosition.x(), layerPosition.y()));
 


Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h (149830 => 149831)

--- trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h	2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h	2013-05-09 19:00:22 UTC (rev 149831)
@@ -19,8 +19,8 @@
 #ifndef InRegionScroller_p_h
 #define InRegionScroller_p_h
 
+#include IntPoint.h
 #include IntSize.h
-#include IntPoint.h
 
 #include interaction/ScrollViewBase.h
 #include vector


Modified: trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp (149830 => 149831)

--- trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp	2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp	2013-05-09 19:00:22 UTC (rev 149831)
@@ -70,7 +70,7 @@
 return false;
 }
 
-TranscodeResult transcode(const char* sourceEncoding, const char* targetEncoding, const char* sourceStart, int sourceLength, char* targetStart, unsigned int targetLength)
+TranscodeResult transcode(const char* sourceEncoding, const char* targetEncoding, const char* sourceStart, int sourceLength, char* targetStart, unsigned targetLength)
 {
 TextEncoding textEncodingSource(sourceEncoding);
 if (!textEncodingSource.isValid())


Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp (149830 => 149831)

--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp	2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp	2013-05-09 19:00:22 UTC (rev 149831)
@@ -21,12 +21,11 @@
 #include WebPageCompositor.h
 
 #if USE(ACCELERATED_COMPOSITING)
-#include WebPageCompositorClient.h
-#include WebPageCompositor_p.h
-
 #include BackingStore_p.h
 #include LayerWebKitThread.h
 #include WebOverlay_p.h
+#include WebPageCompositorClient.h
+#include WebPageCompositor_p.h
 #include WebPage_p.h
 
 #include BlackBerryPlatformDebugMacros.h
@@ -395,11 +394,11 @@
 }
 
 void WebPageCompositor::render(Platform::Graphics::GLES2Context*,
-   const Platform::IntRect,
-   const Platform::IntRect,
-   const Platform::TransformationMatrix,
-   const Platform::FloatRect,
-   const Platform::FloatRect)
+const Platform::IntRect,
+const Platform::IntRect,
+const Platform::TransformationMatrix,
+const Platform::FloatRect,
+const Platform::FloatRect)
 {
 }
 


Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h (149830 => 149831)

--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h	2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h	2013-05-09 19:00:22 UTC (rev 149831)
@@ -51,11 +51,11 @@
 void prepareFrame(Platform::Graphics::GLES2Context*, double animationTime);
 
 void render(Platform::Graphics::GLES2Context*,
-const Platform::IntRect targetRect,
-

[webkit-changes] [149689] trunk/Source/WebKit/blackberry

2013-05-07 Thread mifenton

Title: [149689] trunk/Source/WebKit/blackberry








Revision 149689
Author mifen...@rim.com
Date 2013-05-07 13:30:02 -0700 (Tue, 07 May 2013)


Log Message
[BlackBerry] Increase the padding size for caret based scrolling.
https://bugs.webkit.org/show_bug.cgi?id=115749

Reviewed by Rob Buis.

PR 322670.

Increasing the padding size for scrolling in order to optimize the
number of scrolls required during typing.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (149688 => 149689)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-07 19:42:03 UTC (rev 149688)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-07 20:30:02 UTC (rev 149689)
@@ -1,3 +1,18 @@
+2013-05-07  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Increase the padding size for caret based scrolling.
+https://bugs.webkit.org/show_bug.cgi?id=115749
+
+Reviewed by Rob Buis.
+
+PR 322670.
+
+Increasing the padding size for scrolling in order to optimize the
+number of scrolls required during typing.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2013-05-07  Nima Ghanavatian  nghanavat...@blackberry.com
 
 [BlackBerry] Maintain touch event state throughout processing


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (149688 => 149689)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-07 19:42:03 UTC (rev 149688)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-05-07 20:30:02 UTC (rev 149689)
@@ -1367,6 +1367,14 @@
 }
 }
 
+const Platform::ViewportAccessor* viewportAccessor = m_webPage-m_webkitThreadViewportAccessor;
+if (scrollType == EdgeIfNeeded
+ (viewportAccessor-documentViewportRect().contains(selectionFocusRect))
+ zoomScaleRequired == m_webPage-currentScale()) {
+// Already in view and no zoom is required, return early.
+return;
+}
+
 bool shouldConstrainScrollingToContentEdge = true;
 Position start = elementFrame-selection()-start();
 if (start.anchorNode()  start.anchorNode()-renderer()) {
@@ -1409,8 +1417,7 @@
 // Pad the rect to improve the visual appearance.
 // Convert the padding back from transformed to ensure a consistent padding regardless of
 // zoom level as controls do not zoom.
-static const int s_focusRectPaddingSize = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
-const Platform::ViewportAccessor* viewportAccessor = m_webPage-m_webkitThreadViewportAccessor;
+static const int s_focusRectPaddingSize = Graphics::Screen::primaryScreen()-heightInMMToPixels(12);
 selectionFocusRect.inflate(std::ceilf(viewportAccessor-documentFromPixelContents(Platform::FloatSize(0, s_focusRectPaddingSize)).height()));
 
 WebCore::IntRect revealRect(layer-getRectToExpose(actualScreenRect, selectionFocusRect,






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [148879] trunk

2013-04-22 Thread mifenton

Title: [148879] trunk








Revision 148879
Author mifen...@rim.com
Date 2013-04-22 07:19:24 -0700 (Mon, 22 Apr 2013)


Log Message
[BlackBerry] Add additional datalist support.
https://bugs.webkit.org/show_bug.cgi?id=114883

Reviewed by Rob Buis.

PR 210083.

Source/WebCore:

Extend support for datalist to include all non-popup input types.

Re-enabling fast/forms/datalist/input-list

Internally Reviewed by Otto Cheung.

* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::supportsDataListUI):

Source/WebKit/blackberry:

Properly set state when opening a Date/Time popup and simplify
the logic for showing datalist options.

Internally Reviewed by Otto Cheung.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::openDatePopup):
(BlackBerry::WebKit::InputHandler::showTextInputTypeSuggestionBox):

LayoutTests:

Fix results for fast/forms/datalist/input-list.

Internally Reviewed by Otto Cheung.

* platform/blackberry/fast/forms/datalist/input-list-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp


Added Paths

trunk/LayoutTests/platform/blackberry/fast/forms/datalist/
trunk/LayoutTests/platform/blackberry/fast/forms/datalist/input-list-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (148878 => 148879)

--- trunk/LayoutTests/ChangeLog	2013-04-22 12:39:24 UTC (rev 148878)
+++ trunk/LayoutTests/ChangeLog	2013-04-22 14:19:24 UTC (rev 148879)
@@ -1,3 +1,18 @@
+2013-04-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add additional datalist support.
+https://bugs.webkit.org/show_bug.cgi?id=114883
+
+Reviewed by Rob Buis.
+
+PR 210083.
+
+Fix results for fast/forms/datalist/input-list.
+
+Internally Reviewed by Otto Cheung.
+
+* platform/blackberry/fast/forms/datalist/input-list-expected.txt: Added.
+
 2013-04-22  Andrei Bucur  abu...@adobe.com
 
 [CSS Regions] Add tests for lists and counters


Added: trunk/LayoutTests/platform/blackberry/fast/forms/datalist/input-list-expected.txt (0 => 148879)

--- trunk/LayoutTests/platform/blackberry/fast/forms/datalist/input-list-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/blackberry/fast/forms/datalist/input-list-expected.txt	2013-04-22 14:19:24 UTC (rev 148879)
@@ -0,0 +1,35 @@
+Test for the list attribute.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS input.list is null
+PASS input.list is null
+PASS input.list is null
+PASS datalist.className is former
+PASS document.getElementById(text).list is document.getElementById(dl1)
+PASS document.getElementById(search).list is document.getElementById(dl1)
+PASS document.getElementById(url).list is document.getElementById(dl1)
+PASS document.getElementById(telephone).list is document.getElementById(dl1)
+PASS document.getElementById(email).list is document.getElementById(dl1)
+FAIL document.getElementById(datetime).list should be [object HTMLDataListElement]. Was null.
+FAIL document.getElementById(date).list should be [object HTMLDataListElement]. Was null.
+FAIL document.getElementById(month).list should be [object HTMLDataListElement]. Was null.
+FAIL document.getElementById(week).list should be [object HTMLDataListElement]. Was null.
+FAIL document.getElementById(time).list should be [object HTMLDataListElement]. Was null.
+FAIL document.getElementById(datetime-local).list should be [object HTMLDataListElement]. Was null.
+PASS document.getElementById(number).list is document.getElementById(dl1)
+PASS document.getElementById(range).list is document.getElementById(dl1)
+FAIL document.getElementById(color).list should be [object HTMLDataListElement]. Was null.
+PASS document.getElementById(hidden).list is null
+PASS document.getElementById(password).list is null
+PASS document.getElementById(checkbox).list is null
+PASS document.getElementById(radio).list is null
+PASS document.getElementById(file).list is null
+PASS document.getElementById(submit).list is null
+PASS document.getElementById(image).list is null
+PASS document.getElementById(reset).list is null
+PASS document.getElementById(button).list is null
+PASS successfullyParsed is true
+
+TEST COMPLETE


Modified: trunk/Source/WebCore/ChangeLog (148878 => 148879)

--- trunk/Source/WebCore/ChangeLog	2013-04-22 12:39:24 UTC (rev 148878)
+++ trunk/Source/WebCore/ChangeLog	2013-04-22 14:19:24 UTC (rev 148879)
@@ -1,3 +1,21 @@
+2013-04-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add additional datalist support.
+https://bugs.webkit.org/show_bug.cgi?id=114883
+
+Reviewed by Rob Buis.
+
+PR 210083.
+
+Extend support for datalist to include all non-popup input types.
+
+Re-enabling fast/forms/datalist/input-list
+

[webkit-changes] [145571] trunk/Source/WebKit/blackberry

2013-03-12 Thread mifenton

Title: [145571] trunk/Source/WebKit/blackberry








Revision 145571
Author mifen...@rim.com
Date 2013-03-12 11:38:33 -0700 (Tue, 12 Mar 2013)


Log Message
[BlackBerry] Prevent text selection inside Colour and Date/Time input fields
https://bugs.webkit.org/show_bug.cgi?id=111733

Reviewed by Rob Buis.

PR 305194.

Skip rendering of selection if it is in a popup driven
input field.  This covers situations where EditorClientBlackBerry::shouldChangeSelectedRange
is either not called or focus is not complete when called.

Informally reviewed by Gen Mak.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
(WebKit):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (145570 => 145571)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-03-12 18:28:32 UTC (rev 145570)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-03-12 18:38:33 UTC (rev 145571)
@@ -1,3 +1,22 @@
+2013-03-12  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Prevent text selection inside Colour and Date/Time input fields
+https://bugs.webkit.org/show_bug.cgi?id=111733
+
+Reviewed by Rob Buis.
+
+PR 305194.
+
+Skip rendering of selection if it is in a popup driven
+input field.  This covers situations where EditorClientBlackBerry::shouldChangeSelectedRange
+is either not called or focus is not complete when called.
+
+Informally reviewed by Gen Mak.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+(WebKit):
+
 2013-03-12  Genevieve Mak  g...@rim.com
 
 [BlackBerry] Notify client if the selection is in a subframe when started.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (145570 => 145571)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-03-12 18:28:32 UTC (rev 145570)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-03-12 18:38:33 UTC (rev 145571)
@@ -1150,6 +1150,13 @@
 else if (!m_selectionActive)
 return;
 
+if (Node* focusedNode = frame-document()-focusedNode()
+ (focusedNode-hasTagName(HTMLNames::selectTag) || (focusedNode-isElementNode()  DOMSupport::isPopupInputField(toElement(focusedNode) {
+SelectionLog(Platform::LogLevelInfo, SelectionHandler::selectionPositionChanged selection is on a popup control, skipping rendering.);
+return;
+}
+}
+
 SelectionTimingLog(Platform::LogLevelInfo,
 SelectionHandler::selectionPositionChanged starting at %f,
 m_timer.elapsed());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [145121] trunk/Source/WebKit/blackberry

2013-03-07 Thread mifenton

Title: [145121] trunk/Source/WebKit/blackberry








Revision 145121
Author mifen...@rim.com
Date 2013-03-07 12:55:29 -0800 (Thu, 07 Mar 2013)


Log Message
[BlackBerry] Prevent text selection inside Colour and Date/Time input fields
https://bugs.webkit.org/show_bug.cgi?id=111733

Reviewed by Rob Buis.

PR 305194.

Prevent selection for popup input fields as they are buttons.

Informally Reviewed Gen Mak.

* WebCoreSupport/EditorClientBlackBerry.cpp:
(WebCore::EditorClientBlackBerry::shouldChangeSelectedRange):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (145120 => 145121)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-03-07 20:49:23 UTC (rev 145120)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-03-07 20:55:29 UTC (rev 145121)
@@ -1,3 +1,19 @@
+2013-03-07  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Prevent text selection inside Colour and Date/Time input fields
+https://bugs.webkit.org/show_bug.cgi?id=111733
+
+Reviewed by Rob Buis.
+
+PR 305194.
+
+Prevent selection for popup input fields as they are buttons.
+
+Informally Reviewed Gen Mak.
+
+* WebCoreSupport/EditorClientBlackBerry.cpp:
+(WebCore::EditorClientBlackBerry::shouldChangeSelectedRange):
+
 2013-03-06  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Selection handles don't drag to expand correctly for RTL languages


Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp (145120 => 145121)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp	2013-03-07 20:49:23 UTC (rev 145120)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp	2013-03-07 20:55:29 UTC (rev 145121)
@@ -185,8 +185,12 @@
 
 Frame* frame = m_webPagePrivate-focusedOrMainFrame();
 if (frame  frame-document()) {
-if (frame-document()-focusedNode()  frame-document()-focusedNode()-hasTagName(HTMLNames::selectTag))
-return false;
+if (Node* focusedNode = frame-document()-focusedNode()) {
+if (focusedNode-hasTagName(HTMLNames::selectTag))
+return false;
+if (focusedNode-isElementNode()  DOMSupport::isPopupInputField(static_castElement*(focusedNode)))
+return false;
+}
 
 // Check if this change does not represent a focus change and input is active and if so ensure the keyboard is visible.
 if (m_webPagePrivate-m_inputHandler-isInputMode()  fromRange  toRange  (fromRange-startContainer() == toRange-startContainer()))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144488] trunk/Source/WebKit/blackberry

2013-03-01 Thread mifenton

Title: [144488] trunk/Source/WebKit/blackberry








Revision 144488
Author mifen...@rim.com
Date 2013-03-01 13:07:34 -0800 (Fri, 01 Mar 2013)


Log Message
[BlackBerry] Improve input bounds clipping for search fields.
https://bugs.webkit.org/show_bug.cgi?id=111204

Reviewed by Rob Buis.

PR 292673.

Use the standardized InputHandler function to get the
bounds of an input field so that search fields are
truncated smaller to account for the X.

Reviewed Internally by Gen Mak.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (144487 => 144488)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-03-01 21:02:16 UTC (rev 144487)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-03-01 21:07:34 UTC (rev 144488)
@@ -1,3 +1,21 @@
+2013-03-01  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Improve input bounds clipping for search fields.
+https://bugs.webkit.org/show_bug.cgi?id=111204
+
+Reviewed by Rob Buis.
+
+PR 292673.
+
+Use the standardized InputHandler function to get the
+bounds of an input field so that search fields are
+truncated smaller to account for the X.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+
 2013-03-01  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Reverse the base and extent of a selection when reversing its handles


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (144487 => 144488)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-03-01 21:02:16 UTC (rev 144487)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-03-01 21:07:34 UTC (rev 144488)
@@ -259,22 +259,18 @@
 return;
 }
 
-VisiblePosition visibleCaretPosition(focusedFrame-visiblePositionForPoint(relativePoint));
+WebCore::IntRect nodeOutlineBounds(m_webPage-m_inputHandler-boundingBoxForInputField());
+if (!nodeOutlineBounds.isEmpty()  !nodeOutlineBounds.contains(relativePoint)) {
+if (unsigned character = directionOfPointRelativeToRect(relativePoint, currentCaretRect))
+m_webPage-m_inputHandler-handleKeyboardInput(Platform::KeyboardEvent(character));
 
-if (RenderObject* focusedRenderer = focusedFrame-document()-focusedNode()-renderer()) {
-WebCore::IntRect nodeOutlineBounds(focusedRenderer-absoluteOutlineBounds());
-if (!nodeOutlineBounds.contains(relativePoint)) {
-if (unsigned character = directionOfPointRelativeToRect(relativePoint, currentCaretRect))
-m_webPage-m_inputHandler-handleKeyboardInput(Platform::KeyboardEvent(character));
-
-// Send the selection changed in case this does not trigger a selection change to
-// ensure the caret position is accurate. This may be a duplicate event.
-selectionPositionChanged(true /* forceUpdateWithoutChange */);
-return;
-}
+// Send the selection changed in case this does not trigger a selection change to
+// ensure the caret position is accurate. This may be a duplicate event.
+selectionPositionChanged(true /* forceUpdateWithoutChange */);
+return;
 }
 
-VisibleSelection newSelection(visibleCaretPosition);
+VisibleSelection newSelection(focusedFrame-visiblePositionForPoint(relativePoint));
 if (controller-selection() == newSelection) {
 selectionPositionChanged(true /* forceUpdateWithoutChange */);
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144355] trunk/Source/WebKit/blackberry

2013-02-28 Thread mifenton

Title: [144355] trunk/Source/WebKit/blackberry








Revision 144355
Author mifen...@rim.com
Date 2013-02-28 13:30:00 -0800 (Thu, 28 Feb 2013)


Log Message
[BlackBerry] Maintain the directionality of the selection after modifying the selection using key events.
https://bugs.webkit.org/show_bug.cgi?id=111078

Reviewed by Yong Li.

PR 295224.

When using the key navigation to modify the selection, reset the
directionality of the selection to the original to prevent
changing the anchor.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (144354 => 144355)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-28 21:08:39 UTC (rev 144354)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-28 21:30:00 UTC (rev 144355)
@@ -1,3 +1,21 @@
+2013-02-28  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Maintain the directionality of the selection after modifying the selection using key events.
+https://bugs.webkit.org/show_bug.cgi?id=111078
+
+Reviewed by Yong Li.
+
+PR 295224.
+
+When using the key navigation to modify the selection, reset the
+directionality of the selection to the original to prevent
+changing the anchor.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
+
 2013-02-28  Lianghui Chen  liac...@rim.com
 
 [BlackBerry] Disable auto-filling password in forms when auto-form-filling is not enabled.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (144354 => 144355)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-02-28 21:08:39 UTC (rev 144354)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-02-28 21:30:00 UTC (rev 144355)
@@ -439,15 +439,17 @@
 return false;
 
 unsigned character = 0;
+bool needToInvertDirection = false;
 if (startIsOutsideOfField) {
 character = extendSelectionToFieldBoundary(true /* isStartHandle */, relativeStart, newSelection);
-if (character) {
+if (character  controller-selection().isBaseFirst()) {
 // Invert the selection so that the cursor point is at the beginning.
 controller-setSelection(VisibleSelection(controller-selection().end(), controller-selection().start(), true /* isDirectional */));
+needToInvertDirection = true;
 }
 } else if (endIsOutsideOfField) {
 character = extendSelectionToFieldBoundary(false /* isStartHandle */, relativeEnd, newSelection);
-if (character) {
+if (character  !controller-selection().isBaseFirst()) {
 // Reset the selection so that the end is the edit point.
 controller-setSelection(VisibleSelection(controller-selection().start(), controller-selection().end(), true /* isDirectional */));
 }
@@ -463,6 +465,9 @@
 if (shouldExtendSelectionInDirection(controller-selection(), character))
 m_webPage-m_inputHandler-handleKeyboardInput(Platform::KeyboardEvent(character, Platform::KeyboardEvent::KeyDown, KEYMOD_SHIFT));
 
+if (needToInvertDirection)
+controller-setSelection(VisibleSelection(controller-selection().extent(), controller-selection().base(), true /* isDirectional */));
+
 // Send the selection changed in case this does not trigger a selection change to
 // ensure the caret position is accurate. This may be a duplicate event.
 selectionPositionChanged(true /* forceUpdateWithoutChange */);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144193] trunk/Source/WebKit/blackberry

2013-02-27 Thread mifenton

Title: [144193] trunk/Source/WebKit/blackberry








Revision 144193
Author mifen...@rim.com
Date 2013-02-27 08:26:05 -0800 (Wed, 27 Feb 2013)


Log Message
[BlackBerry] Accept key events even when composing region is active.
https://bugs.webkit.org/show_bug.cgi?id=110617

Reviewed by Rob Buis.

PR 293598.

Fix a regression in the previous patch caused
by an unhandled Alt key down being sent through
by IMF.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (144192 => 144193)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-27 16:21:56 UTC (rev 144192)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-27 16:26:05 UTC (rev 144193)
@@ -1,3 +1,23 @@
+2013-02-27  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Accept key events even when composing region is active.
+https://bugs.webkit.org/show_bug.cgi?id=110617
+
+Reviewed by Rob Buis.
+
+PR 293598.
+
+Fix a regression in the previous patch caused
+by an unhandled Alt key down being sent through
+by IMF.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2013-02-26  Yong Li  y...@rim.com
 
 [BlackBerry] Use APIEntryShim when making JS call


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (144192 => 144193)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-27 16:21:56 UTC (rev 144192)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-27 16:26:05 UTC (rev 144193)
@@ -1674,6 +1674,14 @@
 setCursorPosition(selectionStartPosition);
 }
 
+bool InputHandler::isNavigationKey(unsigned character) const
+{
+return character == KEYCODE_UP
+|| character == KEYCODE_DOWN
+|| character == KEYCODE_LEFT
+|| character == KEYCODE_RIGHT;
+}
+
 bool InputHandler::handleKeyboardInput(const Platform::KeyboardEvent keyboardEvent, bool changeIsPartOfComposition)
 {
 InputLog(Platform::LogLevelInfo,
@@ -1703,8 +1711,12 @@
 // If we aren't specifically part of a composition, fail, IMF should never send key input
 // while composing text. If IMF has failed, we should have already finished the
 // composition manually. There is a caveat for KeyUp which is explained above.
-if (!changeIsPartOfComposition  compositionActive())
-removeAttributedTextMarker();
+if (!changeIsPartOfComposition  compositionActive()) {
+if (type == Platform::KeyboardEvent::KeyDown  isNavigationKey(keyboardEvent.character()))
+removeAttributedTextMarker();
+else
+return false;
+}
 
 ProcessingChangeGuard guard(this);
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (144192 => 144193)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2013-02-27 16:21:56 UTC (rev 144192)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2013-02-27 16:26:05 UTC (rev 144193)
@@ -228,6 +228,8 @@
 void showTextInputTypeSuggestionBox(bool allowEmptyPrefix = false);
 void hideTextInputTypeSuggestionBox();
 
+bool isNavigationKey(unsigned character) const;
+
 WebPagePrivate* m_webPage;
 
 RefPtrWebCore::Element m_currentFocusElement;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143942] trunk/Source/WebKit/blackberry

2013-02-25 Thread mifenton

Title: [143942] trunk/Source/WebKit/blackberry








Revision 143942
Author mifen...@rim.com
Date 2013-02-25 10:10:52 -0800 (Mon, 25 Feb 2013)


Log Message
[BlackBerry] Force form submission when implicit submission fails.
https://bugs.webkit.org/show_bug.cgi?id=110627

Reviewed by Rob Buis.

PR 286023.

When implicit form submission does not submit the form
do a direct submission of the form.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (143941 => 143942)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-25 18:08:50 UTC (rev 143941)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-25 18:10:52 UTC (rev 143942)
@@ -1,3 +1,20 @@
+2013-02-25  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Force form submission when implicit submission fails.
+https://bugs.webkit.org/show_bug.cgi?id=110627
+
+Reviewed by Rob Buis.
+
+PR 286023.
+
+When implicit form submission does not submit the form
+do a direct submission of the form.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+
 2013-02-25  Tiancheng Jiang  tiji...@rim.com
 
 [BlackBerry]Adjust fatfinger detection rect size.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (143941 => 143942)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-25 18:08:50 UTC (rev 143941)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-25 18:10:52 UTC (rev 143942)
@@ -991,8 +991,13 @@
 InputLog(Platform::LogLevelInfo, InputHandler::submitForm triggered);
 if (elementType(m_currentFocusElement.get()) == InputTypeTextArea)
 formElement-submit();
-else
+else {
 handleKeyboardInput(Platform::KeyboardEvent(KEYCODE_RETURN, Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
+
+// Confirm that implicit submission was accepted.
+if (isActiveTextEdit())
+formElement-submit();
+}
 }
 
 static void addInputStyleMaskForKeyboardType(int64_t inputMask, VirtualKeyboardType keyboardType)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143767] trunk/Source/WebKit/blackberry

2013-02-22 Thread mifenton

Title: [143767] trunk/Source/WebKit/blackberry








Revision 143767
Author mifen...@rim.com
Date 2013-02-22 11:59:12 -0800 (Fri, 22 Feb 2013)


Log Message
[BlackBerry] Accept key events even when composing region is active.
https://bugs.webkit.org/show_bug.cgi?id=110617

Reviewed by Rob Buis.

PR 293598.

Don't reject key events that arrive when composing region is active,
this can prevent navigation events from firing, instead end
the composition and process the key.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (143766 => 143767)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-22 19:53:35 UTC (rev 143766)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-22 19:59:12 UTC (rev 143767)
@@ -1,3 +1,21 @@
+2013-02-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Accept key events even when composing region is active.
+https://bugs.webkit.org/show_bug.cgi?id=110617
+
+Reviewed by Rob Buis.
+
+PR 293598.
+
+Don't reject key events that arrive when composing region is active,
+this can prevent navigation events from firing, instead end
+the composition and process the key.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+
 2013-02-22  Carlos Garcia Campos  cargar...@rim.com
 
 [BlackBerry] Rename first/second to key/value in HashMap iterators


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (143766 => 143767)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-22 19:53:35 UTC (rev 143766)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-22 19:59:12 UTC (rev 143767)
@@ -1686,7 +1686,7 @@
 // while composing text. If IMF has failed, we should have already finished the
 // composition manually. There is a caveat for KeyUp which is explained above.
 if (!changeIsPartOfComposition  compositionActive())
-return false;
+removeAttributedTextMarker();
 
 ProcessingChangeGuard guard(this);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143786] trunk/Source/WebKit/blackberry

2013-02-22 Thread mifenton

Title: [143786] trunk/Source/WebKit/blackberry








Revision 143786
Author mifen...@rim.com
Date 2013-02-22 13:41:53 -0800 (Fri, 22 Feb 2013)


Log Message
[BlackBerry] Eliminate invalid clipping for content editable selections
https://bugs.webkit.org/show_bug.cgi?id=110630

Reviewed by Rob Buis.

PR 284629.

Remove selection clipping for content editable
fields as the bounds aren't valid and cause
clipping based on starting node rather than the
union of nodes.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::clippingRectForVisibleContent):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (143785 => 143786)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-22 21:38:08 UTC (rev 143785)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-22 21:41:53 UTC (rev 143786)
@@ -1,3 +1,24 @@
+2013-02-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Eliminate invalid clipping for content editable selections
+https://bugs.webkit.org/show_bug.cgi?id=110630
+
+Reviewed by Rob Buis.
+
+PR 284629.
+
+Remove selection clipping for content editable
+fields as the bounds aren't valid and cause
+clipping based on starting node rather than the
+union of nodes.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::clippingRectForVisibleContent):
+
 2013-02-22  Tiancheng Jiang  tiji...@rim.com
 
 [BlackBerry]Adjust fatfinger detection rect size


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (143785 => 143786)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-22 21:38:08 UTC (rev 143785)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-22 21:41:53 UTC (rev 143786)
@@ -1218,11 +1218,17 @@
 return WebCore::IntRect();
 
 // type=search can have a 'X', so take the inner block bounding box to not include it.
-if (HTMLInputElement* element = m_currentFocusElement-toInputElement())
+if (HTMLInputElement* element = m_currentFocusElement-toInputElement()) {
 if (element-isSearchField())
 return element-innerBlockElement()-renderer()-absoluteBoundingBoxRect();
+return m_currentFocusElement-renderer()-absoluteBoundingBoxRect();
+}
 
-return m_currentFocusElement-renderer()-absoluteBoundingBoxRect();
+if (m_currentFocusElement-hasTagName(HTMLNames::textareaTag))
+return m_currentFocusElement-renderer()-absoluteBoundingBoxRect();
+
+// Content Editable can't rely on the bounding box since it isn't fixed.
+return WebCore::IntRect();
 }
 
 void InputHandler::ensureFocusTextElementVisible(CaretScrollType scrollType)


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (143785 => 143786)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-02-22 21:38:08 UTC (rev 143785)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-02-22 21:41:53 UTC (rev 143786)
@@ -107,7 +107,7 @@
 {
 // Get the containing content rect for the frame.
 Frame* frame = m_webPage-focusedOrMainFrame();
-WebCore::IntRect clipRect = WebCore::IntRect(WebCore::IntPoint(0, 0), m_webPage-contentsSize());
+WebCore::IntRect clipRect = WebCore::IntRect(WebCore::IntPoint(0, 0), frame-view()-contentsSize());
 if (frame != m_webPage-mainFrame()) {
 clipRect = m_webPage-getRecursiveVisibleWindowRect(frame-view(), true /* no clip to main frame window */);
 clipRect = m_webPage-m_mainFrame-view()-windowToContents(clipRect);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142882] trunk/Source

2013-02-14 Thread mifenton

Title: [142882] trunk/Source








Revision 142882
Author mifen...@rim.com
Date 2013-02-14 09:11:13 -0800 (Thu, 14 Feb 2013)


Log Message
[BlackBerry] Update keyboard event details to match platform details.
https://bugs.webkit.org/show_bug.cgi?id=109693

Reviewed by Yong Li.

PR 220170.

Source/WebCore:

Update the keyboard event details to match the
platform details available.

Rename helper function to better describe the conversion.

Reviewed Internally by Nima Ghanavatian and Gen Mak.

* platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
(WebCore::windowsKeyCodeForBlackBerryKeycode):
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):

Source/WebKit/blackberry:

Update keyboard event details.

Reviewed Internally by Nima Ghanavatian and Gen Mak.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::keyEvent):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog




Diff

Modified: trunk/Source/WebCore/ChangeLog (142881 => 142882)

--- trunk/Source/WebCore/ChangeLog	2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebCore/ChangeLog	2013-02-14 17:11:13 UTC (rev 142882)
@@ -1,3 +1,23 @@
+2013-02-14  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update keyboard event details to match platform details.
+https://bugs.webkit.org/show_bug.cgi?id=109693
+
+Reviewed by Yong Li.
+
+PR 220170.
+
+Update the keyboard event details to match the
+platform details available.
+
+Rename helper function to better describe the conversion.
+
+Reviewed Internally by Nima Ghanavatian and Gen Mak.
+
+* platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
+(WebCore::windowsKeyCodeForBlackBerryKeycode):
+(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+
 2013-02-08  Andrey Kosyakov  ca...@chromium.org
 
 Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
@@ -49192,7 +49212,7 @@
 
 2013-01-06  Sebastian Dröge  sebastian.dro...@collabora.co.uk
 
-Bug 106177 - [GStreamer] Don't call gst_video_info_from_caps() with non-fixed caps
+Bug 106177 - [GStreamer] Don't call gst_video_info_from_caps() with non-fixed caps
 https://bugs.webkit.org/show_bug.cgi?id=106177
 
 Reviewed by Martin Robinson.


Modified: trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp (142881 => 142882)

--- trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp	2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp	2013-02-14 17:11:13 UTC (rev 142882)
@@ -111,9 +111,9 @@
 }
 }
 
-static int windowsKeyCodeForBlackBerryCharacter(unsigned character)
+static int windowsKeyCodeForBlackBerryKeycode(unsigned keycode)
 {
-switch (character) {
+switch (keycode) {
 case KEYCODE_RETURN:
 case KEYCODE_KP_ENTER:
 return VK_RETURN; // (0D) Return key
@@ -439,9 +439,9 @@
 }
 
 PlatformKeyboardEvent::PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent event)
-: PlatformEvent(toWebCorePlatformKeyboardEventType(event.type()), event.shiftActive() || (event.character() == KEYCODE_BACK_TAB), event.ctrlActive(), event.altActive(), false, currentTime())
+: PlatformEvent(toWebCorePlatformKeyboardEventType(event.type()), event.shiftActive() || (event.character() == KEYCODE_BACK_TAB), event.ctrlActive(), event.altActive(), event.metaActive(), currentTime())
 , m_keyIdentifier(keyIdentifierForBlackBerryCharacter(event.character()))
-, m_windowsVirtualKeyCode(windowsKeyCodeForBlackBerryCharacter(event.character()))
+, m_windowsVirtualKeyCode(windowsKeyCodeForBlackBerryKeycode(event.keycode() ? event.keycode() : event.character())) // if keycode isn't valid, use character as it's unconverted.
 , m_autoRepeat(false)
 , m_isKeypad(false)
 , m_unmodifiedCharacter(event.character())


Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (142881 => 142882)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-02-14 17:11:13 UTC (rev 142882)
@@ -4334,7 +4334,8 @@
 
 bool handled = d-m_inputHandler-handleKeyboardInput(keyboardEvent);
 
-if (!handled  keyboardEvent.type() == Platform::KeyboardEvent::KeyDown  !d-m_inputHandler-isInputMode()) {
+// This is hotkey handling and perhaps doesn't belong here.
+if (!handled  keyboardEvent.type() == Platform::KeyboardEvent::KeyDown  !d-m_inputHandler-isInputMode()  !keyboardEvent.modifiers()) {
 IntPoint previousPos = d-scrollPosition();
 handleScrolling(keyboardEvent.character(), d);
 handled = previousPos != d-scrollPosition();


Modified: trunk/Source/WebKit/blackberry/ChangeLog (142881 =>

[webkit-changes] [142884] trunk/Source/WebKit/blackberry

2013-02-14 Thread mifenton

Title: [142884] trunk/Source/WebKit/blackberry








Revision 142884
Author mifen...@rim.com
Date 2013-02-14 09:21:28 -0800 (Thu, 14 Feb 2013)


Log Message
[BlackBerry] Update keyboard event details to match platform details.
https://bugs.webkit.org/show_bug.cgi?id=109693

Reviewed by Yong Li.

PR 220170.

When re-creating the Platform::Keyboard event ensure
all values are updated.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::updateFormState):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (142883 => 142884)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-14 17:15:52 UTC (rev 142883)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-14 17:21:28 UTC (rev 142884)
@@ -7,6 +7,23 @@
 
 PR 220170.
 
+When re-creating the Platform::Keyboard event ensure
+all values are updated.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::updateFormState):
+
+2013-02-14  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update keyboard event details to match platform details.
+https://bugs.webkit.org/show_bug.cgi?id=109693
+
+Reviewed by Yong Li.
+
+PR 220170.
+
 Update keyboard event details.
 
 Reviewed Internally by Nima Ghanavatian and Gen Mak.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (142883 => 142884)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-14 17:15:52 UTC (rev 142883)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-14 17:21:28 UTC (rev 142884)
@@ -1705,14 +1705,14 @@
 m_shouldNotifyWebView = shouldNotifyWebView(keyboardEvent);
 }
 
-Platform::KeyboardEvent adjustedKeyboardEvent(keyboardEvent.character(), type, adjustedModifiers);
+Platform::KeyboardEvent adjustedKeyboardEvent(keyboardEvent.character(), type, adjustedModifiers, keyboardEvent.keycode(), keyboardEvent.alternateCharacter(), keyboardEvent.sourceDevice());
 keyboardEventHandled = focusedFrame-eventHandler()-keyEvent(PlatformKeyboardEvent(adjustedKeyboardEvent));
 
 m_shouldNotifyWebView = true;
 
 if (isKeyChar) {
 type = Platform::KeyboardEvent::KeyUp;
-adjustedKeyboardEvent = Platform::KeyboardEvent(keyboardEvent.character(), type, adjustedModifiers);
+adjustedKeyboardEvent = Platform::KeyboardEvent(keyboardEvent.character(), type, adjustedModifiers, keyboardEvent.keycode(), keyboardEvent.alternateCharacter(), keyboardEvent.sourceDevice());
 keyboardEventHandled = focusedFrame-eventHandler()-keyEvent(PlatformKeyboardEvent(adjustedKeyboardEvent)) || keyboardEventHandled;
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [142482] trunk/Source/WebKit/blackberry

2013-02-11 Thread mifenton

Title: [142482] trunk/Source/WebKit/blackberry








Revision 142482
Author mifen...@rim.com
Date 2013-02-11 09:17:45 -0800 (Mon, 11 Feb 2013)


Log Message
[BlackBerry] Add form navigation control state tracking.
https://bugs.webkit.org/show_bug.cgi?id=109300

Reviewed by Rob Buis.

Add form navigation control state tracking.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::focusNextField):
(WebKit):
(BlackBerry::WebKit::WebPage::focusPreviousField):
(BlackBerry::WebKit::WebPage::submitForm):
* Api/WebPage.h:
* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::InputHandler):
(BlackBerry::WebKit::InputHandler::setElementUnfocused):
(BlackBerry::WebKit::InputHandler::updateFormState):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.h
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (142481 => 142482)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-02-11 17:01:06 UTC (rev 142481)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-02-11 17:17:45 UTC (rev 142482)
@@ -2633,6 +2633,21 @@
 d-assignFocus(direction);
 }
 
+void WebPage::focusNextField()
+{
+d-m_inputHandler-focusNextField();
+}
+
+void WebPage::focusPreviousField()
+{
+d-m_inputHandler-focusPreviousField();
+}
+
+void WebPage::submitForm()
+{
+d-m_inputHandler-submitForm();
+}
+
 Platform::IntRect WebPagePrivate::focusNodeRect()
 {
 Frame* frame = focusedOrMainFrame();


Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (142481 => 142482)

--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-02-11 17:01:06 UTC (rev 142481)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-02-11 17:17:45 UTC (rev 142482)
@@ -212,6 +212,10 @@
 
 void setFocused(bool);
 
+void focusNextField();
+void focusPreviousField();
+void submitForm();
+
 void clearBrowsingData();
 void clearHistory();
 void clearCookies();


Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (142481 => 142482)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2013-02-11 17:01:06 UTC (rev 142481)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2013-02-11 17:17:45 UTC (rev 142482)
@@ -147,6 +147,7 @@
 virtual void inputSelectionChanged(unsigned selectionStart, unsigned selectionEnd) = 0;
 virtual void inputLearnText(wchar_t* text, int length) = 0;
 
+virtual void showFormControls(bool visible, bool previousActive = false, bool nextActive = false) = 0;
 virtual void showVirtualKeyboard(bool) = 0;
 
 virtual void requestSpellingCheckingOptions(imf_sp_text_t, const BlackBerry::Platform::IntRect documentCaretRect, const BlackBerry::Platform::IntSize screenOffset, const bool shouldMoveDialog) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (142481 => 142482)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-11 17:01:06 UTC (rev 142481)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-11 17:17:45 UTC (rev 142482)
@@ -1,3 +1,26 @@
+2013-02-11  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add form navigation control state tracking.
+https://bugs.webkit.org/show_bug.cgi?id=109300
+
+Reviewed by Rob Buis.
+
+Add form navigation control state tracking.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPage::focusNextField):
+(WebKit):
+(BlackBerry::WebKit::WebPage::focusPreviousField):
+(BlackBerry::WebKit::WebPage::submitForm):
+* Api/WebPage.h:
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::InputHandler):
+(BlackBerry::WebKit::InputHandler::setElementUnfocused):
+(BlackBerry::WebKit::InputHandler::updateFormState):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2013-02-09  Tiancheng Jiang  tiji...@rim.com
 
 [BlackBerry] Set mouse document position for mouse event in updateCursor.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (142481 => 142482)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-11 17:01:06 UTC (rev 142481)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-11 17:17:45 UTC (rev 142482)
@@ -130,6 +130,9 @@
 InputHandler::InputHandler(WebPagePrivate* page)
 : m_webPage(page)
 , m_currentFocusElement(0)
+, m_previousFocusableTextElement(0)
+, m_nextFocusableTextElement(0)
+, m_hasSubmitButton(false)
 , m_inputModeEnabled(false)
 , m_processingChange(false)
 , m_shouldEnsureFocusTextElementVisibleOnSelectionChanged(false)
@@ -139,6 +142,7 @@
 , m_composingTextEnd(0)
 ,

[webkit-changes] [142116] trunk/Source/WebKit/blackberry

2013-02-07 Thread mifenton

Title: [142116] trunk/Source/WebKit/blackberry








Revision 142116
Author mifen...@rim.com
Date 2013-02-07 07:07:03 -0800 (Thu, 07 Feb 2013)


Log Message
[BlackBerry] Send type details with IMF mask as part of focus gained.
https://bugs.webkit.org/show_bug.cgi?id=109086

Reviewed by Yong Li.

PR 292609.

Add masking options based on VKB type to the IMF mask.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::addInputStyleMaskForKeyboardType):
(WebKit):
(BlackBerry::WebKit::InputHandler::setElementFocused):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (142115 => 142116)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-02-07 15:05:26 UTC (rev 142115)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-02-07 15:07:03 UTC (rev 142116)
@@ -1,3 +1,21 @@
+2013-02-07  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Send type details with IMF mask as part of focus gained.
+https://bugs.webkit.org/show_bug.cgi?id=109086
+
+Reviewed by Yong Li.
+
+PR 292609.
+
+Add masking options based on VKB type to the IMF mask.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::addInputStyleMaskForKeyboardType):
+(WebKit):
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+
 2013-02-06  Jakob Petsovits  jpetsov...@rim.com
 
 [BlackBerry] Refactor renderContents() for cleaner code.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (142115 => 142116)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-07 15:05:26 UTC (rev 142115)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-02-07 15:07:03 UTC (rev 142116)
@@ -899,6 +899,29 @@
 m_currentFocusElement-document()-frame()-selection()-setFocused(true);
 }
 
+static void addInputStyleMaskForKeyboardType(int64_t inputMask, VirtualKeyboardType keyboardType)
+{
+switch (keyboardType) {
+case VKBTypeUrl:
+inputMask |= IMF_URL_TYPE;
+break;
+case VKBTypePassword:
+inputMask |= IMF_PASSWORD_TYPE;
+break;
+case VKBTypePin:
+inputMask |= IMF_PIN_TYPE;
+break;
+case VKBTypePhone:
+inputMask |= IMF_PHONE_TYPE;
+break;
+case VKBTypeEmail:
+inputMask |= IMF_EMAIL_TYPE;
+break;
+default:
+break;
+}
+}
+
 void InputHandler::setElementFocused(Element* element)
 {
 ASSERT(DOMSupport::isTextBasedContentEditableElement(element));
@@ -938,6 +961,8 @@
 if (keyboardType == VKBTypeNotSet)
 keyboardType = convertInputTypeToVKBType(type);
 
+addInputStyleMaskForKeyboardType(m_currentFocusElementTextEditMask, keyboardType);
+
 VirtualKeyboardEnterKeyType enterKeyType = keyboardEnterKeyTypeAttribute(element);
 
 if (enterKeyType == VKBEnterKeyNotSet  type != InputTypeTextArea) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [140043] trunk/Source/WebKit/blackberry

2013-01-17 Thread mifenton

Title: [140043] trunk/Source/WebKit/blackberry








Revision 140043
Author mifen...@rim.com
Date 2013-01-17 14:31:42 -0800 (Thu, 17 Jan 2013)


Log Message
[BlackBerry] Fix selection handle appearance for RTL text.
https://bugs.webkit.org/show_bug.cgi?id=107043

Reviewed by Rob Buis.

PR 263585.

Invert the reported selection handle position if to match
the visual order instead of the logical order to create the
desired appearance for RTL text and directional selections.

Reviewed Internally by Gen Mak and Nima Ghanavatian.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (140042 => 140043)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-01-17 22:28:54 UTC (rev 140042)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-01-17 22:31:42 UTC (rev 140043)
@@ -1,3 +1,21 @@
+2013-01-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Fix selection handle appearance for RTL text.
+https://bugs.webkit.org/show_bug.cgi?id=107043
+
+Reviewed by Rob Buis.
+
+PR 263585.
+
+Invert the reported selection handle position if to match
+the visual order instead of the logical order to create the
+desired appearance for RTL text and directional selections.
+
+Reviewed Internally by Gen Mak and Nima Ghanavatian.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+
 2013-01-16  Charles Wei  charles@torchmobile.com.cn
 
 [BlackBerry] Need to adjust the scale and scroll position after leaving fullscreen mode if there's


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (140042 => 140043)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-01-17 22:28:54 UTC (rev 140042)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2013-01-17 22:31:42 UTC (rev 140043)
@@ -954,14 +954,13 @@
 return;
 
 m_lastSelectionRegion = unclippedRegion;
+bool isRTL = directionOfEnclosingBlock(frame-selection()) == RTL;
 
 IntRectRegion visibleSelectionRegion;
 if (!unclippedRegion.isEmpty()) {
 WebCore::IntRect unclippedStartCaret;
 WebCore::IntRect unclippedEndCaret;
 
-bool isRTL = directionOfEnclosingBlock(frame-selection()) == RTL;
-
 WebCore::IntPoint startCaretReferencePoint = referencePoint(frame-selection()-selection().visibleStart(), unclippedRegion.extents(), framePos, true /* isStartCaret */, isRTL);
 WebCore::IntPoint endCaretReferencePoint = referencePoint(frame-selection()-selection().visibleEnd(), unclippedRegion.extents(), framePos, false /* isStartCaret */, isRTL);
 
@@ -999,6 +998,13 @@
 }
 }
 
+if (!frame-selection()-selection().isBaseFirst() || isRTL ) {
+// End handle comes before start, invert the caret reference points.
+WebCore::IntRect tmpCaret(startCaret);
+startCaret = endCaret;
+endCaret = tmpCaret;
+}
+
 SelectionLog(Platform::LogLevelInfo,
 SelectionHandler::selectionPositionChanged Start Rect=%s End Rect=%s,
 Platform::IntRect(startCaret).toString().c_str(),






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [139787] trunk/Source/WebKit/blackberry

2013-01-15 Thread mifenton

Title: [139787] trunk/Source/WebKit/blackberry








Revision 139787
Author mifen...@rim.com
Date 2013-01-15 14:04:29 -0800 (Tue, 15 Jan 2013)


Log Message
[BlackBerry] Don't overwrite field dir with current locale.
https://bugs.webkit.org/show_bug.cgi?id=106932

Reviewed by Yong Li.

PR 212267.

Remove uncalled onInputLocaleChanged and stop re-writing the dir
on input focus which prevented RTL fields from rendering properly.

Reviewed Internally by Eli Fidler.

* Api/WebPage.cpp:
* Api/WebPage.h:
* Api/WebPage_p.h:
(WebPagePrivate):
* WebKitSupport/InputHandler.cpp:
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.h
trunk/Source/WebKit/blackberry/Api/WebPage_p.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (139786 => 139787)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-15 22:04:29 UTC (rev 139787)
@@ -3517,19 +3517,6 @@
 zoomToInitialScaleOnLoad();
 }
 
-void WebPagePrivate::onInputLocaleChanged(bool isRTL)
-{
-if (isRTL != m_webSettings-isWritingDirectionRTL()) {
-m_webSettings-setWritingDirectionRTL(isRTL);
-m_inputHandler-handleInputLocaleChanged(isRTL);
-}
-}
-
-void WebPage::onInputLocaleChanged(bool isRTL)
-{
-d-onInputLocaleChanged(isRTL);
-}
-
 void WebPagePrivate::suspendBackingStore()
 {
 #if USE(ACCELERATED_COMPOSITING)


Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (139786 => 139787)

--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-01-15 22:04:29 UTC (rev 139787)
@@ -264,7 +264,6 @@
 void setDateTimeInput(const BlackBerry::Platform::String value);
 void setColorInput(const BlackBerry::Platform::String value);
 
-void onInputLocaleChanged(bool isRTL);
 static void onNetworkAvailabilityChanged(bool available);
 static void onCertificateStoreLocationSet(const BlackBerry::Platform::String caPath);
 


Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (139786 => 139787)

--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-01-15 22:04:29 UTC (rev 139787)
@@ -326,8 +326,6 @@
 
 void updateCursor();
 
-void onInputLocaleChanged(bool isRTL);
-
 ViewMode viewMode() const { return m_viewMode; }
 bool setViewMode(ViewMode); // Returns true if the change requires re-layout.
 


Modified: trunk/Source/WebKit/blackberry/ChangeLog (139786 => 139787)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-01-15 22:04:29 UTC (rev 139787)
@@ -1,3 +1,25 @@
+2013-01-15  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Don't overwrite field dir with current locale.
+https://bugs.webkit.org/show_bug.cgi?id=106932
+
+Reviewed by Yong Li.
+
+PR 212267.
+
+Remove uncalled onInputLocaleChanged and stop re-writing the dir
+on input focus which prevented RTL fields from rendering properly.
+
+Reviewed Internally by Eli Fidler.
+
+* Api/WebPage.cpp:
+* Api/WebPage.h:
+* Api/WebPage_p.h:
+(WebPagePrivate):
+* WebKitSupport/InputHandler.cpp:
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2013-01-15  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] Manual zoom propagates to next page load


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (139786 => 139787)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-01-15 22:04:29 UTC (rev 139787)
@@ -1738,22 +1738,6 @@
 m_composingTextEnd = 0;
 }
 
-void InputHandler::handleInputLocaleChanged(bool isRTL)
-{
-if (!isActiveTextEdit())
-return;
-
-ASSERT(m_currentFocusElement-document()  m_currentFocusElement-document()-frame());
-RenderObject* renderer = m_currentFocusElement-renderer();
-if (!renderer)
-return;
-
-Editor* editor = m_currentFocusElement-document()-frame()-editor();
-ASSERT(editor);
-if ((renderer-style()-direction() == RTL) != isRTL)
-editor-setBaseWritingDirection(isRTL ? RightToLeftWritingDirection : LeftToRightWritingDirection);
-}
-
 void InputHandler::clearCurrentFocusElement()
 {
 if (m_currentFocusElement)


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (139786 => 139787)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2013-01-15 22:03:13 UTC (rev 139786)
+++

[webkit-changes] [138837] trunk/Source/WebKit/blackberry

2013-01-04 Thread mifenton

Title: [138837] trunk/Source/WebKit/blackberry








Revision 138837
Author mifen...@rim.com
Date 2013-01-04 12:43:39 -0800 (Fri, 04 Jan 2013)


Log Message
[BlackBerry] Enable Input Focus when handling touch events for JS
https://bugs.webkit.org/show_bug.cgi?id=106109

Reviewed by Yong Li.

PR 273325.

Toggle input mode active when a touch event is
received for JS processing to ensure state
is updated even when event is consumed.

Reviewed Internally by Gen Mak.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::touchEvent):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (138836 => 138837)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-04 20:42:37 UTC (rev 138836)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-04 20:43:39 UTC (rev 138837)
@@ -4039,6 +4039,9 @@
 if (d-m_page-defersLoading())
 return false;
 
+if (d-m_inputHandler)
+d-m_inputHandler-setInputModeEnabled();
+
 PluginView* pluginView = d-m_fullScreenPluginView.get();
 if (pluginView)
 return d-dispatchTouchEventToFullScreenPlugin(pluginView, event);


Modified: trunk/Source/WebKit/blackberry/ChangeLog (138836 => 138837)

--- trunk/Source/WebKit/blackberry/ChangeLog	2013-01-04 20:42:37 UTC (rev 138836)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-01-04 20:43:39 UTC (rev 138837)
@@ -1,3 +1,21 @@
+2013-01-04  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Enable Input Focus when handling touch events for JS
+https://bugs.webkit.org/show_bug.cgi?id=106109
+
+Reviewed by Yong Li.
+
+PR 273325.
+
+Toggle input mode active when a touch event is
+received for JS processing to ensure state
+is updated even when event is consumed.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPage::touchEvent):
+
 2013-01-04  Adam Klein  ad...@chromium.org
 
 Remove ENABLE_MUTATION_OBSERVERS #define






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [137931] trunk/Source/WebKit/blackberry

2012-12-17 Thread mifenton

Title: [137931] trunk/Source/WebKit/blackberry








Revision 137931
Author mifen...@rim.com
Date 2012-12-17 12:30:03 -0800 (Mon, 17 Dec 2012)


Log Message
[BlackBerry] Improve DOMSupport visibleSelectionForClosestActualWordStart for content editable.
https://bugs.webkit.org/show_bug.cgi?id=105198

Reviewed by Rob Buis.

PR 258038.

Improve closest word matching by giving preference to the left when
distances are equal.

Also enforce container matching to avoid selecting the paragraph
marker if a CE div is followed immediately by a CE paragraph.

Minor refactor - don't calculate the distance if the selection
isn't on a word.

Reviewed Internally by Gen Mak and Nima Ghanavatian.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::visibleSelectionForClosestActualWordStart):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (137930 => 137931)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-12-17 20:07:57 UTC (rev 137930)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-12-17 20:30:03 UTC (rev 137931)
@@ -1,3 +1,26 @@
+2012-12-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Improve DOMSupport visibleSelectionForClosestActualWordStart for content editable.
+https://bugs.webkit.org/show_bug.cgi?id=105198
+
+Reviewed by Rob Buis.
+
+PR 258038.
+
+Improve closest word matching by giving preference to the left when
+distances are equal.
+
+Also enforce container matching to avoid selecting the paragraph
+marker if a CE div is followed immediately by a CE paragraph.
+
+Minor refactor - don't calculate the distance if the selection
+isn't on a word.
+
+Reviewed Internally by Gen Mak and Nima Ghanavatian.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::visibleSelectionForClosestActualWordStart):
+
 2012-12-17  Jakob Petsovits  jpetsov...@rim.com
 
 [BlackBerry] Clean up log output in WebKit/blackberry.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (137930 => 137931)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-12-17 20:07:57 UTC (rev 137930)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-12-17 20:30:03 UTC (rev 137931)
@@ -467,24 +467,30 @@
 // it selects the paragraph marker. As well, if the position is at the end of a word, it will select
 // only the space between words. We want to select an actual word so we move the selection to
 // the start of the leftmost word if the character after the selection point is whitespace.
+
 if (selection.selectionType() != VisibleSelection::RangeSelection) {
+int leftDistance = 0;
+int rightDistance = 0;
+
 VisibleSelection leftSelection(previousWordPosition(selection.start()));
-bool leftSelectionIsOnWord = !isWhitespace(leftSelection.visibleStart().characterAfter());
+bool leftSelectionIsOnWord = !isWhitespace(leftSelection.visibleStart().characterAfter())  leftSelection.start().containerNode() == selection.start().containerNode();
+if (leftSelectionIsOnWord) {
+VisibleSelection rangeSelection(endOfWord(leftSelection.start()), selection.visibleStart());
+leftDistance = TextIterator::rangeLength(rangeSelection.toNormalizedRange().get());
+}
 
-VisibleSelection rangeSelection(endOfWord(leftSelection.start()), selection.visibleStart());
-int leftDistance = TextIterator::rangeLength(rangeSelection.toNormalizedRange().get());
-
 VisibleSelection rightSelection = previousWordPosition(nextWordPosition(selection.start()));
-bool rightSelectionIsOnWord = !isWhitespace(rightSelection.visibleStart().characterAfter());
+bool rightSelectionIsOnWord = !isWhitespace(rightSelection.visibleStart().characterAfter())  rightSelection.start().containerNode() == selection.start().containerNode();
+if (rightSelectionIsOnWord) {
+VisibleSelection rangeSelection = VisibleSelection(rightSelection.visibleStart(), selection.visibleStart());
+rightDistance = TextIterator::rangeLength(rangeSelection.toNormalizedRange().get());
+}
 
-rangeSelection = VisibleSelection(rightSelection.visibleStart(), selection.visibleStart());
-int rightDistance = TextIterator::rangeLength(rangeSelection.toNormalizedRange().get());
-
 // Make sure we found an actual word. If not, return the original selection.
 if (!leftSelectionIsOnWord  !rightSelectionIsOnWord)
 return selection;
 
-if (!rightSelectionIsOnWord || (leftSelectionIsOnWord  leftDistance  rightDistance)) {
+if (!rightSelectionIsOnWord || (leftSelectionIsOnWord  leftDistance = rightDistance)) {
 // Left is closer or right is invalid.
 return leftSelection;

[webkit-changes] [137513] trunk/Source/WebKit/blackberry

2012-12-12 Thread mifenton

Title: [137513] trunk/Source/WebKit/blackberry








Revision 137513
Author mifen...@rim.com
Date 2012-12-12 13:51:21 -0800 (Wed, 12 Dec 2012)


Log Message
[BlackBerry] Fix word matching algorithm to account for adjacent divs with no whitespace between them.
https://bugs.webkit.org/show_bug.cgi?id=104837

Reviewed by Rob Buis.

PR 258038.

Fix selection at the end of content editable text block.

The next character may be in the next block bypassing the distance
comparison logic we have, remove the check for next character being
whitespace

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::visibleSelectionForClosestActualWordStart):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (137512 => 137513)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-12-12 21:50:51 UTC (rev 137512)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-12-12 21:51:21 UTC (rev 137513)
@@ -1,3 +1,23 @@
+2012-12-12  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Fix word matching algorithm to account for adjacent divs with no whitespace between them.
+https://bugs.webkit.org/show_bug.cgi?id=104837
+
+Reviewed by Rob Buis.
+
+PR 258038.
+
+Fix selection at the end of content editable text block.
+
+The next character may be in the next block bypassing the distance
+comparison logic we have, remove the check for next character being
+whitespace
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::visibleSelectionForClosestActualWordStart):
+
 2012-12-12  Alexey Proskuryakov  a...@apple.com
 
 Make LOG() work in WebProcess and NetworkProcess


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (137512 => 137513)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-12-12 21:50:51 UTC (rev 137512)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-12-12 21:51:21 UTC (rev 137513)
@@ -467,15 +467,14 @@
 // it selects the paragraph marker. As well, if the position is at the end of a word, it will select
 // only the space between words. We want to select an actual word so we move the selection to
 // the start of the leftmost word if the character after the selection point is whitespace.
-if (selection.selectionType() != VisibleSelection::RangeSelection  isWhitespace(selection.visibleStart().characterAfter())) {
+if (selection.selectionType() != VisibleSelection::RangeSelection) {
 VisibleSelection leftSelection(previousWordPosition(selection.start()));
 bool leftSelectionIsOnWord = !isWhitespace(leftSelection.visibleStart().characterAfter());
 
 VisibleSelection rangeSelection(endOfWord(leftSelection.start()), selection.visibleStart());
 int leftDistance = TextIterator::rangeLength(rangeSelection.toNormalizedRange().get());
 
-VisibleSelection rightSelection(nextWordPosition(selection.start()));
-rightSelection = previousWordPosition(rightSelection.start());
+VisibleSelection rightSelection = previousWordPosition(nextWordPosition(selection.start()));
 bool rightSelectionIsOnWord = !isWhitespace(rightSelection.visibleStart().characterAfter());
 
 rangeSelection = VisibleSelection(rightSelection.visibleStart(), selection.visibleStart());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [137046] trunk/Source/WebKit/blackberry

2012-12-08 Thread mifenton

Title: [137046] trunk/Source/WebKit/blackberry








Revision 137046
Author mifen...@rim.com
Date 2012-12-08 12:34:52 -0800 (Sat, 08 Dec 2012)


Log Message
[BlackBerry] Enforce selection of last work when triggering caret based selection
https://bugs.webkit.org/show_bug.cgi?id=104447

Reviewed by Rob Buis.

PR 249225.

When the selection has reached the end of an input field,
ensure the last word is selected by adjusting the caret.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::isCaretAtEndOfText):
(WebKit):
* WebKitSupport/InputHandler.h:
(InputHandler):
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectObject):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (137045 => 137046)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-12-08 20:03:42 UTC (rev 137045)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-12-08 20:34:52 UTC (rev 137046)
@@ -1,3 +1,25 @@
+2012-12-08  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Enforce selection of last work when triggering caret based selection
+https://bugs.webkit.org/show_bug.cgi?id=104447
+
+Reviewed by Rob Buis.
+
+PR 249225.
+
+When the selection has reached the end of an input field,
+ensure the last word is selected by adjusting the caret.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::isCaretAtEndOfText):
+(WebKit):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::selectObject):
+
 2012-12-08  Chris Hutten-Czapski  chut...@rim.com
 
 [BlackBerry] Remove about:credits


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (137045 => 137046)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-12-08 20:03:42 UTC (rev 137045)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-12-08 20:34:52 UTC (rev 137046)
@@ -1864,6 +1864,11 @@
 return true;
 }
 
+bool InputHandler::isCaretAtEndOfText()
+{
+return caretPosition() == elementText().length();
+}
+
 int InputHandler::caretPosition() const
 {
 if (!isActiveTextEdit())


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (137045 => 137046)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-12-08 20:03:42 UTC (rev 137045)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-12-08 20:34:52 UTC (rev 137046)
@@ -121,6 +121,8 @@
 
 WebCore::IntRect boundingBoxForInputField();
 
+bool isCaretAtEndOfText();
+
 // IMF driven calls.
 bool setBatchEditingActive(bool);
 bool setSelection(int start, int end, bool changeIsPartOfComposition = false);


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (137045 => 137046)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-12-08 20:03:42 UTC (rev 137045)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-12-08 20:34:52 UTC (rev 137046)
@@ -654,9 +654,16 @@
 
 SelectionLog(LogLevelInfo, SelectionHandler::selectObject using current selection);
 
+ASSERT(focusedFrame-selection()-selectionType() != VisibleSelection::NoSelection);
+
 // Use the current selection as the selection point.
-ASSERT(focusedFrame-selection()-selectionType() != VisibleSelection::NoSelection);
-m_selectionActive = expandSelectionToGranularity(focusedFrame, focusedFrame-selection()-selection(), granularity, true /* isInputMode */);
+VisibleSelection selectionOrigin = focusedFrame-selection()-selection();
+
+// If this is the end of the input field, make sure we select the last word.
+if (m_webPage-m_inputHandler-isCaretAtEndOfText())
+selectionOrigin = previousWordPosition(selectionOrigin.start());
+
+m_selectionActive = expandSelectionToGranularity(focusedFrame, selectionOrigin, granularity, true /* isInputMode */);
 }
 
 void SelectionHandler::selectObject(Node* node)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [136512] trunk/Source/WebKit/blackberry

2012-12-04 Thread mifenton

Title: [136512] trunk/Source/WebKit/blackberry








Revision 136512
Author mifen...@rim.com
Date 2012-12-04 08:53:42 -0800 (Tue, 04 Dec 2012)


Log Message
[BlackBerry] Remove assert and fix conditional for out of bounds requests in InputHandler::spannableTextInRange
https://bugs.webkit.org/show_bug.cgi?id=104001

Reviewed by Rob Buis.

PR 257723.

Remove assert and update early return to allow out of bounds
request at end of field.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::spannableTextInRange):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (136511 => 136512)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-12-04 16:52:01 UTC (rev 136511)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-12-04 16:53:42 UTC (rev 136512)
@@ -1,3 +1,20 @@
+2012-12-04  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove assert and fix conditional for out of bounds requests in InputHandler::spannableTextInRange
+https://bugs.webkit.org/show_bug.cgi?id=104001
+
+Reviewed by Rob Buis.
+
+PR 257723.
+
+Remove assert and update early return to allow out of bounds
+request at end of field.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::spannableTextInRange):
+
 2012-12-04  Jakob Petsovits  jpetsov...@rim.com
 
 [BlackBerry] Store rendered regions in pixel contents coordinates.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (136511 => 136512)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-12-04 16:52:01 UTC (rev 136511)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-12-04 16:53:42 UTC (rev 136512)
@@ -1925,10 +1925,9 @@
 if (!isActiveTextEdit())
 return 0;
 
-if (start == end)
+if (start = end)
 return 0;
 
-ASSERT(end  start);
 int length = end - start;
 
 WTF::String textString = elementText().substring(start, length);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [135554] trunk/Source/WebKit/blackberry

2012-11-22 Thread mifenton

Title: [135554] trunk/Source/WebKit/blackberry








Revision 135554
Author mifen...@rim.com
Date 2012-11-22 19:31:38 -0800 (Thu, 22 Nov 2012)


Log Message
[BlackBerry] Guard against a lost focusedNode that input handler isn't yet informed of.
https://bugs.webkit.org/show_bug.cgi?id=103071

Reviewed by Rob Buis.

Fix potential for a crash if input mode is active but
we can't get a focusedNode.

Reviewed Internally by Gen Mak.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (135553 => 135554)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-23 02:54:10 UTC (rev 135553)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-23 03:31:38 UTC (rev 135554)
@@ -1,3 +1,18 @@
+2012-11-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Guard against a lost focusedNode that input handler isn't yet informed of.
+https://bugs.webkit.org/show_bug.cgi?id=103071
+
+Reviewed by Rob Buis.
+
+Fix potential for a crash if input mode is active but
+we can't get a focusedNode.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+
 2012-11-21  Genevieve Mak  g...@rim.com
 
 [BlackBerry] Drop Synchronous Mouse Events


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (135553 => 135554)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-23 02:54:10 UTC (rev 135553)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-23 03:31:38 UTC (rev 135554)
@@ -234,7 +234,7 @@
 
 void SelectionHandler::setCaretPosition(const WebCore::IntPoint position)
 {
-if (!m_webPage-m_inputHandler-isInputMode())
+if (!m_webPage-m_inputHandler-isInputMode() || !m_webPage-focusedOrMainFrame()-document()-focusedNode())
 return;
 
 m_caretActive = true;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [135422] trunk/Source/WebKit/blackberry

2012-11-21 Thread mifenton

Title: [135422] trunk/Source/WebKit/blackberry








Revision 135422
Author mifen...@rim.com
Date 2012-11-21 11:52:47 -0800 (Wed, 21 Nov 2012)


Log Message
[BlackBerry] Switch to point instead of VisiblePosition comparison for input bounds check
https://bugs.webkit.org/show_bug.cgi?id=102962

Reviewed by Rob Buis.

PR 247270.

Switch from using VisiblePosition to determine if we are in a node
to a comparison of the field bounds.  This fixes the case where
there is no node before the target node to match.

Reviewed Internally by Gen Mak.

* WebKitSupport/DOMSupport.cpp:
* WebKitSupport/DOMSupport.h:
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (135421 => 135422)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-21 19:05:17 UTC (rev 135421)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-21 19:52:47 UTC (rev 135422)
@@ -1,3 +1,23 @@
+2012-11-21  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Switch to point instead of VisiblePosition comparison for input bounds check
+https://bugs.webkit.org/show_bug.cgi?id=102962
+
+Reviewed by Rob Buis.
+
+PR 247270.
+
+Switch from using VisiblePosition to determine if we are in a node
+to a comparison of the field bounds.  This fixes the case where
+there is no node before the target node to match.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/DOMSupport.cpp:
+* WebKitSupport/DOMSupport.h:
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+
 2012-11-20  Andrew Lo  a...@rim.com
 
 [BlackBerry] Animated gifs pause on scroll or zoom and sometimes don't resume after scroll or zoom completes


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (135421 => 135422)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-11-21 19:05:17 UTC (rev 135421)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-11-21 19:52:47 UTC (rev 135422)
@@ -314,34 +314,6 @@
 return VisibleSelection(visibleStart, visibleEnd);
 }
 
-Node* DOMContainerNodeForPosition(const Position position)
-{
-Node* nodeAtPos = position.containerNode();
-if (nodeAtPos  nodeAtPos-isInShadowTree())
-nodeAtPos = nodeAtPos-shadowAncestorNode();
-
-return nodeAtPos;
-}
-
-bool isPositionInNode(Node* node, const Position position)
-{
-if (!node)
-return false;
-
-Node* domNodeAtPos = DOMContainerNodeForPosition(position);
-if (!domNodeAtPos)
-return false;
-
-int offset = 0;
-if (domNodeAtPos == position.containerNode())
-offset = position.computeOffsetInContainerNode();
-
-RefPtrRange rangeForNode = rangeOfContents(node);
-int ec;
-
-return rangeForNode-isPointInRange(domNodeAtPos, offset, ec);
-}
-
 static bool matchesReservedStringEmail(const AtomicString string)
 {
 return string.contains(email, false /* caseSensitive */);


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h (135421 => 135422)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-11-21 19:05:17 UTC (rev 135421)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-11-21 19:52:47 UTC (rev 135422)
@@ -76,9 +76,6 @@
 WebCore::VisibleSelection visibleSelectionForRangeInputElement(WebCore::Element*, int start, int end);
 WebCore::VisibleSelection visibleSelectionForInputElement(WebCore::Element*);
 
-WebCore::Node* DOMContainerNodeForPosition(const WebCore::Position);
-bool isPositionInNode(WebCore::Node*, const WebCore::Position);
-
 bool elementIdOrNameIndicatesNoAutocomplete(const WebCore::Element*);
 bool elementIdOrNameIndicatesEmail(const WebCore::HTMLInputElement*);
 bool elementIdOrNameIndicatesUrl(const WebCore::HTMLInputElement*);


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (135421 => 135422)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-21 19:05:17 UTC (rev 135421)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-21 19:52:47 UTC (rev 135422)
@@ -253,14 +253,17 @@
 
 VisiblePosition visibleCaretPosition(focusedFrame-visiblePositionForPoint(relativePoint));
 
-if (!DOMSupport::isPositionInNode(m_webPage-focusedOrMainFrame()-document()-focusedNode(), visibleCaretPosition.deepEquivalent())) {
-if (unsigned short character = directionOfPointRelativeToRect(relativePoint, currentCaretRect))
-m_webPage-m_inputHandler-handleKeyboardInput(Platform::KeyboardEvent(character));
+if (RenderObject* focusedRenderer =

[webkit-changes] [134957] trunk/Source/WebKit/blackberry

2012-11-16 Thread mifenton

Title: [134957] trunk/Source/WebKit/blackberry








Revision 134957
Author mifen...@rim.com
Date 2012-11-16 08:57:45 -0800 (Fri, 16 Nov 2012)


Log Message
[BlackBerry] Use proper keycode value for space instead of hardcoded value.
https://bugs.webkit.org/show_bug.cgi?id=102518

Reviewed by Rob Buis.

Remove hard coded value for space.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::setText):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (134956 => 134957)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-16 16:56:47 UTC (rev 134956)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-16 16:57:45 UTC (rev 134957)
@@ -1,3 +1,17 @@
+2012-11-16  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Use proper keycode value for space instead of hardcoded value.
+https://bugs.webkit.org/show_bug.cgi?id=102518
+
+Reviewed by Rob Buis.
+
+Remove hard coded value for space.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::setText):
+
 2012-11-15  Andrew Lo  a...@rim.com
 
 [BlackBerry] Animate changes to viewport due to input focus changes.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (134956 => 134957)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-16 16:56:47 UTC (rev 134956)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-16 16:57:45 UTC (rev 134957)
@@ -2205,7 +2205,7 @@
 // Remove it and apply it as a keypress later.
 // Upstream Webkit bug created https://bugs.webkit.org/show_bug.cgi?id=70823
 bool requiresSpaceKeyPress = false;
-if (textLength  0  textToInsert[textLength - 1] == 32 /* space */) {
+if (textLength  0  textToInsert[textLength - 1] == KEYCODE_SPACE) {
 requiresSpaceKeyPress = true;
 textLength--;
 textToInsert.remove(textLength, 1);
@@ -2227,7 +2227,7 @@
 }
 
 if (requiresSpaceKeyPress)
-handleKeyboardInput(Platform::KeyboardEvent(32 /* space */, Platform::KeyboardEvent::KeyDown, 0), true /* changeIsPartOfComposition */);
+handleKeyboardInput(Platform::KeyboardEvent(KEYCODE_SPACE, Platform::KeyboardEvent::KeyDown, 0), true /* changeIsPartOfComposition */);
 
 InputLog(LogLevelInfo, InputHandler::setText Request being processed. Text after processing '%s', elementText().latin1().data());
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [134795] trunk/Source/WebKit/blackberry

2012-11-15 Thread mifenton

Title: [134795] trunk/Source/WebKit/blackberry








Revision 134795
Author mifen...@rim.com
Date 2012-11-15 10:40:35 -0800 (Thu, 15 Nov 2012)


Log Message
[BlackBerry] Don't restore zoom and scroll when leaving an input field.
https://bugs.webkit.org/show_bug.cgi?id=102376

Reviewed by Yong Li.

Restoring the zoom causes undesirable behavior when switching between fields.

Reviewed Internally by Andrew Lo.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::InputHandler):
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (134794 => 134795)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-15 18:33:31 UTC (rev 134794)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-15 18:40:35 UTC (rev 134795)
@@ -1,3 +1,20 @@
+2012-11-15  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Don't restore zoom and scroll when leaving an input field.
+https://bugs.webkit.org/show_bug.cgi?id=102376
+
+Reviewed by Yong Li.
+
+Restoring the zoom causes undesirable behavior when switching between fields.
+
+Reviewed Internally by Andrew Lo.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::InputHandler):
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2012-11-15  Jakob Petsovits  jpetsov...@rim.com
 
 [BlackBerry] Fix suspend/resume assertion in setCompositor().


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (134794 => 134795)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-15 18:33:31 UTC (rev 134794)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-15 18:40:35 UTC (rev 134795)
@@ -139,7 +139,6 @@
 , m_delayKeyboardVisibilityChange(false)
 , m_request(0)
 , m_processingTransactionId(-1)
-, m_focusZoomScale(0.0)
 , m_receivedBackspaceKeyDown(false)
 , m_expectedKeyUpChar(0)
 {
@@ -1116,17 +1115,6 @@
 break;
 }
 case VisibleSelection::NoSelection:
-if (m_focusZoomScale) {
-m_webPage-zoomAboutPoint(m_focusZoomScale, selectionFocusRect.location());
-InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible resetting zoom to %f, m_focusZoomScale);
-m_focusZoomScale = 0.0;
-}
-
-if (m_focusScrollLocation != WebCore::IntPoint(-1, -1)) {
-mainFrameView-setScrollPosition(m_focusScrollLocation);
-InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible resetting scroll to %d, %d, m_focusScrollLocation.x(), m_focusScrollLocation.y());
-m_focusScrollLocation = WebCore::IntPoint(-1, -1);
-}
 return;
 }
 
@@ -1134,17 +1122,11 @@
 
 m_webPage-suspendBackingStore();
 
-WebCore::IntPoint sourceScrollPosition = mainFrameView-scrollPosition();
-
 // If the text is too small, zoom in to make it a minimum size.
 // The minimum size being defined as 3 mm is a good value based on my observations.
 static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
 
 if (m_webPage-isUserScalable()  fontHeight  fontHeight * m_webPage-currentScale()  s_minimumTextHeightInPixels  !isRunningDrt()) {
-if (!m_focusZoomScale) {
-m_focusZoomScale = m_webPage-currentScale();
-m_focusScrollLocation = sourceScrollPosition;
-}
 double zoomScaleRequired = static_castdouble(s_minimumTextHeightInPixels) / fontHeight;
 m_webPage-zoomAboutPoint(zoomScaleRequired, selectionFocusRect.location());
 InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible zooming in to %f at point %d, %d, zoomScaleRequired, selectionFocusRect.location().x(), selectionFocusRect.location().y());
@@ -1216,8 +1198,6 @@
 WebCore::IntPoint maximumScrollPosition = WebCore::IntPoint(mainFrameView-contentsWidth() - actualScreenRect.width(), mainFrameView-contentsHeight() - actualScreenRect.height());
 scrollLocation = scrollLocation.shrunkTo(maximumScrollPosition);
 if (scrollLocation != mainFrameView-scrollPosition()) {
-if (m_focusScrollLocation == WebCore::IntPoint(-1, -1))
-m_focusScrollLocation = sourceScrollPosition;
 mainFrameView-setScrollPosition(scrollLocation);
 mainFrameView-setConstrainsScrollingToContentEdge(true);
 InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible scrolling to point %d, %d, scrollLocation.x(), scrollLocation.y());


Modified:

[webkit-changes] [134437] trunk/Source/WebKit/blackberry

2012-11-13 Thread mifenton

Title: [134437] trunk/Source/WebKit/blackberry








Revision 134437
Author mifen...@rim.com
Date 2012-11-13 10:23:59 -0800 (Tue, 13 Nov 2012)


Log Message
[BlackBerry] Fully restore both zoom and scroll when leaving an input field.
https://bugs.webkit.org/show_bug.cgi?id=102094

Reviewed by Rob Buis.

PR 234187.

Cache both the zoom and scroll position prior to adjusting
for input focus so that state can be reset fully.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (134436 => 134437)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-13 18:19:00 UTC (rev 134436)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-13 18:23:59 UTC (rev 134437)
@@ -1,3 +1,22 @@
+2012-11-13  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Fully restore both zoom and scroll when leaving an input field.
+https://bugs.webkit.org/show_bug.cgi?id=102094
+
+Reviewed by Rob Buis.
+
+PR 234187.
+
+Cache both the zoom and scroll position prior to adjusting
+for input focus so that state can be reset fully.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2012-11-12  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Ensure we only receive one KeyUp per key event


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (134436 => 134437)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-13 18:19:00 UTC (rev 134436)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-11-13 18:23:59 UTC (rev 134437)
@@ -1099,10 +1099,16 @@
 }
 case VisibleSelection::NoSelection:
 if (m_focusZoomScale) {
-m_webPage-zoomAboutPoint(m_focusZoomScale, m_focusZoomLocation);
+m_webPage-zoomAboutPoint(m_focusZoomScale, selectionFocusRect.location());
+InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible resetting zoom to %f, m_focusZoomScale);
 m_focusZoomScale = 0.0;
-m_focusZoomLocation = WebCore::IntPoint();
 }
+
+if (m_focusScrollLocation != WebCore::IntPoint(-1, -1)) {
+mainFrameView-setScrollPosition(m_focusScrollLocation);
+InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible resetting scroll to %d, %d, m_focusScrollLocation.x(), m_focusScrollLocation.y());
+m_focusScrollLocation = WebCore::IntPoint(-1, -1);
+}
 return;
 }
 
@@ -1110,6 +1116,8 @@
 
 m_webPage-suspendBackingStore();
 
+WebCore::IntPoint sourceScrollPosition = mainFrameView-scrollPosition();
+
 // If the text is too small, zoom in to make it a minimum size.
 // The minimum size being defined as 3 mm is a good value based on my observations.
 static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
@@ -1117,14 +1125,11 @@
 if (m_webPage-isUserScalable()  fontHeight  fontHeight * m_webPage-currentScale()  s_minimumTextHeightInPixels  !isRunningDrt()) {
 if (!m_focusZoomScale) {
 m_focusZoomScale = m_webPage-currentScale();
-m_focusZoomLocation = selectionFocusRect.location();
+m_focusScrollLocation = sourceScrollPosition;
 }
 double zoomScaleRequired = static_castdouble(s_minimumTextHeightInPixels) / fontHeight;
-m_webPage-zoomAboutPoint(zoomScaleRequired, m_focusZoomLocation);
-InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible zooming in to %f at point %d, %d, zoomScaleRequired, m_focusZoomLocation.x(), m_focusZoomLocation.y());
-} else {
-m_focusZoomScale = 0.0;
-m_focusZoomLocation = WebCore::IntPoint();
+m_webPage-zoomAboutPoint(zoomScaleRequired, selectionFocusRect.location());
+InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible zooming in to %f at point %d, %d, zoomScaleRequired, selectionFocusRect.location().x(), selectionFocusRect.location().y());
 }
 
 if (elementFrame != mainFrame) { // Element is in a subframe.
@@ -1192,9 +1197,13 @@
 scrollLocation.clampNegativeToZero();
 WebCore::IntPoint maximumScrollPosition = WebCore::IntPoint(mainFrameView-contentsWidth() - actualScreenRect.width(), mainFrameView-contentsHeight() - actualScreenRect.height());
 scrollLocation = scrollLocation.shrunkTo(maximumScrollPosition);
-mainFrameView-setScrollPosition(scrollLocation);
-

[webkit-changes] [132083] trunk/Source/WebKit/blackberry

2012-10-22 Thread mifenton

Title: [132083] trunk/Source/WebKit/blackberry








Revision 132083
Author mifen...@rim.com
Date 2012-10-22 09:49:48 -0700 (Mon, 22 Oct 2012)


Log Message
[BlackBerry] Remove specialized handling for isIndex fields.
https://bugs.webkit.org/show_bug.cgi?id=14

Reviewed by Rob Buis.

PR 214342.

Remove special handling for isIndex field as the tag
is rewritten.

Reviewed Internally by Yongxin Dai and Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::inputStyle):
(BlackBerry::WebKit::InputHandler::elementType):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (132082 => 132083)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-22 16:48:18 UTC (rev 132082)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-22 16:49:48 UTC (rev 132083)
@@ -1,3 +1,21 @@
+2012-10-22  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove specialized handling for isIndex fields.
+https://bugs.webkit.org/show_bug.cgi?id=14
+
+Reviewed by Rob Buis.
+
+PR 214342.
+
+Remove special handling for isIndex field as the tag
+is rewritten.
+
+Reviewed Internally by Yongxin Dai and Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::inputStyle):
+(BlackBerry::WebKit::InputHandler::elementType):
+
 2012-10-22  Jocelyn Turcotte  jocelyn.turco...@digia.com
 
 [Qt] Fix ASSERTION FAILED: !document-inPageCache() when loading a page


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (132082 => 132083)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-22 16:48:18 UTC (rev 132082)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-22 16:49:48 UTC (rev 132083)
@@ -229,7 +229,6 @@
 // with autocorrect disabled explicitly. Only enable predictions.
 return NO_AUTO_TEXT | NO_AUTO_CORRECTION;
 }
-case InputTypeIsIndex:
 case InputTypePassword:
 case InputTypeNumber:
 case InputTypeTelephone:
@@ -394,12 +393,6 @@
 
 BlackBerryInputType InputHandler::elementType(Element* element) const
 {
-// isIndex is bundled with input so we need to check the formControlName
-// first to differentiate it from input which is essentially the same as
-// isIndex has been deprecated.
-if (element-formControlName() == HTMLNames::isindexTag)
-return InputTypeIsIndex;
-
 if (const HTMLInputElement* inputElement = static_castconst HTMLInputElement*(element-toInputElement()))
 return convertInputType(inputElement);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [131912] trunk/Source/WebKit/blackberry

2012-10-19 Thread mifenton

Title: [131912] trunk/Source/WebKit/blackberry








Revision 131912
Author mifen...@rim.com
Date 2012-10-19 10:08:28 -0700 (Fri, 19 Oct 2012)


Log Message
[BlackBerry] Don't attempt to auto scroll on input for Fixed Position elements.
https://bugs.webkit.org/show_bug.cgi?id=99833

Reviewed by Antonio Gomes.

PR 195024.

Don't attempt to scroll fixed position elements.

Reviewed Internally by Arvid Nilsson.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::isFixedPositionOrHasFixedPositionAncestor):
(DOMSupport):
* WebKitSupport/DOMSupport.h:
(WebCore):
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (131911 => 131912)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 17:08:10 UTC (rev 131911)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 17:08:28 UTC (rev 131912)
@@ -1,3 +1,24 @@
+2012-10-19  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Don't attempt to auto scroll on input for Fixed Position elements.
+https://bugs.webkit.org/show_bug.cgi?id=99833
+
+Reviewed by Antonio Gomes.
+
+PR 195024.
+
+Don't attempt to scroll fixed position elements.
+
+Reviewed Internally by Arvid Nilsson.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::isFixedPositionOrHasFixedPositionAncestor):
+(DOMSupport):
+* WebKitSupport/DOMSupport.h:
+(WebCore):
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-10-18  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] Page viewport aspect ratio not kept on navigating back


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (131911 => 131912)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-10-19 17:08:10 UTC (rev 131911)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-10-19 17:08:28 UTC (rev 131912)
@@ -563,6 +563,20 @@
 return false;
 }
 
+bool isFixedPositionOrHasFixedPositionAncestor(RenderObject* renderer)
+{
+RenderObject* currentRenderer = renderer;
+while (currentRenderer) {
+
+if (currentRenderer-isOutOfFlowPositioned()  currentRenderer-style()-position() == FixedPosition)
+return true;
+
+currentRenderer = currentRenderer-parent();
+}
+
+return false;
+}
+
 } // DOMSupport
 } // WebKit
 } // BlackBerry


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h (131911 => 131912)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-10-19 17:08:10 UTC (rev 131911)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-10-19 17:08:28 UTC (rev 131912)
@@ -38,6 +38,7 @@
 class Position;
 class QualifiedName;
 class Range;
+class RenderObject;
 class VisiblePosition;
 class VisibleSelection;
 }
@@ -96,6 +97,8 @@
 PassRefPtrWebCore::Range trimWhitespaceFromRange(WebCore::VisiblePosition startPosition, WebCore::VisiblePosition endPosition);
 bool isEmptyRangeOrAllSpaces(WebCore::VisiblePosition, WebCore::VisiblePosition);
 
+bool isFixedPositionOrHasFixedPositionAncestor(WebCore::RenderObject*);
+
 } // DOMSupport
 } // WebKit
 } // BlackBerry


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131911 => 131912)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 17:08:10 UTC (rev 131911)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 17:08:28 UTC (rev 131912)
@@ -1036,6 +1036,10 @@
 if (!(Platform::Settings::instance()-allowedScrollAdjustmentForInputFields()  scrollType))
 return;
 
+// Fixed position elements cannot be scrolled into view.
+if (DOMSupport::isFixedPositionOrHasFixedPositionAncestor(m_currentFocusElement-renderer()))
+return;
+
 Frame* elementFrame = m_currentFocusElement-document()-frame();
 if (!elementFrame)
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [131918] trunk/Source/WebKit/blackberry

2012-10-19 Thread mifenton

Title: [131918] trunk/Source/WebKit/blackberry








Revision 131918
Author mifen...@rim.com
Date 2012-10-19 10:36:06 -0700 (Fri, 19 Oct 2012)


Log Message
[BlackBerry] Add input logs to InputHandler::ensureFocusTextElementVisible.
https://bugs.webkit.org/show_bug.cgi?id=99837

Reviewed by Antonio Gomes.

Add input logs for InputHandler::ensureFocusTextElementVisible.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (131917 => 131918)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 17:26:10 UTC (rev 131917)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 17:36:06 UTC (rev 131918)
@@ -1,3 +1,17 @@
+2012-10-19  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add input logs to InputHandler::ensureFocusTextElementVisible.
+https://bugs.webkit.org/show_bug.cgi?id=99837
+
+Reviewed by Antonio Gomes.
+
+Add input logs for InputHandler::ensureFocusTextElementVisible.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-10-19  Andrew Lo  a...@rim.com
 
 [BlackBerry] Should suspend AnimationController when WebPage becomes invisible.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131917 => 131918)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 17:26:10 UTC (rev 131917)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 17:36:06 UTC (rev 131918)
@@ -1088,7 +1088,9 @@
 m_focusZoomScale = m_webPage-currentScale();
 m_focusZoomLocation = selectionFocusRect.location();
 }
-m_webPage-zoomAboutPoint(s_minimumTextHeightInPixels / fontHeight, m_focusZoomLocation);
+double zoomScaleRequired = static_castdouble(s_minimumTextHeightInPixels) / fontHeight;
+m_webPage-zoomAboutPoint(zoomScaleRequired, m_focusZoomLocation);
+InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible zooming in to %f at point %d, %d, zoomScaleRequired, m_focusZoomLocation.x(), m_focusZoomLocation.y());
 } else {
 m_focusZoomScale = 0.0;
 m_focusZoomLocation = WebCore::IntPoint();
@@ -1161,6 +1163,7 @@
 scrollLocation = scrollLocation.shrunkTo(maximumScrollPosition);
 mainFrameView-setScrollPosition(scrollLocation);
 mainFrameView-setConstrainsScrollingToContentEdge(true);
+InputLog(LogLevelInfo, InputHandler::ensureFocusTextElementVisible scrolling to point %d, %d, scrollLocation.x(), scrollLocation.y());
 }
 }
 m_webPage-resumeBackingStore();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [131937] trunk/Source/WebKit/blackberry

2012-10-19 Thread mifenton

Title: [131937] trunk/Source/WebKit/blackberry








Revision 131937
Author mifen...@rim.com
Date 2012-10-19 13:09:02 -0700 (Fri, 19 Oct 2012)


Log Message
[BlackBerry] Move all keyboard type calculations into InputHandler.
https://bugs.webkit.org/show_bug.cgi?id=99847

Reviewed by Yong Li.

PR 227381.

Move all keyboard type calculations into webkit and avoid passing type
information to the webview.

Reviewed Internally by Nima Ghanavatian.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::convertInputTypeToVKBType):
(WebKit):
(BlackBerry::WebKit::InputHandler::setElementFocused):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (131936 => 131937)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-10-19 20:03:57 UTC (rev 131936)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-10-19 20:09:02 UTC (rev 131937)
@@ -139,7 +139,7 @@
 virtual void notifyContentRendered(const Platform::IntRect) = 0;
 virtual void resizeSurfaceIfNeeded() = 0;
 
-virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
+virtual void inputFocusGained(int inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
 virtual void inputFocusLost() = 0;
 virtual void inputTextChanged() = 0;
 virtual void inputSelectionChanged(unsigned selectionStart, unsigned selectionEnd) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (131936 => 131937)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 20:03:57 UTC (rev 131936)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 20:09:02 UTC (rev 131937)
@@ -1,3 +1,23 @@
+2012-10-19  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Move all keyboard type calculations into InputHandler.
+https://bugs.webkit.org/show_bug.cgi?id=99847
+
+Reviewed by Yong Li.
+
+PR 227381.
+
+Move all keyboard type calculations into webkit and avoid passing type
+information to the webview.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::convertInputTypeToVKBType):
+(WebKit):
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+
 2012-10-19  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] Page viewport aspect ratio not kept on navigating back


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131936 => 131937)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 20:03:57 UTC (rev 131936)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 20:09:02 UTC (rev 131937)
@@ -242,6 +242,26 @@
 return DEFAULT_STYLE;
 }
 
+static VirtualKeyboardType convertInputTypeToVKBType(BlackBerryInputType inputType)
+{
+switch (inputType) {
+case InputTypeURL:
+return VKBTypeUrl;
+case InputTypeEmail:
+return VKBTypeEmail;
+case InputTypeTelephone:
+return VKBTypePhone;
+case InputTypePassword:
+return VKBTypePassword;
+case InputTypeNumber:
+case InputTypeHexadecimal:
+return VKBTypePin;
+default:
+// All other types are text based use default keyboard.
+return VKBTypeDefault;
+}
+}
+
 static VirtualKeyboardType convertStringToKeyboardType(const AtomicString string)
 {
 DEFINE_STATIC_LOCAL(AtomicString, Default, (default));
@@ -812,6 +832,9 @@
 m_currentFocusElementTextEditMask = inputStyle(type, element);
 
 VirtualKeyboardType keyboardType = keyboardTypeAttribute(element);
+if (keyboardType == VKBTypeNotSet)
+keyboardType = convertInputTypeToVKBType(type);
+
 VirtualKeyboardEnterKeyType enterKeyType = keyboardEnterKeyTypeAttribute(element);
 
 if (enterKeyType == VKBEnterKeyNotSet  type != InputTypeTextArea) {
@@ -823,7 +846,7 @@
 }
 
 FocusLog(LogLevelInfo, InputHandler::setElementFocused, Type=%d, Style=%d, Keyboard Type=%d, Enter Key=%d, type, m_currentFocusElementTextEditMask, keyboardType, enterKeyType);
-m_webPage-m_client-inputFocusGained(type, m_currentFocusElementTextEditMask, keyboardType, enterKeyType);
+m_webPage-m_client-inputFocusGained(m_currentFocusElementTextEditMask, keyboardType, enterKeyType);
 
 handleInputLocaleChanged(m_webPage-m_webSettings-isWritingDirectionRTL());
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [131951] trunk/Source/WebKit/blackberry

2012-10-19 Thread mifenton

Title: [131951] trunk/Source/WebKit/blackberry








Revision 131951
Author mifen...@rim.com
Date 2012-10-19 15:25:14 -0700 (Fri, 19 Oct 2012)


Log Message
[BlackBerry] Convert input style to int64_t
https://bugs.webkit.org/show_bug.cgi?id=99848

Reviewed by Yong Li.

PR 227381.

Switch input style mask to int64_t to match the the updated definition.

Reviewed Internally by Nima Ghanavatian.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::inputStyle):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (131950 => 131951)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-10-19 22:24:08 UTC (rev 131950)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-10-19 22:25:14 UTC (rev 131951)
@@ -139,7 +139,7 @@
 virtual void notifyContentRendered(const Platform::IntRect) = 0;
 virtual void resizeSurfaceIfNeeded() = 0;
 
-virtual void inputFocusGained(int inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
+virtual void inputFocusGained(int64_t inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
 virtual void inputFocusLost() = 0;
 virtual void inputTextChanged() = 0;
 virtual void inputSelectionChanged(unsigned selectionStart, unsigned selectionEnd) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (131950 => 131951)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 22:24:08 UTC (rev 131950)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-19 22:25:14 UTC (rev 131951)
@@ -1,5 +1,24 @@
 2012-10-19  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Convert input style to int64_t
+https://bugs.webkit.org/show_bug.cgi?id=99848
+
+Reviewed by Yong Li.
+
+PR 227381.
+
+Switch input style mask to int64_t to match the the updated definition.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::inputStyle):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
+2012-10-19  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Move all keyboard type calculations into InputHandler.
 https://bugs.webkit.org/show_bug.cgi?id=99847
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131950 => 131951)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 22:24:08 UTC (rev 131950)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-19 22:25:14 UTC (rev 131951)
@@ -188,7 +188,7 @@
 return InputTypeText;
 }
 
-static int inputStyle(BlackBerryInputType type, const Element* element)
+static int64_t inputStyle(BlackBerryInputType type, const Element* element)
 {
 switch (type) {
 case InputTypeEmail:


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (131950 => 131951)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-10-19 22:24:08 UTC (rev 131950)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-10-19 22:25:14 UTC (rev 131951)
@@ -212,7 +212,7 @@
 bool m_changingFocus;
 
 FocusElementType m_currentFocusElementType;
-int m_currentFocusElementTextEditMask;
+int64_t m_currentFocusElementTextEditMask;
 
 int m_composingTextStart;
 int m_composingTextEnd;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [131622] trunk/Source/WebKit/blackberry

2012-10-17 Thread mifenton

Title: [131622] trunk/Source/WebKit/blackberry








Revision 131622
Author mifen...@rim.com
Date 2012-10-17 10:55:30 -0700 (Wed, 17 Oct 2012)


Log Message
[BlackBerry] Prevent focus zoom on non-userscalable pages.
https://bugs.webkit.org/show_bug.cgi?id=99608

Reviewed by Rob Buis.

PR 222378.

Disable focus zoom when the page is non-user scalable.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (131621 => 131622)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-17 17:50:40 UTC (rev 131621)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-17 17:55:30 UTC (rev 131622)
@@ -1,3 +1,19 @@
+2012-10-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Prevent focus zoom on non-userscalable pages.
+https://bugs.webkit.org/show_bug.cgi?id=99608
+
+Reviewed by Rob Buis.
+
+PR 222378.
+
+Disable focus zoom when the page is non-user scalable.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-10-16  Mike Lattanzio  mlattan...@rim.com
 
 2012-10-16  Mike Lattanzio  mlattan...@rim.com


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131621 => 131622)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-17 17:50:40 UTC (rev 131621)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-17 17:55:30 UTC (rev 131622)
@@ -1079,7 +1079,7 @@
 // The minimum size being defined as 3 mm is a good value based on my observations.
 static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
 
-if (fontHeight  fontHeight * m_webPage-currentScale()  s_minimumTextHeightInPixels  !isRunningDrt()) {
+if (m_webPage-isUserScalable()  fontHeight  fontHeight * m_webPage-currentScale()  s_minimumTextHeightInPixels  !isRunningDrt()) {
 if (!m_focusZoomScale) {
 m_focusZoomScale = m_webPage-currentScale();
 m_focusZoomLocation = selectionFocusRect.location();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [130938] trunk/Source/WebKit/blackberry

2012-10-10 Thread mifenton

Title: [130938] trunk/Source/WebKit/blackberry








Revision 130938
Author mifen...@rim.com
Date 2012-10-10 11:36:41 -0700 (Wed, 10 Oct 2012)


Log Message
[BlackBerry] Suppress keyboard requests while processing spell checking suggestions unless focus change is occurring..
https://bugs.webkit.org/show_bug.cgi?id=98903

Reviewed by Rob Buis.

PR 221143.

Suppress keyboard state changes when they are not triggered by
focus changes.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::setElementUnfocused):
(BlackBerry::WebKit::InputHandler::setElementFocused):
(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
* WebKitSupport/InputHandler.h:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (130937 => 130938)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-10 18:34:22 UTC (rev 130937)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-10 18:36:41 UTC (rev 130938)
@@ -1,3 +1,23 @@
+2012-10-10  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Suppress keyboard requests while processing spell checking suggestions unless focus change is occurring..
+https://bugs.webkit.org/show_bug.cgi?id=98903
+
+Reviewed by Rob Buis.
+
+PR 221143.
+
+Suppress keyboard state changes when they are not triggered by
+focus changes.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::setElementUnfocused):
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
+* WebKitSupport/InputHandler.h:
+
 2012-10-09  Rob Buis  rb...@rim.com
 
 [BlackBerry] Cleanup FatFingers.cpp


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (130937 => 130938)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-10 18:34:22 UTC (rev 130937)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-10 18:36:41 UTC (rev 130938)
@@ -745,7 +745,7 @@
 
 // Only hide the keyboard if we aren't refocusing on a new input field.
 if (!refocusOccuring)
-notifyClientOfKeyboardVisibilityChange(false);
+notifyClientOfKeyboardVisibilityChange(false, true /* triggeredByFocusChange */);
 
 m_webPage-m_client-inputFocusLost();
 
@@ -826,7 +826,7 @@
 handleInputLocaleChanged(m_webPage-m_webSettings-isWritingDirectionRTL());
 
 if (!m_delayKeyboardVisibilityChange)
-notifyClientOfKeyboardVisibilityChange(true);
+notifyClientOfKeyboardVisibilityChange(true, true /* triggeredByFocusChange */);
 
 #ifdef ENABLE_SPELLING_LOG
 SpellingLog(LogLevelInfo, InputHandler::setElementFocused Focusing the field took %f seconds., timer.elapsed());
@@ -1259,12 +1259,17 @@
 m_pendingKeyboardVisibilityChange = NoChange;
 }
 
-void InputHandler::notifyClientOfKeyboardVisibilityChange(bool visible)
+void InputHandler::notifyClientOfKeyboardVisibilityChange(bool visible, bool triggeredByFocusChange)
 {
 // If we aren't ready for input, keyboard changes should be ignored.
 if (!isInputModeEnabled()  visible)
 return;
 
+// If we are processing a change assume the keyboard is visbile to avoid
+// flooding the VKB with show requests.
+if (!triggeredByFocusChange  processingChange()  visible)
+return;
+
 if (!m_delayKeyboardVisibilityChange) {
 m_webPage-showVirtualKeyboard(visible);
 return;


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (130937 => 130938)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-10-10 18:34:22 UTC (rev 130937)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-10-10 18:36:41 UTC (rev 130938)
@@ -97,7 +97,7 @@
 void setDelayKeyboardVisibilityChange(bool value);
 void processPendingKeyboardVisibilityChange();
 
-void notifyClientOfKeyboardVisibilityChange(bool visible);
+void notifyClientOfKeyboardVisibilityChange(bool visible, bool triggeredByFocusChange = false);
 
 bool isInputMode() const { return isActiveTextEdit(); }
 bool isMultilineInputMode() const { return isActiveTextEdit()  elementType(m_currentFocusElement.get()) == BlackBerry::Platform::InputTypeTextArea; }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [130990] trunk/Source/WebKit/blackberry

2012-10-10 Thread mifenton

Title: [130990] trunk/Source/WebKit/blackberry








Revision 130990
Author mifen...@rim.com
Date 2012-10-10 18:25:33 -0700 (Wed, 10 Oct 2012)


Log Message
[BlackBerry] Adjust spell checking location to update after the cursor position is set.
https://bugs.webkit.org/show_bug.cgi?id=98904

Reviewed by Rob Buis.

PR 215172.

Delay calculation of caret position until it is updated on mouse release
handling.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (130989 => 130990)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-11 01:24:51 UTC (rev 130989)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-11 01:25:33 UTC (rev 130990)
@@ -1,5 +1,23 @@
 2012-10-10  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Adjust spell checking location to update after the cursor position is set.
+https://bugs.webkit.org/show_bug.cgi?id=98904
+
+Reviewed by Rob Buis.
+
+PR 215172.
+
+Delay calculation of caret position until it is updated on mouse release
+handling.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
+(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
+
+2012-10-10  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Suppress keyboard requests while processing spell checking suggestions unless focus change is occurring..
 https://bugs.webkit.org/show_bug.cgi?id=98903
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (130989 => 130990)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-11 01:24:51 UTC (rev 130989)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-11 01:25:33 UTC (rev 130990)
@@ -698,38 +698,40 @@
 if (!marker)
 return false;
 
-SpellingLog(LogLevelInfo, InputHandler::shouldRequestSpellCheckingOptionsForPoint Found spelling marker at point %d, %d, point.x(), point.y());
-
-// imf_sp_text_t should be generated in pixel viewport coordinates.
-WebCore::IntRect rect = m_webPage-mapToTransformed(m_webPage-focusedOrMainFrame()-view()-contentsToWindow(enclosingIntRect(marker-renderedRect(;
-m_webPage-clipToTransformedContentsRect(rect);
-
-// TODO use the actual caret position after it is placed.
-spellCheckingOptionRequest.caret_rect.caret_top_x = point.x();
-spellCheckingOptionRequest.caret_rect.caret_top_y = rect.y();
-spellCheckingOptionRequest.caret_rect.caret_bottom_x = point.x();
-spellCheckingOptionRequest.caret_rect.caret_bottom_y = rect.y() + rect.height();
+// Populate the marker details in preparation for the request as the marker is
+// not guaranteed to be valid after the cursor is placed.
 spellCheckingOptionRequest.startTextPosition = marker-startOffset();
 spellCheckingOptionRequest.endTextPosition = marker-endOffset();
 
-SpellingLog(LogLevelInfo, InputHandler::shouldRequestSpellCheckingOptionsForPoint spellCheckingOptionRequest\ntop %d, %d\nbottom %d %d\nMarker start %d end %d
-, spellCheckingOptionRequest.caret_rect.caret_top_x, spellCheckingOptionRequest.caret_rect.caret_top_y
-, spellCheckingOptionRequest.caret_rect.caret_bottom_x, spellCheckingOptionRequest.caret_rect.caret_bottom_y
-, spellCheckingOptionRequest.startTextPosition, spellCheckingOptionRequest.endTextPosition);
+SpellingLog(LogLevelInfo, InputHandler::shouldRequestSpellCheckingOptionsForPoint Found spelling marker at point %d, %d\nMarker start %d end %d,
+point.x(), point.y(), spellCheckingOptionRequest.startTextPosition, spellCheckingOptionRequest.endTextPosition);
 
 return true;
 }
 
 void InputHandler::requestSpellingCheckingOptions(imf_sp_text_t spellCheckingOptionRequest)
 {
+// If the caret is no longer active, no message should be sent.
+if (m_webPage-focusedOrMainFrame()-selection()-selectionType() != VisibleSelection::CaretSelection)
+return;
+
+// imf_sp_text_t should be generated in pixel viewport coordinates.
+WebCore::IntRect caretLocation = m_webPage-focusedOrMainFrame()-selection()-selection().visibleStart().absoluteCaretBounds();
+caretLocation = m_webPage-mapToTransformed(m_webPage-focusedOrMainFrame()-view()-contentsToWindow(enclosingIntRect(caretLocation)));
+m_webPage-clipToTransformedContentsRect(caretLocation);
+
+spellCheckingOptionRequest.caret_rect.caret_top_x = caretLocation.x();
+spellCheckingOptionRequest.caret_rect.caret_top_y = caretLocation.y();
+

[webkit-changes] [130991] trunk/Source/WebKit/blackberry

2012-10-10 Thread mifenton

Title: [130991] trunk/Source/WebKit/blackberry








Revision 130991
Author mifen...@rim.com
Date 2012-10-10 18:40:29 -0700 (Wed, 10 Oct 2012)


Log Message
[BlackBerry] Fix crash for detached node when validating selection change.
https://bugs.webkit.org/show_bug.cgi?id=98926

Reviewed by Rob Buis.

PR 220628.

Guard against detached nodes when generating selection rect.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::visibleTextQuads):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (130990 => 130991)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-11 01:25:33 UTC (rev 130990)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-11 01:40:29 UTC (rev 130991)
@@ -1,5 +1,19 @@
 2012-10-10  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Fix crash for detached node when validating selection change.
+https://bugs.webkit.org/show_bug.cgi?id=98926
+
+Reviewed by Rob Buis.
+
+PR 220628.
+
+Guard against detached nodes when generating selection rect.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::visibleTextQuads):
+
+2012-10-10  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Adjust spell checking location to update after the cursor position is set.
 https://bugs.webkit.org/show_bug.cgi?id=98904
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (130990 => 130991)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-10-11 01:25:33 UTC (rev 130990)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-10-11 01:40:29 UTC (rev 130991)
@@ -54,8 +54,12 @@
 {
 if (!selection.isRange())
 return;
-ASSERT(selection.firstRange());
 
+// Make sure that both start and end have valid nodes associated otherwise
+// this can crash. See PR 220628.
+if (!selection.start().anchorNode() || !selection.end().anchorNode())
+return;
+
 visibleTextQuads(*(selection.firstRange()), quads, true /* useSelectionHeight */);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [130500] trunk/Source/WebKit/blackberry

2012-10-05 Thread mifenton

Title: [130500] trunk/Source/WebKit/blackberry








Revision 130500
Author mifen...@rim.com
Date 2012-10-05 07:19:58 -0700 (Fri, 05 Oct 2012)


Log Message
[BlackBerry] Update default input support style for single line inputs.
https://bugs.webkit.org/show_bug.cgi?id=98510

Reviewed by Antonio Gomes.

PR 219588.

Update style calculations to eliminate automatic changes
by default on single line input fields.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::inputStyle):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (130499 => 130500)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-05 13:59:35 UTC (rev 130499)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-05 14:19:58 UTC (rev 130500)
@@ -1,3 +1,20 @@
+2012-10-05  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update default input support style for single line inputs.
+https://bugs.webkit.org/show_bug.cgi?id=98510
+
+Reviewed by Antonio Gomes.
+
+PR 219588.
+
+Update style calculations to eliminate automatic changes
+by default on single line input fields.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::inputStyle):
+
 2012-10-04  Simon Fraser  simon.fra...@apple.com
 
 Final part of sync to flush renaming


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (130499 => 130500)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-05 13:59:35 UTC (rev 130499)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-05 14:19:58 UTC (rev 130500)
@@ -197,26 +197,37 @@
 case InputTypeText:
 case InputTypeTextArea:
 {
-// Regular input mode, disable help if autocomplete is off.
-int imfMask = 0;
 DOMSupport::AttributeState autoCompleteState = DOMSupport::elementSupportsAutocomplete(element);
-if (autoCompleteState == DOMSupport::Off)
-imfMask = NO_AUTO_TEXT | NO_PREDICTION;
-else if (autoCompleteState != DOMSupport::On
-  DOMSupport::elementIdOrNameIndicatesNoAutocomplete(element))
-imfMask = NO_AUTO_TEXT | NO_PREDICTION;
+DOMSupport::AttributeState autoCorrectState = DOMSupport::elementSupportsAutocorrect(element);
 
-// Disable autocorrection if it's specifically off, of if it is in default mode
-// and we have disabled auto text and prediction.
-if (DOMSupport::elementSupportsAutocorrect(element) == DOMSupport::Off
-|| (imfMask  DOMSupport::elementSupportsAutocorrect(element) == DOMSupport::Default))
-imfMask |= NO_AUTO_CORRECTION;
+// Autocomplete disabled explicitly.
+if (autoCompleteState == DOMSupport::Off) {
+if (autoCorrectState == DOMSupport::On)
+return NO_PREDICTION;
+return NO_AUTO_TEXT | NO_PREDICTION | NO_AUTO_CORRECTION;
+}
 
-if (imfMask)
-return imfMask;
-if ((type == InputTypeEmail || type == InputTypeURL)  autoCompleteState != DOMSupport::On)
+// Autocomplete enabled explicitly.
+if (autoCompleteState == DOMSupport::On) {
+if (autoCorrectState == DOMSupport::Off)
+return NO_AUTO_TEXT | NO_AUTO_CORRECTION;
+return DEFAULT_STYLE;
+}
+
+// Check for reserved strings and known types.
+if (type == InputTypeEmail || type == InputTypeURL || DOMSupport::elementIdOrNameIndicatesNoAutocomplete(element)) {
+if (autoCorrectState == DOMSupport::On)
+return NO_PREDICTION;
 return NO_AUTO_TEXT | NO_PREDICTION | NO_AUTO_CORRECTION;
-break;
+}
+
+// Autocomplete state wasn't provided if it is a text area or autocorrect is on, apply support.
+if (autoCorrectState == DOMSupport::On || (type == InputTypeTextArea  autoCorrectState != DOMSupport::Off))
+return DEFAULT_STYLE;
+
+// Single line text input, without special features explicitly turned on or a textarea
+// with autocorrect disabled explicitly. Only enable predictions.
+return NO_AUTO_TEXT | NO_AUTO_CORRECTION;
 }
 case InputTypeIsIndex:
 case InputTypePassword:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [130043] trunk/Source/WebKit/blackberry

2012-10-01 Thread mifenton

Title: [130043] trunk/Source/WebKit/blackberry








Revision 130043
Author mifen...@rim.com
Date 2012-10-01 07:04:09 -0700 (Mon, 01 Oct 2012)


Log Message
[BlackBerry] Remove suppressing of VKB hiding when processing changes.
https://bugs.webkit.org/show_bug.cgi?id=98023

Reviewed by Rob Buis.

PR 215881.

Allow JS to blur the input field while processing key handling.

Reviewed Internally by Chris Hutten-Czapski

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (130042 => 130043)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-10-01 12:52:06 UTC (rev 130042)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-10-01 14:04:09 UTC (rev 130043)
@@ -1,3 +1,19 @@
+2012-10-01  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove suppressing of VKB hiding when processing changes.
+https://bugs.webkit.org/show_bug.cgi?id=98023
+
+Reviewed by Rob Buis.
+
+PR 215881.
+
+Allow JS to blur the input field while processing key handling.
+
+Reviewed Internally by Chris Hutten-Czapski
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
+
 2012-09-28  Konrad Piascik  kpias...@rim.com
 
 [BlackBerry] Update the value of window.devicePixelRation when it is set programmatically


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (130042 => 130043)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-01 12:52:06 UTC (rev 130042)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-10-01 14:04:09 UTC (rev 130043)
@@ -1254,11 +1254,6 @@
 if (!isInputModeEnabled()  visible)
 return;
 
-if (processingChange()) {
-ASSERT(visible);
-return;
-}
-
 if (!m_delayKeyboardVisibilityChange) {
 m_webPage-showVirtualKeyboard(visible);
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [129658] trunk/Source/WebKit/blackberry

2012-09-26 Thread mifenton

Title: [129658] trunk/Source/WebKit/blackberry








Revision 129658
Author mifen...@rim.com
Date 2012-09-26 09:33:31 -0700 (Wed, 26 Sep 2012)


Log Message
[BlackBerry] Update padding in ensureFocusTextElementVisible to be DPI independent.
https://bugs.webkit.org/show_bug.cgi?id=97684

Reviewed by Rob Buis.

Update padding in ensureFocusTextElementVisible to be DPI
independent and relative to the current zoom level.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (129657 => 129658)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-26 16:29:31 UTC (rev 129657)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-26 16:33:31 UTC (rev 129658)
@@ -1,3 +1,18 @@
+2012-09-26  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update padding in ensureFocusTextElementVisible to be DPI independent.
+https://bugs.webkit.org/show_bug.cgi?id=97684
+
+Reviewed by Rob Buis.
+
+Update padding in ensureFocusTextElementVisible to be DPI
+independent and relative to the current zoom level.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-09-25  Genevieve Mak  g...@rim.com
 
 Fat Fingers doesn't work on non-scrollable pages.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (129657 => 129658)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-26 16:29:31 UTC (rev 129657)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-26 16:33:31 UTC (rev 129658)
@@ -1125,16 +1125,14 @@
 }
 
 // Pad the rect to improve the visual appearance.
-// Padding must be large enough to expose the selection / FCC should they exist. Dragging the handle offscreen and releasing
-// will not trigger an automatic scroll. Using a padding of 40 will fully exposing the width of the current handle and half of
-// the height making it usable.
-// FIXME: This will need to be updated when the graphics change.
-// FIXME: The value of 40 should be calculated as a unit of measure using Graphics::Screen::primaryScreen()-heightInMMToPixels
-// using a relative value to the size of the handle. We should also consider expanding different amounts horizontally vs vertically.
-selectionFocusRect.inflate(40 /* padding in pixels */);
-WebCore::IntRect revealRect = layer-getRectToExpose(actualScreenRect, selectionFocusRect,
+// Convert the padding back from transformed to ensure a consistent padding regardless of
+// zoom level as controls do not zoom.
+static const int s_focusRectPaddingSize = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
+selectionFocusRect.inflate(m_webPage-mapFromTransformed(WebCore::IntSize(0, s_focusRectPaddingSize)).height());
+
+WebCore::IntRect revealRect(layer-getRectToExpose(actualScreenRect, selectionFocusRect,
  horizontalScrollAlignment,
- verticalScrollAlignment);
+ verticalScrollAlignment));
 
 mainFrameView-setConstrainsScrollingToContentEdge(false);
 // In order to adjust the scroll position to ensure the focused input field is visible,






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [129544] trunk/Source/WebKit/blackberry

2012-09-25 Thread mifenton

Title: [129544] trunk/Source/WebKit/blackberry








Revision 129544
Author mifen...@rim.com
Date 2012-09-25 12:58:11 -0700 (Tue, 25 Sep 2012)


Log Message
[BlackBerry] When zooming into an input field take the current zoom level into account.
https://bugs.webkit.org/show_bug.cgi?id=97594

Reviewed by Antonio Gomes.

PR 188751.

Perform the zoom action prior to scroll to avoid breaking scrolling
rules.  Take the current scale into account when calculating the
zoom factor.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (129543 => 129544)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-25 19:55:15 UTC (rev 129543)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-25 19:58:11 UTC (rev 129544)
@@ -1,3 +1,19 @@
+2012-09-25  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] When zooming into an input field take the current zoom level into account.
+https://bugs.webkit.org/show_bug.cgi?id=97594
+
+Reviewed by Antonio Gomes.
+
+PR 188751.
+
+Perform the zoom action prior to scroll to avoid breaking scrolling
+rules.  Take the current scale into account when calculating the
+zoom factor.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-09-25  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Handling required for multiple consecutive whitespace


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (129543 => 129544)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-25 19:55:15 UTC (rev 129543)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-25 19:58:11 UTC (rev 129544)
@@ -1050,11 +1050,31 @@
 break;
 }
 case VisibleSelection::NoSelection:
+if (m_focusZoomScale) {
+m_webPage-zoomAboutPoint(m_focusZoomScale, m_focusZoomLocation);
+m_focusZoomScale = 0.0;
+m_focusZoomLocation = WebCore::IntPoint();
+}
 return;
 }
 
 int fontHeight = selectionFocusRect.height();
 
+// If the text is too small, zoom in to make it a minimum size.
+// The minimum size being defined as 3 mm is a good value based on my observations.
+static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
+
+if (fontHeight  fontHeight * m_webPage-currentScale()  s_minimumTextHeightInPixels) {
+if (!m_focusZoomScale) {
+m_focusZoomScale = m_webPage-currentScale();
+m_focusZoomLocation = selectionFocusRect.location();
+}
+m_webPage-zoomAboutPoint(s_minimumTextHeightInPixels / fontHeight, m_focusZoomLocation);
+} else {
+m_focusZoomScale = 0.0;
+m_focusZoomLocation = WebCore::IntPoint();
+}
+
 if (elementFrame != mainFrame) { // Element is in a subframe.
 // Remove any scroll offset within the subframe to get the point relative to the main frame.
 selectionFocusRect.move(-elementFrame-view()-scrollPosition().x(), -elementFrame-view()-scrollPosition().y());
@@ -1126,18 +1146,6 @@
 mainFrameView-setConstrainsScrollingToContentEdge(true);
 }
 }
-
-// If the text is too small, zoom in to make it a minimum size.
-// The minimum size being defined as 3 mm is a good value based on my observations.
-static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-widthInMMToPixels(3);
-if (fontHeight  fontHeight  s_minimumTextHeightInPixels) {
-m_focusZoomScale = s_minimumTextHeightInPixels / fontHeight;
-m_focusZoomLocation = selectionFocusRect.location();
-m_webPage-zoomAboutPoint(m_focusZoomScale, m_focusZoomLocation);
-} else {
-m_focusZoomScale = 0.0;
-m_focusZoomLocation = WebCore::IntPoint();
-}
 }
 
 void InputHandler::ensureFocusPluginElementVisible()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [129550] trunk/Source/WebKit/blackberry

2012-09-25 Thread mifenton

Title: [129550] trunk/Source/WebKit/blackberry








Revision 129550
Author mifen...@rim.com
Date 2012-09-25 13:44:19 -0700 (Tue, 25 Sep 2012)


Log Message
[BlackBerry] Suspend the backingstore while adjusting the view on input field focus.
https://bugs.webkit.org/show_bug.cgi?id=97595

Reviewed by Antonio Gomes.

PR 188751.

Avoid jumpiness when both a scroll and zoom are required to
move an input field into focus by suspending the backingstore.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (129549 => 129550)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-25 20:40:30 UTC (rev 129549)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-25 20:44:19 UTC (rev 129550)
@@ -1,3 +1,18 @@
+2012-09-25  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Suspend the backingstore while adjusting the view on input field focus.
+https://bugs.webkit.org/show_bug.cgi?id=97595
+
+Reviewed by Antonio Gomes.
+
+PR 188751.
+
+Avoid jumpiness when both a scroll and zoom are required to
+move an input field into focus by suspending the backingstore.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-09-25  Pratik Solanki  psola...@apple.com
 
 Remove HAVE_SBRK since we never set use_sbrk to true


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (129549 => 129550)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-25 20:40:30 UTC (rev 129549)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-25 20:44:19 UTC (rev 129550)
@@ -1060,6 +1060,8 @@
 
 int fontHeight = selectionFocusRect.height();
 
+m_webPage-suspendBackingStore();
+
 // If the text is too small, zoom in to make it a minimum size.
 // The minimum size being defined as 3 mm is a good value based on my observations.
 static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-heightInMMToPixels(3);
@@ -1146,6 +1148,7 @@
 mainFrameView-setConstrainsScrollingToContentEdge(true);
 }
 }
+m_webPage-resumeBackingStore();
 }
 
 void InputHandler::ensureFocusPluginElementVisible()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [129044] trunk/Source/WebKit/blackberry

2012-09-19 Thread mifenton

Title: [129044] trunk/Source/WebKit/blackberry








Revision 129044
Author mifen...@rim.com
Date 2012-09-19 14:35:01 -0700 (Wed, 19 Sep 2012)


Log Message
[BlackBerry] After zooming into an input field, zoom out when focus is lost.
https://bugs.webkit.org/show_bug.cgi?id=97128

Reviewed by Rob Buis.

When the page has automatically zoomed in for input
focus, unzoom it when input focus is lost or keyboard hidden.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::InputHandler):
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (129043 => 129044)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-19 21:10:14 UTC (rev 129043)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-19 21:35:01 UTC (rev 129044)
@@ -1,3 +1,21 @@
+2012-09-19  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] After zooming into an input field, zoom out when focus is lost.
+https://bugs.webkit.org/show_bug.cgi?id=97128
+
+Reviewed by Rob Buis.
+
+When the page has automatically zoomed in for input
+focus, unzoom it when input focus is lost or keyboard hidden.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::InputHandler):
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2012-09-19  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Clean up the SpellingLog output


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (129043 => 129044)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-19 21:10:14 UTC (rev 129043)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-19 21:35:01 UTC (rev 129044)
@@ -138,6 +138,7 @@
 , m_delayKeyboardVisibilityChange(false)
 , m_request(0)
 , m_processingTransactionId(-1)
+, m_focusZoomScale(0.0)
 {
 }
 
@@ -1125,8 +1126,14 @@
 // If the text is too small, zoom in to make it a minimum size.
 // The minimum size being defined as 3 mm is a good value based on my observations.
 static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-widthInMMToPixels(3);
-if (fontHeight  fontHeight  s_minimumTextHeightInPixels)
-m_webPage-zoomAboutPoint(s_minimumTextHeightInPixels / fontHeight, selectionFocusRect.location());
+if (fontHeight  fontHeight  s_minimumTextHeightInPixels) {
+m_focusZoomScale = s_minimumTextHeightInPixels / fontHeight;
+m_focusZoomLocation = selectionFocusRect.location();
+m_webPage-zoomAboutPoint(m_focusZoomScale, m_focusZoomLocation);
+} else {
+m_focusZoomScale = 0.0;
+m_focusZoomLocation = WebCore::IntPoint();
+}
 }
 
 void InputHandler::ensureFocusPluginElementVisible()


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (129043 => 129044)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-09-19 21:10:14 UTC (rev 129043)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-09-19 21:35:01 UTC (rev 129044)
@@ -19,6 +19,7 @@
 #ifndef InputHandler_h
 #define InputHandler_h
 
+#include FloatPoint.h
 #include TextChecking.h
 
 #include BlackBerryPlatformInputEvents.h
@@ -221,6 +222,9 @@
 
 RefPtrWebCore::TextCheckingRequest m_request;
 int32_t m_processingTransactionId;
+
+double m_focusZoomScale;
+WebCore::FloatPoint m_focusZoomLocation;
 };
 
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128622] trunk/Source/WebKit/blackberry

2012-09-14 Thread mifenton

Title: [128622] trunk/Source/WebKit/blackberry








Revision 128622
Author mifen...@rim.com
Date 2012-09-14 09:58:59 -0700 (Fri, 14 Sep 2012)


Log Message
[BlackBerry] Update the minimum zoom scale when focusing an input field.
https://bugs.webkit.org/show_bug.cgi?id=96789

Reviewed by Antonio Gomes.

PR 188751.

Increase the minimum font fix and base it on mm instead of pixels.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (128621 => 128622)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-14 16:55:35 UTC (rev 128621)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-14 16:58:59 UTC (rev 128622)
@@ -1,3 +1,19 @@
+2012-09-14  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update the minimum zoom scale when focusing an input field.
+https://bugs.webkit.org/show_bug.cgi?id=96789
+
+Reviewed by Antonio Gomes.
+
+PR 188751.
+
+Increase the minimum font fix and base it on mm instead of pixels.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+
 2012-09-13  Antonio Gomes  ago...@rim.com
 
 [BlackBerry]  Remove the ability to schedule a zoom about point call.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (128621 => 128622)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-14 16:55:35 UTC (rev 128621)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-14 16:58:59 UTC (rev 128622)
@@ -66,6 +66,7 @@
 #include BlackBerryPlatformKeyboardEvent.h
 #include BlackBerryPlatformLog.h
 #include BlackBerryPlatformMisc.h
+#include BlackBerryPlatformScreen.h
 #include BlackBerryPlatformSettings.h
 #include sys/keycodes.h
 #include wtf/text/CString.h
@@ -1158,9 +1159,10 @@
 }
 
 // If the text is too small, zoom in to make it a minimum size.
-static const int s_minimumTextHeightInPixels = 6;
+// The minimum size being defined as 3 mm is a good value based on my observations.
+static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()-widthInMMToPixels(3);
 if (fontHeight  fontHeight  s_minimumTextHeightInPixels)
-m_webPage-zoomAboutPoint(s_minimumTextHeightInPixels / fontHeight, m_webPage-centerOfVisibleContentsRect());
+m_webPage-zoomAboutPoint(s_minimumTextHeightInPixels / fontHeight, selectionFocusRect.location());
 }
 
 void InputHandler::ensureFocusPluginElementVisible()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128341] trunk/Source/WebCore

2012-09-12 Thread mifenton

Title: [128341] trunk/Source/WebCore








Revision 128341
Author mifen...@rim.com
Date 2012-09-12 11:23:10 -0700 (Wed, 12 Sep 2012)


Log Message
[BlackBerry] Add custom messages for input type validation.
https://bugs.webkit.org/show_bug.cgi?id=96533

Reviewed by Antonio Gomes.

PR 179148.

Add validation messages for Email, MultipleEmail and Url.

Reviewed Internally by Nima Ghanavatian.

* platform/blackberry/LocalizedStringsBlackBerry.cpp:
(WebCore::validationMessageTypeMismatchForEmailText):
(WebCore::validationMessageTypeMismatchForMultipleEmailText):
(WebCore::validationMessageTypeMismatchForURLText):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (128340 => 128341)

--- trunk/Source/WebCore/ChangeLog	2012-09-12 18:11:16 UTC (rev 128340)
+++ trunk/Source/WebCore/ChangeLog	2012-09-12 18:23:10 UTC (rev 128341)
@@ -1,3 +1,21 @@
+2012-09-12  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add custom messages for input type validation.
+https://bugs.webkit.org/show_bug.cgi?id=96533
+
+Reviewed by Antonio Gomes.
+
+PR 179148.
+
+Add validation messages for Email, MultipleEmail and Url.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* platform/blackberry/LocalizedStringsBlackBerry.cpp:
+(WebCore::validationMessageTypeMismatchForEmailText):
+(WebCore::validationMessageTypeMismatchForMultipleEmailText):
+(WebCore::validationMessageTypeMismatchForURLText):
+
 2012-09-12  Mark Pilgrim  pilg...@chromium.org
 
 [Chromium] Remove unused notifyFormStateChanged function in PlatformSupport


Modified: trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp (128340 => 128341)

--- trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp	2012-09-12 18:11:16 UTC (rev 128340)
+++ trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp	2012-09-12 18:23:10 UTC (rev 128341)
@@ -481,17 +481,17 @@
 
 String validationMessageTypeMismatchForEmailText()
 {
-return validationMessageTypeMismatchText();
+return String::fromUTF8(s_resource.getString(BlackBerry::Platform::VALIDATION_TYPE_MISMATCH_EMAIL));
 }
 
 String validationMessageTypeMismatchForMultipleEmailText()
 {
-return validationMessageTypeMismatchText();
+return String::fromUTF8(s_resource.getString(BlackBerry::Platform::VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL));
 }
 
 String validationMessageTypeMismatchForURLText()
 {
-return validationMessageTypeMismatchText();
+return String::fromUTF8(s_resource.getString(BlackBerry::Platform::VALIDATION_TYPE_MISMATCH_URL));
 }
 
 String validationMessageValueMissingText()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128197] trunk/Source/WebKit/blackberry

2012-09-11 Thread mifenton

Title: [128197] trunk/Source/WebKit/blackberry








Revision 128197
Author mifen...@rim.com
Date 2012-09-11 09:48:14 -0700 (Tue, 11 Sep 2012)


Log Message
[BlackBerry] Colour Dialog popup request should return proper state.
https://bugs.webkit.org/show_bug.cgi?id=96392

Reviewed by Rob Buis.

Return proper state from openColorPopup dependent on
whether the popup actually opened.

Reviewed Internally by Chris Hutten-Czapski

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::openColorPopup):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (128196 => 128197)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-11 16:44:34 UTC (rev 128196)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-11 16:48:14 UTC (rev 128197)
@@ -1,3 +1,18 @@
+2012-09-11  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Colour Dialog popup request should return proper state.
+https://bugs.webkit.org/show_bug.cgi?id=96392
+
+Reviewed by Rob Buis.
+
+Return proper state from openColorPopup dependent on
+whether the popup actually opened.
+
+Reviewed Internally by Chris Hutten-Czapski
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::openColorPopup):
+
 2012-09-11  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Take account for single words that exceed our client character limit


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (128196 => 128197)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-11 16:44:34 UTC (rev 128196)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-11 16:48:14 UTC (rev 128197)
@@ -1001,9 +1001,9 @@
 
 // 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;
+return m_webPage-m_page-chrome()-client()-openPagePopup(client,  WebCore::IntRect());
 }
 
 void InputHandler::setInputValue(const WTF::String value)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128198] trunk/Source/WebKit/blackberry

2012-09-11 Thread mifenton

Title: [128198] trunk/Source/WebKit/blackberry








Revision 128198
Author mifen...@rim.com
Date 2012-09-11 09:52:01 -0700 (Tue, 11 Sep 2012)


Log Message
[BlackBerry] Suppress keyboard requests while processing spell checking suggestions.
https://bugs.webkit.org/show_bug.cgi?id=96394

Reviewed by Rob Buis.

Suppress the VKB notification when the touch event
is a spell checking request.

PR 192925.

Reviewed Internally by Gen Mak.

* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (128197 => 128198)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-11 16:48:14 UTC (rev 128197)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-11 16:52:01 UTC (rev 128198)
@@ -1,5 +1,22 @@
 2012-09-11  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Suppress keyboard requests while processing spell checking suggestions.
+https://bugs.webkit.org/show_bug.cgi?id=96394
+
+Reviewed by Rob Buis.
+
+Suppress the VKB notification when the touch event
+is a spell checking request.
+
+PR 192925.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
+
+2012-09-11  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Colour Dialog popup request should return proper state.
 https://bugs.webkit.org/show_bug.cgi?id=96392
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp (128197 => 128198)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-09-11 16:48:14 UTC (rev 128197)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-09-11 16:52:01 UTC (rev 128198)
@@ -235,8 +235,10 @@
 
 // Apply any suppressed changes. This does not eliminate the need
 // for the show after the handling of fat finger pressed as it may
-// have triggered a state change.
-m_webPage-m_inputHandler-processPendingKeyboardVisibilityChange();
+// have triggered a state change. Leave the change suppressed if
+// we are triggering spell check options.
+if (!shouldRequestSpellCheckOptions)
+m_webPage-m_inputHandler-processPendingKeyboardVisibilityChange();
 
 if (shouldSuppressMouseDownOnTouchDown())
 handleFatFingerPressed();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [127613] trunk/Source/WebCore

2012-09-05 Thread mifenton

Title: [127613] trunk/Source/WebCore








Revision 127613
Author mifen...@rim.com
Date 2012-09-05 11:16:58 -0700 (Wed, 05 Sep 2012)


Log Message
[BlackBerry] PlatformKeyboardEvent::getCurrentModifierState should initialize values.
https://bugs.webkit.org/show_bug.cgi?id=95773

Reviewed by Rob Buis.

Properly initialize the passed variables even
though we haven't implemented the modifier state
to ensure the values are deterministic.

* platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
(WebCore::PlatformKeyboardEvent::getCurrentModifierState):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (127612 => 127613)

--- trunk/Source/WebCore/ChangeLog	2012-09-05 18:01:12 UTC (rev 127612)
+++ trunk/Source/WebCore/ChangeLog	2012-09-05 18:16:58 UTC (rev 127613)
@@ -1,3 +1,17 @@
+2012-09-05  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] PlatformKeyboardEvent::getCurrentModifierState should initialize values.
+https://bugs.webkit.org/show_bug.cgi?id=95773
+
+Reviewed by Rob Buis.
+
+Properly initialize the passed variables even
+though we haven't implemented the modifier state
+to ensure the values are deterministic.
+
+* platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
+(WebCore::PlatformKeyboardEvent::getCurrentModifierState):
+
 2012-09-05  Tommy Widenflycht  tom...@google.com
 
 MediaStream API: Add the local and remote description functionality to RTCPeerConnection


Modified: trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp (127612 => 127613)

--- trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp	2012-09-05 18:01:12 UTC (rev 127612)
+++ trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp	2012-09-05 18:16:58 UTC (rev 127613)
@@ -479,9 +479,13 @@
 }
 }
 
-void PlatformKeyboardEvent::getCurrentModifierState(bool, bool, bool, bool)
+void PlatformKeyboardEvent::getCurrentModifierState(bool shiftKey, bool ctrlKey, bool altKey, bool metaKey)
 {
 notImplemented();
+shiftKey = false;
+ctrlKey = false;
+altKey = false;
+metaKey = false;
 }
 
 } // namespace WebCore






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [127677] trunk/Source/WebKit/blackberry

2012-09-05 Thread mifenton

Title: [127677] trunk/Source/WebKit/blackberry








Revision 127677
Author mifen...@rim.com
Date 2012-09-05 19:03:27 -0700 (Wed, 05 Sep 2012)


Log Message
[BlackBerry] Remove deprecated dialog connections.
https://bugs.webkit.org/show_bug.cgi?id=95868

Reviewed by Rob Buis.

PR 187481.
Remove deprecated logic for unsupported
Dialog types.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::openDatePopup):
(BlackBerry::WebKit::InputHandler::openColorPopup):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (127676 => 127677)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-09-06 02:02:54 UTC (rev 127676)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-09-06 02:03:27 UTC (rev 127677)
@@ -166,9 +166,6 @@
 virtual void resetBackForwardList(unsigned listSize, unsigned currentIndex) = 0;
 
 virtual void openPopupList(bool multiple, int size, const ScopeArrayWebString labels, const bool* enableds, const int* itemType, const bool* selecteds) = 0;
-virtual void openDateTimePopup(int type, const WebString value, const WebString min, const WebString max, double step) = 0;
-virtual void openColorPopup(const WebString value) = 0;
-
 virtual bool chooseFilenames(bool allowMultiple, const SharedArrayWebString acceptTypes, const SharedArrayWebString initialFiles, const WebString capture, SharedArrayWebString chosenFiles) = 0;
 
 virtual void loadPluginForMimetype(int, int width, int height, const SharedArrayWebString paramNames, const SharedArrayWebString paramValues, const char* url) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (127676 => 127677)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-06 02:02:54 UTC (rev 127676)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-06 02:03:27 UTC (rev 127677)
@@ -1,3 +1,19 @@
+2012-09-05  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove deprecated dialog connections.
+https://bugs.webkit.org/show_bug.cgi?id=95868
+
+Reviewed by Rob Buis.
+
+PR 187481.
+Remove deprecated logic for unsupported
+Dialog types.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::openDatePopup):
+(BlackBerry::WebKit::InputHandler::openColorPopup):
+
 2012-09-05  George Staikos  stai...@webkit.org
 
 [BlackBerry] Assignment operators missing self-check


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (127676 => 127677)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-06 02:02:54 UTC (rev 127676)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-09-06 02:03:27 UTC (rev 127677)
@@ -959,11 +959,7 @@
 double step = element-getAttribute(HTMLNames::stepAttr).toDouble();
 
 DatePickerClient* client = new DatePickerClient(type, value, min, max, step,  m_webPage, element);
-// Fail to create HTML popup, use the old path
-if (!m_webPage-m_page-chrome()-client()-openPagePopup(client,  WebCore::IntRect()))
-m_webPage-m_client-openDateTimePopup(type, value, min, max, step);
-
-return true;
+return m_webPage-m_page-chrome()-client()-openPagePopup(client,  WebCore::IntRect());
 }
 default: // Other types not supported
 return false;
@@ -981,8 +977,8 @@
 m_currentFocusElement = element;
 m_currentFocusElementType = TextPopup;
 
-m_webPage-m_client-openColorPopup(element-value());
-return true;
+// FIXME: Need to add pagePopup support and the colour dialog.
+// PR 180778
 }
 
 void InputHandler::setInputValue(const WTF::String value)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125808] trunk/Source/WebKit/blackberry

2012-08-16 Thread mifenton

Title: [125808] trunk/Source/WebKit/blackberry








Revision 125808
Author mifen...@rim.com
Date 2012-08-16 13:47:18 -0700 (Thu, 16 Aug 2012)


Log Message
[BlackBerry] Use form state to determine the VKB enter key.
https://bugs.webkit.org/show_bug.cgi?id=94239

Reviewed by Rob Buis.

PR 188234.

If the enter key for the VKB is not explicitly set, use
submit if we are in a single line input and a default
button exists for the form.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::setElementFocused):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125807 => 125808)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-16 20:44:36 UTC (rev 125807)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-16 20:47:18 UTC (rev 125808)
@@ -1,3 +1,21 @@
+2012-08-16  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Use form state to determine the VKB enter key.
+https://bugs.webkit.org/show_bug.cgi?id=94239
+
+Reviewed by Rob Buis.
+
+PR 188234.
+
+If the enter key for the VKB is not explicitly set, use
+submit if we are in a single line input and a default
+button exists for the form.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+
 2012-08-16  Konrad Piascik  kpias...@rim.com
 
 [BlackBerry] Reload valid page from Error Page keeps history ViewState and zoom.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (125807 => 125808)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-16 20:44:36 UTC (rev 125807)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-16 20:47:18 UTC (rev 125808)
@@ -818,6 +818,14 @@
 VirtualKeyboardType keyboardType = keyboardTypeAttribute(element);
 VirtualKeyboardEnterKeyType enterKeyType = keyboardEnterKeyTypeAttribute(element);
 
+if (enterKeyType == VKBEnterKeyNotSet  type != InputTypeTextArea) {
+if (element-isFormControlElement()) {
+const HTMLFormControlElement* formElement = static_castconst HTMLFormControlElement*(element);
+if (formElement-form()  formElement-form()-defaultButton())
+enterKeyType = VKBEnterKeySubmit;
+}
+}
+
 FocusLog(LogLevelInfo, InputHandler::setElementFocused, Type=%d, Style=%d, Keyboard Type=%d, Enter Key=%d, type, m_currentFocusElementTextEditMask, keyboardType, enterKeyType);
 m_webPage-m_client-inputFocusGained(type, m_currentFocusElementTextEditMask, keyboardType, enterKeyType);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125701] trunk/Source/WebKit/blackberry

2012-08-15 Thread mifenton

Title: [125701] trunk/Source/WebKit/blackberry








Revision 125701
Author mifen...@rim.com
Date 2012-08-15 13:40:04 -0700 (Wed, 15 Aug 2012)


Log Message
[BlackBerry] Use the unconverted attribute instead of composing when deciding to how to handle key input.
https://bugs.webkit.org/show_bug.cgi?id=94132

Reviewed by Rob Buis.

PR 139838.

Switch direct key input handling to be based on the unconverted
attribute being present.  Converted keys, even during composition
are now input directly.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::setText):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125700 => 125701)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-15 19:58:58 UTC (rev 125700)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-15 20:40:04 UTC (rev 125701)
@@ -1,3 +1,21 @@
+2012-08-15  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Use the unconverted attribute instead of composing when deciding to how to handle key input.
+https://bugs.webkit.org/show_bug.cgi?id=94132
+
+Reviewed by Rob Buis.
+
+PR 139838.
+
+Switch direct key input handling to be based on the unconverted
+attribute being present.  Converted keys, even during composition
+are now input directly.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::setText):
+
 2012-08-15  Joshua Netterfield  jnetterfi...@rim.com
 
 [BlackBerry] Upstream BlackBerry build fixes


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (125700 => 125701)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-15 19:58:58 UTC (rev 125700)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-15 20:40:04 UTC (rev 125701)
@@ -2013,12 +2013,13 @@
 removeAttributedTextMarker();
 
 if (isTrailingSingleCharacter(changedSpan, textLength, composingTextLength)) {
-// Handle the case where text is being composed.
-if (firstSpanInString(spannableString, COMPOSED_TEXT_ATTRIB)) {
-InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected.  Text is being composed.);
+// If the text is unconverted, do not allow JS processing as it is not a real
+// character in the field.
+if (firstSpanInString(spannableString, UNCONVERTED_TEXT_ATTRIB)) {
+InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected.  Text is unconverted.);
 return editor-command(InsertText).execute(textToInsert.right(1));
 }
-InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected. Text is not being composed.);
+InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected.);
 return handleKeyboardInput(Platform::KeyboardEvent(textToInsert[textLength - 1], Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125584] trunk/Source/WebKit/blackberry

2012-08-14 Thread mifenton

Title: [125584] trunk/Source/WebKit/blackberry








Revision 125584
Author mifen...@rim.com
Date 2012-08-14 11:23:55 -0700 (Tue, 14 Aug 2012)


Log Message
[BlackBerry] Fix use of endsWith to use string instead of char.
https://bugs.webkit.org/show_bug.cgi?id=93994

Reviewed by Antonio Gomes.

Regex comparison should use string instead of char comparison.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::elementPatternMatches):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125583 => 125584)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 17:58:19 UTC (rev 125583)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 18:23:55 UTC (rev 125584)
@@ -1,3 +1,15 @@
+2012-08-14  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Fix use of endsWith to use string instead of char.
+https://bugs.webkit.org/show_bug.cgi?id=93994
+
+Reviewed by Antonio Gomes.
+
+Regex comparison should use string instead of char comparison.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::elementPatternMatches):
+
 2012-08-14  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] Double-tap zoom on blocks on cnn.com desktop page doesn't work


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (125583 => 125584)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-08-14 17:58:19 UTC (rev 125583)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-08-14 18:23:55 UTC (rev 125584)
@@ -427,7 +427,7 @@
 return true;
 
 // Is the regex specifying a character count?
-if (patternAttribute[patternString.length()] != '{' || !patternAttribute.endsWith('}'))
+if (patternAttribute[patternString.length()] != '{' || !patternAttribute.endsWith(}))
 return false;
 
 // Make sure the number in the regex is actually a number.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125585] trunk/Source/WebKit/blackberry

2012-08-14 Thread mifenton

Title: [125585] trunk/Source/WebKit/blackberry








Revision 125585
Author mifen...@rim.com
Date 2012-08-14 11:28:03 -0700 (Tue, 14 Aug 2012)


Log Message
[BlackBerry] Use constructor to initialize rect in TouchEventHandler::drawTapHighlight()
https://bugs.webkit.org/show_bug.cgi?id=93988

Reviewed by Antonio Gomes.

Use constructor to initialize rect in TouchEventHandler::drawTapHighlight()

* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::drawTapHighlight):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125584 => 125585)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 18:23:55 UTC (rev 125584)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 18:28:03 UTC (rev 125585)
@@ -1,5 +1,17 @@
 2012-08-14  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Use constructor to initialize rect in TouchEventHandler::drawTapHighlight()
+https://bugs.webkit.org/show_bug.cgi?id=93988
+
+Reviewed by Antonio Gomes.
+
+Use constructor to initialize rect in TouchEventHandler::drawTapHighlight()
+
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::drawTapHighlight):
+
+2012-08-14  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Fix use of endsWith to use string instead of char.
 https://bugs.webkit.org/show_bug.cgi?id=93994
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp (125584 => 125585)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-08-14 18:23:55 UTC (rev 125584)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-08-14 18:28:03 UTC (rev 125585)
@@ -345,7 +345,7 @@
 IntPoint framePos(m_webPage-frameOffset(elementFrame));
 
 // FIXME: We can get more precise on the map case by calculating the rect with HTMLAreaElement::computeRect().
-IntRect absoluteRect = renderer-absoluteClippedOverflowRect();
+IntRect absoluteRect(renderer-absoluteClippedOverflowRect());
 absoluteRect.move(framePos.x(), framePos.y());
 
 IntRect clippingRect;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125588] trunk/Source/WebKit/blackberry

2012-08-14 Thread mifenton

Title: [125588] trunk/Source/WebKit/blackberry








Revision 125588
Author mifen...@rim.com
Date 2012-08-14 12:02:31 -0700 (Tue, 14 Aug 2012)


Log Message
[BlackBerry] Use Form helper functions to determine state in DOMSupport::isTextBasedContentEditableElement
https://bugs.webkit.org/show_bug.cgi?id=93992

Reviewed by Antonio Gomes.

Use form control helper functions to determine the editable state
of the input field.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::isTextBasedContentEditableElement):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125587 => 125588)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 18:54:32 UTC (rev 125587)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 19:02:31 UTC (rev 125588)
@@ -1,5 +1,18 @@
 2012-08-14  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Use Form helper functions to determine state in DOMSupport::isTextBasedContentEditableElement
+https://bugs.webkit.org/show_bug.cgi?id=93992
+
+Reviewed by Antonio Gomes.
+
+Use form control helper functions to determine the editable state
+of the input field.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::isTextBasedContentEditableElement):
+
+2012-08-14  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Use constructor to initialize rect in TouchEventHandler::drawTapHighlight()
 https://bugs.webkit.org/show_bug.cgi?id=93988
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (125587 => 125588)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-08-14 18:54:32 UTC (rev 125587)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-08-14 19:02:31 UTC (rev 125588)
@@ -231,12 +231,9 @@
 if (!element)
 return false;
 
-if (element-isTextFormControl()  static_castHTMLTextFormControlElement*(element)-readOnly())
+if (element-isReadOnlyFormControl() || !element-isEnabledFormControl())
 return false;
 
-if (!element-isEnabledFormControl())
-return false;
-
 if (isPopupInputField(element))
 return false;
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125609] trunk/Source/WebKit/blackberry

2012-08-14 Thread mifenton

Title: [125609] trunk/Source/WebKit/blackberry








Revision 125609
Author mifen...@rim.com
Date 2012-08-14 14:35:06 -0700 (Tue, 14 Aug 2012)


Log Message
[BlackBerry] Remove unnecessary \n's from InputHandler log messages.
https://bugs.webkit.org/show_bug.cgi?id=94015

Reviewed by Rob Buis.

Remove many unnecessary \n's from the end of log messages.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::convertStringToWcharVector):
(BlackBerry::WebKit::convertSpannableStringToString):
(BlackBerry::WebKit::InputHandler::spannableTextInRange):
(BlackBerry::WebKit::InputHandler::setText):
(BlackBerry::WebKit::InputHandler::setSpannableTextAndRelativeCursor):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (125608 => 125609)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 21:33:56 UTC (rev 125608)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-14 21:35:06 UTC (rev 125609)
@@ -1,3 +1,21 @@
+2012-08-14  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove unnecessary \n's from InputHandler log messages.
+https://bugs.webkit.org/show_bug.cgi?id=94015
+
+Reviewed by Rob Buis.
+
+Remove many unnecessary \n's from the end of log messages.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::convertStringToWcharVector):
+(BlackBerry::WebKit::convertSpannableStringToString):
+(BlackBerry::WebKit::InputHandler::spannableTextInRange):
+(BlackBerry::WebKit::InputHandler::setText):
+(BlackBerry::WebKit::InputHandler::setSpannableTextAndRelativeCursor):
+
 2012-08-14  Nima Ghanavatian  nghanavat...@rim.com
 
 [BlackBerry] Queue spellcheck requests with char-count limitations


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (125608 => 125609)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-14 21:33:56 UTC (rev 125608)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-14 21:35:06 UTC (rev 125609)
@@ -460,7 +460,7 @@
 return true;
 
 if (!wcharString.tryReserveCapacity(length + 1)) {
-logAlways(LogLevelCritical, InputHandler::convertStringToWcharVector Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::convertStringToWcharVector Cannot allocate memory for string.);
 return false;
 }
 
@@ -480,7 +480,7 @@
 WTF::VectorUChar dest;
 int destCapacity = (src-length * 2) + 1;
 if (!dest.tryReserveCapacity(destCapacity)) {
-logAlways(LogLevelCritical, InputHandler::convertSpannableStringToString Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::convertSpannableStringToString Cannot allocate memory for string.);
 return String();
 }
 
@@ -1783,14 +1783,14 @@
 // crash immediately on failure.
 pst-str = (wchar_t*)malloc(sizeof(wchar_t) * (length + 1));
 if (!pst-str) {
-logAlways(LogLevelCritical, InputHandler::spannableTextInRange Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::spannableTextInRange Cannot allocate memory for string.);
 free(pst);
 return 0;
 }
 
 int stringLength = 0;
 if (!convertStringToWchar(textString, pst-str, length + 1, stringLength)) {
-logAlways(LogLevelCritical, InputHandler::spannableTextInRange failed to convert string.\n);
+logAlways(LogLevelCritical, InputHandler::spannableTextInRange failed to convert string.);
 free(pst-str);
 free(pst);
 return 0;
@@ -1999,7 +1999,7 @@
 String textToInsert = convertSpannableStringToString(spannableString);
 int textLength = textToInsert.length();
 
-InputLog(LogLevelInfo, InputHandler::setText spannableString is '%s', of length %d \n, textToInsert.latin1().data(), textLength);
+InputLog(LogLevelInfo, InputHandler::setText spannableString is '%s', of length %d, textToInsert.latin1().data(), textLength);
 
 span_t* changedSpan = firstSpanInString(spannableString, CHANGED_ATTRIB);
 int composingTextStart = m_composingTextStart;
@@ -2010,10 +2010,10 @@
 if (isTrailingSingleCharacter(changedSpan, textLength, composingTextLength)) {
 // Handle the case where text is being composed.
 if (firstSpanInString(spannableString, COMPOSED_TEXT_ATTRIB)) {
-InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected.  Text is being composed. \n);
+InputLog(LogLevelInfo, InputHandler::setText Single trailing character detected.  Text is being composed.);
 return editor-command(InsertText).execute(textToInsert.right(1));
 }
-InputLog(LogLevelInfo, InputHandler::setText Single trailing character

[webkit-changes] [125441] trunk/Source/WebKit/blackberry

2012-08-13 Thread mifenton

Title: [125441] trunk/Source/WebKit/blackberry








Revision 125441
Author mifen...@rim.com
Date 2012-08-13 13:23:38 -0700 (Mon, 13 Aug 2012)


Log Message
[BlackBerry] Update API for spell checking suggestions again.
https://bugs.webkit.org/show_bug.cgi?id=93877

Reviewed by Antonio Gomes.

PR 163283.

Update the spell checking options request API
to include the caret positions.

Reviewed internally by Nima Ghanavatian.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
(WebKit):
(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
* WebKitSupport/InputHandler.h:
(Platform):
(InputHandler):
* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
* WebKitSupport/TouchEventHandler.h:
(TouchEventHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (125440 => 125441)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-08-13 20:17:57 UTC (rev 125440)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-08-13 20:23:38 UTC (rev 125441)
@@ -26,6 +26,7 @@
 #include BlackBerryPlatformInputEvents.h
 #include BlackBerryPlatformNavigationType.h
 #include BlackBerryPlatformPrimitives.h
+#include imf/events.h
 #include interaction/ScrollViewBase.h
 #include vector
 
@@ -144,7 +145,7 @@
 
 virtual void showVirtualKeyboard(bool) = 0;
 
-virtual void requestSpellingSuggestionsForString(unsigned start, unsigned end) = 0;
+virtual void requestSpellingCheckingOptions(imf_sp_text_t) = 0;
 virtual int32_t checkSpellingOfStringAsync(wchar_t* text, int length) = 0;
 
 virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion, bool overrideTouchHandling = false) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (125440 => 125441)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-13 20:17:57 UTC (rev 125440)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-13 20:23:38 UTC (rev 125441)
@@ -1,3 +1,30 @@
+2012-08-13  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update API for spell checking suggestions again.
+https://bugs.webkit.org/show_bug.cgi?id=93877
+
+Reviewed by Antonio Gomes.
+
+PR 163283.
+
+Update the spell checking options request API
+to include the caret positions.
+
+Reviewed internally by Nima Ghanavatian.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
+(WebKit):
+(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
+* WebKitSupport/InputHandler.h:
+(Platform):
+(InputHandler):
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
+* WebKitSupport/TouchEventHandler.h:
+(TouchEventHandler):
+
 2012-08-13  Antonio Gomes  ago...@rim.com
 
 [BlackBerry] Rounding error somewhere when translating CompositingLayer 's for in-region scrolling


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (125440 => 125441)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-13 20:17:57 UTC (rev 125440)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-13 20:23:38 UTC (rev 125441)
@@ -50,6 +50,7 @@
 #include RenderText.h
 #include RenderTextControl.h
 #include RenderWidget.h
+#include RenderedDocumentMarker.h
 #include ScopePointer.h
 #include SelectPopupClient.h
 #include SelectionHandler.h
@@ -64,11 +65,11 @@
 #include BlackBerryPlatformLog.h
 #include BlackBerryPlatformMisc.h
 #include BlackBerryPlatformSettings.h
-#include imf/events.h
 #include sys/keycodes.h
 
 #define ENABLE_INPUT_LOG 0
 #define ENABLE_FOCUS_LOG 0
+#define ENABLE_SPELLING_LOG 0
 
 static const unsigned MaxLearnTextDataSize = 500;
 
@@ -87,6 +88,12 @@
 #define FocusLog(severity, format, ...)
 #endif // ENABLE_FOCUS_LOG
 
+#if ENABLE_SPELLING_LOG
+#define SpellingLog(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
+#else
+#define SpellingLog(severity, format, ...)
+#endif // ENABLE_SPELLING_LOG
+
 namespace BlackBerry {
 namespace WebKit {
 
@@ -648,6 +655,50 @@
 return 0;
 }
 
+bool InputHandler::shouldRequestSpellCheckingOptionsForPoint(Platform::IntPoint point, const Element* touchedElement, imf_sp_text_t spellCheckingOptionRequest)
+{
+if (!isActiveTextEdit() || touchedElement != m_currentFocusElement)
+

[webkit-changes] [124887] trunk/Source/WebKit/blackberry

2012-08-07 Thread mifenton

Title: [124887] trunk/Source/WebKit/blackberry








Revision 124887
Author mifen...@rim.com
Date 2012-08-07 07:32:15 -0700 (Tue, 07 Aug 2012)


Log Message
[BlackBerry] Update API for spell checking suggestions.
https://bugs.webkit.org/show_bug.cgi?id=93356

Reviewed by Antonio Gomes.

PR 163283.

Add connections for updated spell checking options request API.  Move
all this logic into InputHandler.

Reviewed Internally by Gen Mak and Nima Ghanavatian.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
(WebKit):
(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
* WebKitSupport/InputHandler.h:
(Platform):
(InputHandler):
* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
* WebKitSupport/TouchEventHandler.h:
(TouchEventHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (124886 => 124887)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-08-07 13:52:42 UTC (rev 124886)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-08-07 14:32:15 UTC (rev 124887)
@@ -26,6 +26,7 @@
 #include BlackBerryPlatformInputEvents.h
 #include BlackBerryPlatformNavigationType.h
 #include BlackBerryPlatformPrimitives.h
+#include imf/events.h
 #include interaction/ScrollViewBase.h
 #include vector
 
@@ -144,7 +145,7 @@
 
 virtual void showVirtualKeyboard(bool) = 0;
 
-virtual void requestSpellingSuggestionsForString(unsigned start, unsigned end) = 0;
+virtual void requestSpellingCheckingOptions(const imf_sp_text_t) = 0;
 virtual int32_t checkSpellingOfStringAsync(wchar_t* text, int length) = 0;
 
 virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion, bool overrideTouchHandling = false) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (124886 => 124887)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-07 13:52:42 UTC (rev 124886)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-07 14:32:15 UTC (rev 124887)
@@ -1,3 +1,30 @@
+2012-08-07  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Update API for spell checking suggestions.
+https://bugs.webkit.org/show_bug.cgi?id=93356
+
+Reviewed by Antonio Gomes.
+
+PR 163283.
+
+Add connections for updated spell checking options request API.  Move
+all this logic into InputHandler.
+
+Reviewed Internally by Gen Mak and Nima Ghanavatian.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::shouldRequestSpellCheckingOptionsForPoint):
+(WebKit):
+(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
+* WebKitSupport/InputHandler.h:
+(Platform):
+(InputHandler):
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
+* WebKitSupport/TouchEventHandler.h:
+(TouchEventHandler):
+
 2012-08-06  Charles Wei  charles@torchmobile.com.cn
 
 [BlackBerry] About: shows PAGE_CACHE not enabled.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (124886 => 124887)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-07 13:52:42 UTC (rev 124886)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-07 14:32:15 UTC (rev 124887)
@@ -50,6 +50,7 @@
 #include RenderText.h
 #include RenderTextControl.h
 #include RenderWidget.h
+#include RenderedDocumentMarker.h
 #include ScopePointer.h
 #include SelectPopupClient.h
 #include SelectionHandler.h
@@ -64,11 +65,11 @@
 #include BlackBerryPlatformLog.h
 #include BlackBerryPlatformMisc.h
 #include BlackBerryPlatformSettings.h
-#include imf/events.h
 #include sys/keycodes.h
 
 #define ENABLE_INPUT_LOG 0
 #define ENABLE_FOCUS_LOG 0
+#define ENABLE_SPELLING_LOG 0
 
 static const unsigned MaxLearnTextDataSize = 500;
 
@@ -87,6 +88,12 @@
 #define FocusLog(severity, format, ...)
 #endif // ENABLE_FOCUS_LOG
 
+#if ENABLE_SPELLING_LOG
+#define SpellingLog(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
+#else
+#define SpellingLog(severity, format, ...)
+#endif // ENABLE_SPELLING_LOG
+
 namespace BlackBerry {
 namespace WebKit {
 
@@ -648,6 +655,52 @@
 return 0;
 }
 
+bool InputHandler::shouldRequestSpellCheckingOptionsForPoint(Platform::IntPoint point, const Element* touchedElement, imf_sp_text_t spellCheckingOptionRequest)
+{
+if (!isActiveTextEdit() ||

[webkit-changes] [124337] trunk/Source/WebKit/blackberry

2012-08-01 Thread mifenton

Title: [124337] trunk/Source/WebKit/blackberry








Revision 124337
Author mifen...@rim.com
Date 2012-08-01 08:57:44 -0700 (Wed, 01 Aug 2012)


Log Message
[BlackBerry] Consolidate suppression of keyboard requests.
https://bugs.webkit.org/show_bug.cgi?id=92871

Reviewed by Antonio Gomes.

Reduce VKB requests even more by applying the filter on
all requests during processing.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::focusedNodeChanged):
(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (124336 => 124337)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-08-01 15:45:28 UTC (rev 124336)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-08-01 15:57:44 UTC (rev 124337)
@@ -1,3 +1,19 @@
+2012-08-01  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Consolidate suppression of keyboard requests.
+https://bugs.webkit.org/show_bug.cgi?id=92871
+
+Reviewed by Antonio Gomes.
+
+Reduce VKB requests even more by applying the filter on
+all requests during processing.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::focusedNodeChanged):
+(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
+
 2012-08-01  Arvid Nilsson  anils...@rim.com
 
 [BlackBerry] Disable tap highlight when transparent color is specified


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (124336 => 124337)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-01 15:45:28 UTC (rev 124336)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-08-01 15:57:44 UTC (rev 124337)
@@ -362,8 +362,7 @@
 Node* node = frame-document()-focusedNode();
 
 if (isActiveTextEdit()  m_currentFocusElement == node) {
-if (!processingChange())
-notifyClientOfKeyboardVisibilityChange(true);
+notifyClientOfKeyboardVisibilityChange(true);
 return;
 }
 
@@ -1034,6 +1033,11 @@
 if (!isInputModeEnabled()  visible)
 return;
 
+if (processingChange()) {
+ASSERT(visible);
+return;
+}
+
 if (!m_delayKeyboardVisibilityChange) {
 m_webPage-showVirtualKeyboard(visible);
 return;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [124227] trunk/Source/WebKit/blackberry

2012-07-31 Thread mifenton

Title: [124227] trunk/Source/WebKit/blackberry








Revision 124227
Author mifen...@rim.com
Date 2012-07-31 11:43:02 -0700 (Tue, 31 Jul 2012)


Log Message
[BlackBerry] Fix crash in InputHandler spell checking.
https://bugs.webkit.org/show_bug.cgi?id=92763

Reviewed by Antonio Gomes.

PR 185574.

Fix crash in getSpellChecker by guarding the calling paths
to ensure that m_currentFocusElement is valid.

Also add ASSERTs for previous crash.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
(BlackBerry::WebKit::InputHandler::spellCheckingRequestCancelled):
(BlackBerry::WebKit::InputHandler::getSpellChecker):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (124226 => 124227)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-31 18:31:41 UTC (rev 124226)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-31 18:43:02 UTC (rev 124227)
@@ -1,3 +1,22 @@
+2012-07-31  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Fix crash in InputHandler spell checking.
+https://bugs.webkit.org/show_bug.cgi?id=92763
+
+Reviewed by Antonio Gomes.
+
+PR 185574.
+
+Fix crash in getSpellChecker by guarding the calling paths
+to ensure that m_currentFocusElement is valid.
+
+Also add ASSERTs for previous crash.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
+(BlackBerry::WebKit::InputHandler::spellCheckingRequestCancelled):
+(BlackBerry::WebKit::InputHandler::getSpellChecker):
+
 2012-07-31  Genevieve Mak  g...@rim.com
 
 Send an onContextMenu event to the page content


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (124226 => 124227)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-31 18:31:41 UTC (rev 124226)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-31 18:43:02 UTC (rev 124227)
@@ -577,7 +577,7 @@
 
 void InputHandler::spellCheckingRequestProcessed(int32_t transactionId, spannable_string_t* spannableString)
 {
-if (!spannableString) {
+if (!spannableString || !isActiveTextEdit()) {
 spellCheckingRequestCancelled(transactionId, false /* isSequenceId */);
 return;
 }
@@ -625,6 +625,9 @@
 
 void InputHandler::spellCheckingRequestCancelled(int32_t id, bool isSequenceId)
 {
+if (!isActiveTextEdit())
+return;
+
 int32_t sequenceId = isSequenceId ? id : convertTransactionIdToSequenceId(id);
 SpellChecker* sp = getSpellChecker();
 if (!sp) {
@@ -636,6 +639,9 @@
 
 SpellChecker* InputHandler::getSpellChecker()
 {
+ASSERT(m_currentFocusElement);
+ASSERT(m_currentFocusElement-document());
+
 if (Frame* frame = m_currentFocusElement-document()-frame())
 if (Editor* editor = frame-editor())
 return editor-spellChecker();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [124050] trunk/Source/WebKit/blackberry

2012-07-30 Thread mifenton

Title: [124050] trunk/Source/WebKit/blackberry








Revision 124050
Author mifen...@rim.com
Date 2012-07-30 10:48:34 -0700 (Mon, 30 Jul 2012)


Log Message
[BlackBerry] Optimize the generation of selection details generation.
https://bugs.webkit.org/show_bug.cgi?id=92522

Reviewed by Antonio Gomes.

PR 179264.

Reduce the number of times we generate selection details notifications.

This removes several notifications that are handled by the standard
notification path and makes skipping duplicate notifications the default
so that only those that must generate a response do.

Reviewed Internally by Gen Mak.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::notifyTransformedContentsSizeChanged):
(BlackBerry::WebKit::WebPagePrivate::updateDelegatedOverlays):
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::setElementUnfocused):
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
(BlackBerry::WebKit::SelectionHandler::setSelection):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
* WebKitSupport/SelectionHandler.h:
(SelectionHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (124049 => 124050)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-07-30 17:46:47 UTC (rev 124049)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-07-30 17:48:34 UTC (rev 124050)
@@ -2085,7 +2085,6 @@
 const IntSize size = transformedContentsSize();
 m_backingStore-d-contentsSizeChanged(size);
 m_client-contentsSizeChanged(size);
-m_selectionHandler-selectionPositionChanged();
 }
 
 void WebPagePrivate::notifyTransformedScrollChanged()
@@ -3392,7 +3391,7 @@
 if (Platform::webKitThreadMessageClient()-isCurrentThread()) {
 // Must be called on the WebKit thread.
 if (m_selectionHandler-isSelectionActive())
-m_selectionHandler-selectionPositionChanged(true /* visualChangeOnly */);
+m_selectionHandler-selectionPositionChanged();
 if (m_inspectorOverlay)
 m_inspectorOverlay-update();
 


Modified: trunk/Source/WebKit/blackberry/ChangeLog (124049 => 124050)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-30 17:46:47 UTC (rev 124049)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-30 17:48:34 UTC (rev 124050)
@@ -1,3 +1,33 @@
+2012-07-30  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Optimize the generation of selection details generation.
+https://bugs.webkit.org/show_bug.cgi?id=92522
+
+Reviewed by Antonio Gomes.
+
+PR 179264.
+
+Reduce the number of times we generate selection details notifications.
+
+This removes several notifications that are handled by the standard
+notification path and makes skipping duplicate notifications the default
+so that only those that must generate a response do.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPagePrivate::notifyTransformedContentsSizeChanged):
+(BlackBerry::WebKit::WebPagePrivate::updateDelegatedOverlays):
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::setElementUnfocused):
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
+(BlackBerry::WebKit::SelectionHandler::setSelection):
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+* WebKitSupport/SelectionHandler.h:
+(SelectionHandler):
+
 2012-07-30  Robin Cao  robin@torchmobile.com.cn
 
 [BlackBerry] Adapt to changes in the SharedArray platform API


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (124049 => 124050)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-30 17:46:47 UTC (rev 124049)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-30 17:48:34 UTC (rev 124050)
@@ -659,7 +659,6 @@
 notifyClientOfKeyboardVisibilityChange(false);
 
 m_webPage-m_client-inputFocusLost();
-m_webPage-m_selectionHandler-selectionPositionChanged();
 
 // If the frame selection isn't focused, focus it.
 if (!m_currentFocusElement-document()-frame()-selection()-isFocused())


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (124049 => 124050)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-07-30 17:46:47 UTC (rev 124049)
+++

[webkit-changes] [123784] trunk/Source/WebKit/blackberry

2012-07-26 Thread mifenton

Title: [123784] trunk/Source/WebKit/blackberry








Revision 123784
Author mifen...@rim.com
Date 2012-07-26 13:02:06 -0700 (Thu, 26 Jul 2012)


Log Message
[BlackBerry] InputHandler failure logs should be logAlways and critical.
https://bugs.webkit.org/show_bug.cgi?id=92403

Reviewed by Rob Buis.

Update Log level for failures and fix mask in log.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::convertStringToWchar):
(BlackBerry::WebKit::convertStringToWcharVector):
(BlackBerry::WebKit::convertSpannableStringToString):
(BlackBerry::WebKit::InputHandler::spannableTextInRange):
(BlackBerry::WebKit::InputHandler::setTextAttributes):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (123783 => 123784)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 19:56:26 UTC (rev 123783)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 20:02:06 UTC (rev 123784)
@@ -1,3 +1,21 @@
+2012-07-26  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] InputHandler failure logs should be logAlways and critical.
+https://bugs.webkit.org/show_bug.cgi?id=92403
+
+Reviewed by Rob Buis.
+
+Update Log level for failures and fix mask in log.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::convertStringToWchar):
+(BlackBerry::WebKit::convertStringToWcharVector):
+(BlackBerry::WebKit::convertSpannableStringToString):
+(BlackBerry::WebKit::InputHandler::spannableTextInRange):
+(BlackBerry::WebKit::InputHandler::setTextAttributes):
+
 2012-07-26  Arvid Nilsson  anils...@rim.com
 
 [BlackBerry] Refactor BackingStorePrivate::BackingStorePrivate::clearAndUpdateTileOfNotRenderedRegion() to avoid touching tile frontbuffer


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (123783 => 123784)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-26 19:56:26 UTC (rev 123783)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-26 20:02:06 UTC (rev 123784)
@@ -433,7 +433,7 @@
 // wchar_t strings sent to IMF are 32 bit so casting to UChar32 is safe.
 u_strToUTF32(reinterpret_castUChar32*(dest), destCapacity, destLength, string.characters(), string.length(), ec);
 if (ec) {
-InputLog(LogLevelInfo, InputHandler::convertStringToWchar Error converting string ec (%d)., ec);
+logAlways(LogLevelCritical, InputHandler::convertStringToWchar Error converting string ec (%d)., ec);
 destLength = 0;
 return false;
 }
@@ -449,7 +449,7 @@
 return true;
 
 if (!wcharString.tryReserveCapacity(length + 1)) {
-logAlways(LogLevelWarn, InputHandler::convertStringToWcharVector Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::convertStringToWcharVector Cannot allocate memory for string.\n);
 return false;
 }
 
@@ -469,7 +469,7 @@
 WTF::VectorUChar dest;
 int destCapacity = (src-length * 2) + 1;
 if (!dest.tryReserveCapacity(destCapacity)) {
-logAlways(LogLevelWarn, InputHandler::convertSpannableStringToString Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::convertSpannableStringToString Cannot allocate memory for string.\n);
 return String();
 }
 
@@ -478,7 +478,7 @@
 // wchar_t strings sent from IMF are 32 bit so casting to UChar32 is safe.
 u_strFromUTF32(dest.data(), destCapacity, destLength, reinterpret_castUChar32*(src-str), src-length, ec);
 if (ec) {
-InputLog(LogLevelInfo, InputHandler::convertSpannableStringToString Error converting string ec (%d)., ec);
+logAlways(LogLevelCritical, InputHandler::convertSpannableStringToString Error converting string ec (%d)., ec);
 return String();
 }
 dest.resize(destLength);
@@ -1471,19 +1471,20 @@
 
 spannable_string_t* pst = (spannable_string_t*)malloc(sizeof(spannable_string_t));
 if (!pst) {
-InputLog(LogLevelInfo, InputHandler::spannableTextInRange error allocating spannable string.);
+logAlways(LogLevelCritical, InputHandler::spannableTextInRange error allocating spannable string.);
 return 0;
 }
 
 pst-str = (wchar_t*)malloc(sizeof(wchar_t) * (length + 1));
 if (!pst-str) {
-InputLog(LogLevelInfo, InputHandler::spannableTextInRange Cannot allocate memory for string.\n);
+logAlways(LogLevelCritical, InputHandler::spannableTextInRange Cannot allocate memory for string.\n);
 free(pst);
 return 0;
 }
 
 int stringLength = 0;
 if (!convertStringToWchar(textString, pst-str, length + 1, stringLength)) {
+logAlways(LogLevelCritical, InputHandler::spannableTextInRange failed to convert string.\n);

[webkit-changes] [123787] trunk/Source/WebKit/blackberry

2012-07-26 Thread mifenton

Title: [123787] trunk/Source/WebKit/blackberry








Revision 123787
Author mifen...@rim.com
Date 2012-07-26 13:19:39 -0700 (Thu, 26 Jul 2012)


Log Message
[BlackBerry] Add timing logs to SelectionHandler.
https://bugs.webkit.org/show_bug.cgi?id=92404

Reviewed by Rob Buis.

Add selection timing logs.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setSelection):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
* WebKitSupport/SelectionHandler.h:
(SelectionHandler):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (123786 => 123787)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 20:15:53 UTC (rev 123786)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 20:19:39 UTC (rev 123787)
@@ -1,5 +1,22 @@
 2012-07-26  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Add timing logs to SelectionHandler.
+https://bugs.webkit.org/show_bug.cgi?id=92404
+
+Reviewed by Rob Buis.
+
+Add selection timing logs.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::setSelection):
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+* WebKitSupport/SelectionHandler.h:
+(SelectionHandler):
+
+2012-07-26  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] InputHandler failure logs should be logAlways and critical.
 https://bugs.webkit.org/show_bug.cgi?id=92403
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (123786 => 123787)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-07-26 20:15:53 UTC (rev 123786)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-07-26 20:19:39 UTC (rev 123787)
@@ -45,6 +45,7 @@
 // Note: This generates a lot of logs when dumping rects lists. It will seriously
 // impact performance. Do not enable this during performance tests.
 #define SHOWDEBUG_SELECTIONHANDLER 0
+#define SHOWDEBUG_SELECTIONHANDLER_TIMING 0
 
 using namespace BlackBerry::Platform;
 using namespace WebCore;
@@ -55,6 +56,12 @@
 #define DEBUG_SELECTION(severity, format, ...)
 #endif // SHOWDEBUG_SELECTIONHANDLER
 
+#if SHOWDEBUG_SELECTIONHANDLER_TIMING
+#define DEBUG_SELECTION_TIMING(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
+#else
+#define DEBUG_SELECTION_TIMING(severity, format, ...)
+#endif // SHOWDEBUG_SELECTIONHANDLER_TIMING
+
 namespace BlackBerry {
 namespace WebKit {
 
@@ -448,6 +455,10 @@
 Frame* focusedFrame = m_webPage-focusedOrMainFrame();
 FrameSelection* controller = focusedFrame-selection();
 
+#if SHOWDEBUG_SELECTIONHANDLER_TIMING
+m_timer.start();
+#endif
+
 DEBUG_SELECTION(LogLevelInfo, SelectionHandler::setSelection adjusted points %d, %d, %d, %d, start.x(), start.y(), end.x(), end.y());
 
 // Note that IntPoint(-1, -1) is being our sentinel so far for
@@ -858,6 +869,8 @@
 else if (!m_selectionActive)
 return;
 
+DEBUG_SELECTION_TIMING(LogLevelInfo, SelectionHandler::selectionPositionChanged starting at %f, m_timer.elapsed());
+
 WebCore::IntRect startCaret;
 WebCore::IntRect endCaret;
 
@@ -929,6 +942,7 @@
 m_webPage-m_selectionOverlay-draw(visibleSelectionRegion);
 
 m_webPage-m_client-notifySelectionDetailsChanged(startCaret, endCaret, visibleSelectionRegion, inputNodeOverridesTouch());
+DEBUG_SELECTION_TIMING(LogLevelInfo, SelectionHandler::selectionPositionChanged completed at %f, m_timer.elapsed());
 }
 
 // NOTE: This function is not in WebKit coordinates.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h (123786 => 123787)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h	2012-07-26 20:15:53 UTC (rev 123786)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h	2012-07-26 20:19:39 UTC (rev 123787)
@@ -21,6 +21,7 @@
 
 #include BlackBerryPlatformIntRectRegion.h
 #include BlackBerryPlatformPrimitives.h
+#include BlackBerryPlatformStopWatch.h
 #include TextGranularity.h
 
 #include wtf/Vector.h
@@ -89,6 +90,8 @@
 bool m_caretActive;
 bool m_lastUpdatedEndPointIsValid;
 BlackBerry::Platform::IntRectRegion m_lastSelectionRegion;
+
+BlackBerry::Platform::StopWatch m_timer;
 };
 
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [123797] trunk/Source/WebKit/blackberry

2012-07-26 Thread mifenton

Title: [123797] trunk/Source/WebKit/blackberry








Revision 123797
Author mifen...@rim.com
Date 2012-07-26 15:03:48 -0700 (Thu, 26 Jul 2012)


Log Message
[BlackBerry] Improve the logs in Selection Handler.
https://bugs.webkit.org/show_bug.cgi?id=92405

Reviewed by Rob Buis.

Clean up selection logging, fix priority and style
of helper function.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::cancelSelection):
(BlackBerry::WebKit::SelectionHandler::shouldUpdateSelectionOrCaretForPoint):
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
(BlackBerry::WebKit::SelectionHandler::setSelection):
(BlackBerry::WebKit::SelectionHandler::selectObject):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (123796 => 123797)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 21:46:16 UTC (rev 123796)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-26 22:03:48 UTC (rev 123797)
@@ -1,5 +1,27 @@
 2012-07-26  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Improve the logs in Selection Handler.
+https://bugs.webkit.org/show_bug.cgi?id=92405
+
+Reviewed by Rob Buis.
+
+Clean up selection logging, fix priority and style
+of helper function.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::cancelSelection):
+(BlackBerry::WebKit::SelectionHandler::shouldUpdateSelectionOrCaretForPoint):
+(BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+(BlackBerry::WebKit::SelectionHandler::updateOrHandleInputSelection):
+(BlackBerry::WebKit::SelectionHandler::setSelection):
+(BlackBerry::WebKit::SelectionHandler::selectObject):
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):
+
+2012-07-26  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Add timing logs to SelectionHandler.
 https://bugs.webkit.org/show_bug.cgi?id=92404
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (123796 => 123797)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-07-26 21:46:16 UTC (rev 123796)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-07-26 22:03:48 UTC (rev 123797)
@@ -51,15 +51,15 @@
 using namespace WebCore;
 
 #if SHOWDEBUG_SELECTIONHANDLER
-#define DEBUG_SELECTION(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
+#define SelectionLog(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
 #else
-#define DEBUG_SELECTION(severity, format, ...)
+#define SelectionLog(severity, format, ...)
 #endif // SHOWDEBUG_SELECTIONHANDLER
 
 #if SHOWDEBUG_SELECTIONHANDLER_TIMING
-#define DEBUG_SELECTION_TIMING(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
+#define SelectionTimingLog(severity, format, ...) logAlways(severity, format, ## __VA_ARGS__)
 #else
-#define DEBUG_SELECTION_TIMING(severity, format, ...)
+#define SelectionTimingLog(severity, format, ...)
 #endif // SHOWDEBUG_SELECTIONHANDLER_TIMING
 
 namespace BlackBerry {
@@ -82,7 +82,7 @@
 m_selectionActive = false;
 m_lastSelectionRegion = IntRectRegion();
 
-DEBUG_SELECTION(LogLevelInfo, SelectionHandler::cancelSelection);
+SelectionLog(LogLevelInfo, SelectionHandler::cancelSelection);
 
 if (m_webPage-m_inputHandler-isInputMode())
 m_webPage-m_inputHandler-cancelSelection();
@@ -212,7 +212,7 @@
 bool aboveCaret = point.y()  caretRect.y();
 bool belowCaret = point.y() = caretRect.maxY();
 
-DEBUG_SELECTION(LogLevelInfo, SelectionHandler::shouldUpdateSelectionOrCaretForPoint multiline = %s above = %s below = %s first line = %s last line = %s start = %s \n
+SelectionLog(LogLevelInfo, SelectionHandler::shouldUpdateSelectionOrCaretForPoint multiline = %s above = %s below = %s first line = %s last line = %s start = %s
 , m_webPage-m_inputHandler-isMultilineInputMode() ? true : false, aboveCaret ? true : false, belowCaret ? true : false
 , inSameLine(currentSelection.visibleStart(), startOfEditableContent(currentSelection.visibleStart())) ? true : false
 , inSameLine(currentSelection.visibleEnd(), endOfEditableContent(currentSelection.visibleEnd())) ? true : false
@@ -235,7 +235,7 @@
 
 m_caretActive = true;
 
-DEBUG_SELECTION(LogLevelInfo, SelectionHandler::setCaretPosition requested point %d, %d, position.x(), position.y());
+SelectionLog(LogLevelInfo,

[webkit-changes] [123512] trunk/Source/WebKit/blackberry

2012-07-24 Thread mifenton

Title: [123512] trunk/Source/WebKit/blackberry








Revision 123512
Author mifen...@rim.com
Date 2012-07-24 12:59:45 -0700 (Tue, 24 Jul 2012)


Log Message
Throttle calls to request the virtual keyboard be shown.
https://bugs.webkit.org/show_bug.cgi?id=92138

Reviewed by Rob Buis.

PR 178465.

Do not request keyboard visibility change when
we are actively processing an input event.

Reviewed Internally by Gen Mak.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::focusedNodeChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (123511 => 123512)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-24 19:48:07 UTC (rev 123511)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-24 19:59:45 UTC (rev 123512)
@@ -1,3 +1,20 @@
+2012-07-24  Mike Fenton  mifen...@rim.com
+
+Throttle calls to request the virtual keyboard be shown.
+https://bugs.webkit.org/show_bug.cgi?id=92138
+
+Reviewed by Rob Buis.
+
+PR 178465.
+
+Do not request keyboard visibility change when
+we are actively processing an input event.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::focusedNodeChanged):
+
 2012-07-24  Joshua Netterfield  jnetterfi...@rim.com
 
 [BlackBerry] Update about:config lists


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (123511 => 123512)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-24 19:48:07 UTC (rev 123511)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-24 19:59:45 UTC (rev 123512)
@@ -360,7 +360,8 @@
 Node* node = frame-document()-focusedNode();
 
 if (isActiveTextEdit()  m_currentFocusElement == node) {
-notifyClientOfKeyboardVisibilityChange(true);
+if (!processingChange())
+notifyClientOfKeyboardVisibilityChange(true);
 return;
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [122599] trunk/Source/WebKit/blackberry

2012-07-13 Thread mifenton

Title: [122599] trunk/Source/WebKit/blackberry








Revision 122599
Author mifen...@rim.com
Date 2012-07-13 10:23:16 -0700 (Fri, 13 Jul 2012)


Log Message
[BlackBerry] Add support for attributes to define keyboard and enter key type on the Virtual Keyboard
https://bugs.webkit.org/show_bug.cgi?id=91248

Reviewed by Antonio Gomes.

PR 174733.

Add data-blackberry-virtual-keyboard-type and
data-blackberry-virtual-keyboard-enter-key to
enable configuration of the desired virtual keyboard
using element attributes.

Reviewed Internally by Gen Mak.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::convertStringToKeyboardType):
(WebKit):
(BlackBerry::WebKit::keyboardTypeAttribute):
(BlackBerry::WebKit::convertStringToKeyboardEnterKeyType):
(BlackBerry::WebKit::keyboardEnterKeyTypeAttribute):
(BlackBerry::WebKit::InputHandler::setElementFocused):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (122598 => 122599)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-07-13 17:19:28 UTC (rev 122598)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-07-13 17:23:16 UTC (rev 122599)
@@ -135,7 +135,7 @@
 virtual void notifyContentRendered(const Platform::IntRect) = 0;
 virtual void resizeSurfaceIfNeeded() = 0;
 
-virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle) = 0;
+virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle, Platform::VirtualKeyboardType, Platform::VirtualKeyboardEnterKeyType) = 0;
 virtual void inputFocusLost() = 0;
 virtual void inputTextChanged() = 0;
 virtual void inputSelectionChanged(unsigned selectionStart, unsigned selectionEnd) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (122598 => 122599)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-13 17:19:28 UTC (rev 122598)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-13 17:23:16 UTC (rev 122599)
@@ -1,3 +1,28 @@
+2012-07-13  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add support for attributes to define keyboard and enter key type on the Virtual Keyboard
+https://bugs.webkit.org/show_bug.cgi?id=91248
+
+Reviewed by Antonio Gomes.
+
+PR 174733.
+
+Add data-blackberry-virtual-keyboard-type and
+data-blackberry-virtual-keyboard-enter-key to
+enable configuration of the desired virtual keyboard
+using element attributes.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::convertStringToKeyboardType):
+(WebKit):
+(BlackBerry::WebKit::keyboardTypeAttribute):
+(BlackBerry::WebKit::convertStringToKeyboardEnterKeyType):
+(BlackBerry::WebKit::keyboardEnterKeyTypeAttribute):
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+
 2012-07-13  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] resetBitmapZoomScale called while zooming preventing pinch zoom


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (122598 => 122599)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-13 17:19:28 UTC (rev 122598)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-07-13 17:23:16 UTC (rev 122599)
@@ -32,6 +32,7 @@
 #include FocusController.h
 #include Frame.h
 #include FrameView.h
+#include HTMLFormElement.h
 #include HTMLInputElement.h
 #include HTMLNames.h
 #include HTMLOptGroupElement.h
@@ -212,6 +213,117 @@
 return DEFAULT_STYLE;
 }
 
+static VirtualKeyboardType convertStringToKeyboardType(const AtomicString string)
+{
+DEFINE_STATIC_LOCAL(AtomicString, Default, (default));
+DEFINE_STATIC_LOCAL(AtomicString, Url, (url));
+DEFINE_STATIC_LOCAL(AtomicString, Email, (email));
+DEFINE_STATIC_LOCAL(AtomicString, Password, (password));
+DEFINE_STATIC_LOCAL(AtomicString, Web, (web));
+DEFINE_STATIC_LOCAL(AtomicString, Number, (number));
+DEFINE_STATIC_LOCAL(AtomicString, Symbol, (symbol));
+DEFINE_STATIC_LOCAL(AtomicString, Phone, (phone));
+DEFINE_STATIC_LOCAL(AtomicString, Pin, (pin));
+DEFINE_STATIC_LOCAL(AtomicString, Hex, (hexadecimal));
+
+if (string.isEmpty())
+return VKBTypeNotSet;
+if (equalIgnoringCase(string, Default))
+return VKBTypeDefault;
+if (equalIgnoringCase(string, Url))
+return VKBTypeUrl;
+if (equalIgnoringCase(string, Email))
+return VKBTypeEmail;
+if (equalIgnoringCase(string, Password))
+return VKBTypePassword;
+if (equalIgnoringCase(string, Web))
+return VKBTypeWeb;
+if (equalIgnoringCase(string, Number))
+return VKBTypeNumPunc;
+if (equalIgnoringCase(string, Symbol))
+return VKBTypeSymbol;
+if

[webkit-changes] [121460] trunk/Tools

2012-06-28 Thread mifenton

Title: [121460] trunk/Tools








Revision 121460
Author mifen...@rim.com
Date 2012-06-28 13:27:24 -0700 (Thu, 28 Jun 2012)


Log Message
[BlackBerry] Add watchlist options for Blackberry and editing.
https://bugs.webkit.org/show_bug.cgi?id=90193

Unreviewed.

Add BlackBerry and Editing watchlist and monitor them.


* Scripts/webkitpy/common/config/watchlist:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist




Diff

Modified: trunk/Tools/ChangeLog (121459 => 121460)

--- trunk/Tools/ChangeLog	2012-06-28 20:22:57 UTC (rev 121459)
+++ trunk/Tools/ChangeLog	2012-06-28 20:27:24 UTC (rev 121460)
@@ -1,3 +1,14 @@
+2012-06-28  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add watchlist options for Blackberry and editing.
+https://bugs.webkit.org/show_bug.cgi?id=90193
+
+Unreviewed.
+
+Add BlackBerry and Editing watchlist and monitor them.
+
+* Scripts/webkitpy/common/config/watchlist:
+
 2012-06-28  Tim Horton  timothy_hor...@apple.com
 
 Unreviewed, upgrade myself to a reviewer!


Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (121459 => 121460)

--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-06-28 20:22:57 UTC (rev 121459)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-06-28 20:27:24 UTC (rev 121460)
@@ -157,13 +157,35 @@
 },
 MathML: {
 filename: r(Source|LayoutTests|Websites)/.*mathml,
-}
+},
+Editing: {
+filename: rSource/WebCore/editing/,
+},
+BlackBerry: {
+filename: rSource/WebKit/blackberry/
+r|Source/WebCore/page/blackberry
+r|Source/WebCore/history/blackberry
+r|Source/WebCore/plugins/blackberry
+r|Source/WebCore/editing/blackberry
+r|Source/WebCore/Resources/blackberry
+r|Source/WebCore/platform/image-decoders/blackberry
+r|Source/WebCore/platform/blackberry
+r|Source/WebCore/platform/text/blackberry
+r|Source/WebCore/platform/network/blackberry
+r|Source/WebCore/platform/graphics/blackberry
+r|Source/WTF/wtf/blackberry
+r|ManualTests/blackberry
+r|Tools/DumpRenderTree/blackberry
+r|LayoutTests/platform/blackberry,
+},
+
 },
 CC_RULES: {
 # Note: All email addresses listed must be registered with bugzilla.
 # Specifically, le...@chromium.org and levin+thread...@chromium.org are
 # two different accounts as far as bugzilla is concerned.
 AppleMacPublicApi: [ timo...@apple.com ],
+BlackBerry: [ mifen...@rim.com ],
 CMake: [ rak...@webkit.org, ],
 CSS: [ alexis.men...@openbossa.org, macpher...@chromium.org, cmarc...@webkit.org ],
 ChromiumDumpRenderTree: [ tk...@chromium.org, ],
@@ -171,7 +193,8 @@
 ChromiumPublicApi: [ aba...@webkit.org, dglaz...@chromium.org, fi...@chromium.org, jam...@chromium.org, tkent+wk...@chromium.org ],
 DOMAttributes: [ cmarc...@webkit.org, ],
 EFL: [ rak...@webkit.org, ],
-Forms: [ tk...@chromium.org, ],
+Editing: [ mifen...@rim.com ],
+Forms: [ tk...@chromium.org, mifen...@rim.com ],
 FrameLoader: [ aba...@webkit.org, jap...@chromium.org, joc...@chromium.org ],
 GStreamerGraphics: [ alexis.men...@openbossa.org, pnorm...@igalia.com, g...@gnome.org, mrobin...@webkit.org ],
 GtkWebKit2PublicAPI: [ cgar...@igalia.com, g...@gnome.org, mrobin...@webkit.org ],






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [121281] trunk/Source/WebKit/blackberry

2012-06-26 Thread mifenton

Title: [121281] trunk/Source/WebKit/blackberry








Revision 121281
Author mifen...@rim.com
Date 2012-06-26 12:52:14 -0700 (Tue, 26 Jun 2012)


Log Message
[BlackBerry] Add WebPage interface for Async spell check.
https://bugs.webkit.org/show_bug.cgi?id=8

Reviewed by Rob Buis.

PR 124517.

Add interface for IMS async spell checking.

Reviewed Internally by Nima Ghanavatian.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::spellCheckingRequestProcessed):
(WebKit):
* Api/WebPage.h:
* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(WebKit):
(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.h
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (121280 => 121281)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-26 19:42:05 UTC (rev 121280)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-26 19:52:14 UTC (rev 121281)
@@ -4510,6 +4510,11 @@
 static_castEditorClientBlackBerry*(d-m_page-editorClient())-enableSpellChecking(enabled);
 }
 
+void WebPage::spellCheckingRequestProcessed(int32_t id, spannable_string_t* spannableString)
+{
+d-m_inputHandler-spellCheckingRequestProcessed(id, spannableString);
+}
+
 class DeferredTaskSelectionCancelled: public DeferredTaskWebPagePrivate::m_wouldCancelSelection {
 public:
 explicit DeferredTaskSelectionCancelled(WebPagePrivate* webPagePrivate)


Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (121280 => 121281)

--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-06-26 19:42:05 UTC (rev 121280)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-06-26 19:52:14 UTC (rev 121281)
@@ -250,6 +250,7 @@
 int32_t commitText(spannable_string_t*, int32_t relativeCursorPosition);
 
 void setSpellCheckingEnabled(bool);
+void spellCheckingRequestProcessed(int32_t id, spannable_string_t*);
 
 void setSelection(const Platform::IntPoint startPoint, const Platform::IntPoint endPoint);
 void setCaretPosition(const Platform::IntPoint);


Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (121280 => 121281)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-06-26 19:42:05 UTC (rev 121280)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-06-26 19:52:14 UTC (rev 121281)
@@ -144,6 +144,8 @@
 virtual void checkSpellingOfString(const unsigned short* text, int length, int misspellingLocation, int misspellingLength) = 0;
 virtual void requestSpellingSuggestionsForString(unsigned start, unsigned end) = 0;
 
+virtual int32_t checkSpellingOfStringAsync(wchar_t* text, int length) = 0;
+
 virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion, bool overrideTouchHandling = false) = 0;
 virtual void cancelSelectionVisuals() = 0;
 virtual void notifySelectionHandlesReversed() = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (121280 => 121281)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-26 19:42:05 UTC (rev 121280)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-26 19:52:14 UTC (rev 121281)
@@ -1,3 +1,27 @@
+2012-06-26  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add WebPage interface for Async spell check.
+https://bugs.webkit.org/show_bug.cgi?id=8
+
+Reviewed by Rob Buis.
+
+PR 124517.
+
+Add interface for IMS async spell checking.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPage::spellCheckingRequestProcessed):
+(WebKit):
+* Api/WebPage.h:
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(WebKit):
+(BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+
 2012-06-26  Jonathan Dong  jonathan.d...@torchmobile.com.cn
 
 [BlackBerry] Limit session storage quota to 5MB by default


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (121280 => 121281)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-26 19:42:05 UTC (rev 121280)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-26 19:52:14 UTC (rev 121281)
@@ -404,6 +404,14 @@
 sendLearnTextDetails(textInField);
 }
 
+
+void InputHandler::spellCheckingRequestProcessed(int32_t id, spannable_string_t* spannableString)
+{
+UNUSED_PARAM(id);
+UNUSED_PARAM(spannableString);
+// TODO implement.
+}
+
 void InputHandler::setElementUnfocused(bool refocusOccuring)
 {
 if (isActiveTextEdit()) {

[webkit-changes] [120923] trunk/Source/WebKit/blackberry

2012-06-21 Thread mifenton

Title: [120923] trunk/Source/WebKit/blackberry








Revision 120923
Author mifen...@rim.com
Date 2012-06-21 06:39:45 -0700 (Thu, 21 Jun 2012)


Log Message
[BlackBerry] Input mode should adapt automatically to settings changes
https://bugs.webkit.org/show_bug.cgi?id=89595

Reviewed by Antonio Gomes.

PR 167540.

Add helper function to check if input is enabled so that
the override settings can be applied at any time.

Reviewed Internally by Gen Mak.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::setLoadState):
(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::isInputModeEnabled):
(BlackBerry::WebKit::InputHandler::setInputModeEnabled):
(BlackBerry::WebKit::InputHandler::setElementFocused):
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
(BlackBerry::WebKit::InputHandler::handleKeyboardInput):
(BlackBerry::WebKit::InputHandler::setComposingText):
* WebKitSupport/InputHandler.h:
* WebKitSupport/TouchEventHandler.cpp:
(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (120922 => 120923)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-21 13:26:42 UTC (rev 120922)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-21 13:39:45 UTC (rev 120923)
@@ -1021,7 +1021,7 @@
 #endif
 
 // Notify InputHandler of state change.
-m_inputHandler-enableInputMode(false);
+m_inputHandler-setInputModeEnabled(false);
 
 // Set the scroll to origin here and notify the client since we'll be
 // zooming below without any real contents yet thus the contents size
@@ -3967,7 +3967,7 @@
 }
 
 if (mouseEvent.type() == WebCore::PlatformEvent::MousePressed) {
-m_inputHandler-enableInputMode();
+m_inputHandler-setInputModeEnabled();
 if (m_inputHandler-willOpenPopupForNode(node)) {
 // Do not allow any human generated mouse or keyboard events to select options in the list box
 // because we use a pop up dialog to handle the actual selections. This prevents options from


Modified: trunk/Source/WebKit/blackberry/ChangeLog (120922 => 120923)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-21 13:26:42 UTC (rev 120922)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-21 13:39:45 UTC (rev 120923)
@@ -1,3 +1,32 @@
+2012-06-21  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Input mode should adapt automatically to settings changes
+https://bugs.webkit.org/show_bug.cgi?id=89595
+
+Reviewed by Antonio Gomes.
+
+PR 167540.
+
+Add helper function to check if input is enabled so that
+the override settings can be applied at any time.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPagePrivate::setLoadState):
+(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::isInputModeEnabled):
+(BlackBerry::WebKit::InputHandler::setInputModeEnabled):
+(BlackBerry::WebKit::InputHandler::setElementFocused):
+(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
+(BlackBerry::WebKit::InputHandler::handleKeyboardInput):
+(BlackBerry::WebKit::InputHandler::setComposingText):
+* WebKitSupport/InputHandler.h:
+* WebKitSupport/TouchEventHandler.cpp:
+(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
+
 2012-06-20  Jacky Jiang  zhaji...@rim.com
 
 Add a != operator to ViewportArguments


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (120922 => 120923)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-21 13:26:42 UTC (rev 120922)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-06-21 13:39:45 UTC (rev 120923)
@@ -432,21 +432,22 @@
 m_currentFocusElementType = TextEdit;
 }
 
-void InputHandler::enableInputMode(bool inputModeAllowed)
+bool InputHandler::isInputModeEnabled() const
 {
-FocusLog(LogLevelInfo, InputHandler::enableInputMode '%s', override is '%s'
- , inputModeAllowed ? true : false
+// Input mode is enabled when set, or when dump render tree or always show keyboard setting is enabled.
+return m_inputModeEnabled || m_webPage-m_dumpRenderTree || Platform::Settings::get()-alwaysShowKeyboardOnFocus();
+}
+

[webkit-changes] [118369] trunk/Source/WebKit/blackberry

2012-05-24 Thread mifenton

Title: [118369] trunk/Source/WebKit/blackberry








Revision 118369
Author mifen...@rim.com
Date 2012-05-24 07:41:24 -0700 (Thu, 24 May 2012)


Log Message
[BlackBerry] Remove unused API function touchEventCancelAndClearFocusedNode.
https://bugs.webkit.org/show_bug.cgi?id=87379

Reviewed by Antonio Gomes.

Remove unused API, touchEventCancelAndClearFocusedNode.

Reviewed Internally by Gen Mak.

* Api/WebPage.cpp:
* Api/WebPage.h:
* WebKitSupport/TouchEventHandler.cpp:
* WebKitSupport/TouchEventHandler.h:
(TouchEventHandler):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (118368 => 118369)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-05-24 14:38:19 UTC (rev 118368)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-05-24 14:41:24 UTC (rev 118369)
@@ -4098,13 +4098,6 @@
 d-m_touchEventHandler-touchEventCancel();
 }
 
-void WebPage::touchEventCancelAndClearFocusedNode()
-{
-if (d-m_page-defersLoading())
-return;
-d-m_touchEventHandler-touchEventCancelAndClearFocusedNode();
-}
-
 Frame* WebPagePrivate::focusedOrMainFrame() const
 {
 return m_page-focusController()-focusedOrMainFrame();


Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (118368 => 118369)

--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-05-24 14:38:19 UTC (rev 118368)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2012-05-24 14:41:24 UTC (rev 118369)
@@ -134,7 +134,6 @@
 
 // For conversion to mouse events.
 void touchEventCancel();
-void touchEventCancelAndClearFocusedNode();
 bool touchPointAsMouseEvent(const Platform::TouchPoint);
 
 // Returns true if the key stroke was handled by WebKit.


Modified: trunk/Source/WebKit/blackberry/ChangeLog (118368 => 118369)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 14:38:19 UTC (rev 118368)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 14:41:24 UTC (rev 118369)
@@ -1,3 +1,20 @@
+2012-05-24  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Remove unused API function touchEventCancelAndClearFocusedNode.
+https://bugs.webkit.org/show_bug.cgi?id=87379
+
+Reviewed by Antonio Gomes.
+
+Remove unused API, touchEventCancelAndClearFocusedNode.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPage.cpp:
+* Api/WebPage.h:
+* WebKitSupport/TouchEventHandler.cpp:
+* WebKitSupport/TouchEventHandler.h:
+(TouchEventHandler):
+
 2012-05-23  Genevieve Mak  g...@rim.com
 
 Remove minimum and maximum scroll position as they are no


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp (118368 => 118369)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-05-24 14:38:19 UTC (rev 118368)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp	2012-05-24 14:41:24 UTC (rev 118369)
@@ -155,12 +155,6 @@
 m_lastFatFingersResult.reset();
 }
 
-void TouchEventHandler::touchEventCancelAndClearFocusedNode()
-{
-touchEventCancel();
-m_webPage-clearFocusNode();
-}
-
 void TouchEventHandler::touchHoldEvent()
 {
 // This is a hack for our hack that converts the touch pressed event that we've delayed because the user has focused a input field


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h (118368 => 118369)

--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h	2012-05-24 14:38:19 UTC (rev 118368)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h	2012-05-24 14:41:24 UTC (rev 118369)
@@ -37,7 +37,6 @@
 
 bool handleTouchPoint(Platform::TouchPoint);
 void touchEventCancel();
-void touchEventCancelAndClearFocusedNode();
 void touchHoldEvent();
 
 bool shouldSuppressMouseDownOnTouchDown() const;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [118403] trunk/Source/WebKit/blackberry

2012-05-24 Thread mifenton

Title: [118403] trunk/Source/WebKit/blackberry








Revision 118403
Author mifen...@rim.com
Date 2012-05-24 12:29:19 -0700 (Thu, 24 May 2012)


Log Message
[BlackBerry] Padding adjustment for determining the relative distance for a point was backwards.
https://bugs.webkit.org/show_bug.cgi?id=87404

Reviewed by Rob Buis.

Fix padding calculation for handle adjustment.

Reviewed Internally by Mike Lattanzio.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::directionOfPointRelativeToRect):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (118402 => 118403)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 19:27:36 UTC (rev 118402)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 19:29:19 UTC (rev 118403)
@@ -1,5 +1,19 @@
 2012-05-24  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Padding adjustment for determining the relative distance for a point was backwards.
+https://bugs.webkit.org/show_bug.cgi?id=87404
+
+Reviewed by Rob Buis.
+
+Fix padding calculation for handle adjustment.
+
+Reviewed Internally by Mike Lattanzio.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::directionOfPointRelativeToRect):
+
+2012-05-24  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] Remove unused API function touchEventCancelAndClearFocusedNode.
 https://bugs.webkit.org/show_bug.cgi?id=87379
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (118402 => 118403)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-24 19:27:36 UTC (rev 118402)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-24 19:29:19 UTC (rev 118403)
@@ -177,7 +177,7 @@
 
 // Do height movement check first but add padding. We may be off on both x  y axis and only
 // want to move in one direction at a time.
-if (point.y() + (useTopPadding ? verticalPadding : 0)  rect.y())
+if (point.y() - (useTopPadding ? verticalPadding : 0)  rect.y())
 return KEYCODE_UP;
 if (point.y()  rect.maxY() + (useBottomPadding ? verticalPadding : 0))
 return KEYCODE_DOWN;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [118438] trunk/Source/WebKit/blackberry

2012-05-24 Thread mifenton

Title: [118438] trunk/Source/WebKit/blackberry








Revision 118438
Author mifen...@rim.com
Date 2012-05-24 15:37:45 -0700 (Thu, 24 May 2012)


Log Message
[BlackBerry] InputHandler can hold a ref on an object when document is cleared.
https://bugs.webkit.org/show_bug.cgi?id=87412

Reviewed by Rob Buis.

PR 145234.

When the document data is cleared, notify the InputHandler
of the associated frame being unloaded.

Reviewed Internally by Nima Ghanavatian.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::clearDocumentData):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (118437 => 118438)

--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-05-24 22:33:27 UTC (rev 118437)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-05-24 22:37:45 UTC (rev 118438)
@@ -2385,6 +2385,9 @@
 if (m_inRegionScrollStartingNode  m_inRegionScrollStartingNode-document() == documentGoingAway)
 m_inRegionScrollStartingNode = 0;
 
+if (documentGoingAway-frame())
+m_inputHandler-frameUnloaded(documentGoingAway-frame());
+
 Node* nodeUnderFatFinger = m_touchEventHandler-lastFatFingersResult().node();
 if (nodeUnderFatFinger  nodeUnderFatFinger-document() == documentGoingAway)
 m_touchEventHandler-resetLastFatFingersResult();


Modified: trunk/Source/WebKit/blackberry/ChangeLog (118437 => 118438)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 22:33:27 UTC (rev 118437)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-24 22:37:45 UTC (rev 118438)
@@ -1,3 +1,20 @@
+2012-05-24  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] InputHandler can hold a ref on an object when document is cleared.
+https://bugs.webkit.org/show_bug.cgi?id=87412
+
+Reviewed by Rob Buis.
+
+PR 145234.
+
+When the document data is cleared, notify the InputHandler
+of the associated frame being unloaded.
+
+Reviewed Internally by Nima Ghanavatian.
+
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPagePrivate::clearDocumentData):
+
 2012-05-24  Crystal Zhang  haizh...@rim.com
 
 [BlackBerry] Implement select popup and remove old hook to air popup






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [117638] trunk/Source/WebKit/blackberry

2012-05-18 Thread mifenton

Title: [117638] trunk/Source/WebKit/blackberry








Revision 117638
Author mifen...@rim.com
Date 2012-05-18 14:50:47 -0700 (Fri, 18 May 2012)


Log Message
[BlackBerry] Validation of Last Fat Finger result is needed for selection.
https://bugs.webkit.org/show_bug.cgi?id=86888

Reviewed by Antonio Gomes.

PR 128393.

Cached FatFingersResults must be validatible against
the desired request to ensure the result is both for
the same point and of the same type.

* WebKitSupport/FatFingers.h:
(WebKit):
(FatFingersResult):
(BlackBerry::WebKit::FatFingersResult::FatFingersResult):
(BlackBerry::WebKit::FatFingersResult::reset):
(BlackBerry::WebKit::FatFingersResult::resultMatches):
(BlackBerry::WebKit::FatFingersResult::originPosition):
(BlackBerry::WebKit::FatFingersResult::adjustedPosition):
(BlackBerry::WebKit::FatFingersResult::positionWasAdjusted):
(BlackBerry::WebKit::FatFingersResult::isTextInput):
(BlackBerry::WebKit::FatFingersResult::isValid):
(BlackBerry::WebKit::FatFingersResult::node):
(BlackBerry::WebKit::FatFingersResult::nodeAsElementIfApplicable):
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectAtPoint):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (117637 => 117638)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-18 21:49:37 UTC (rev 117637)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-18 21:50:47 UTC (rev 117638)
@@ -1,3 +1,32 @@
+2012-05-18  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Validation of Last Fat Finger result is needed for selection.
+https://bugs.webkit.org/show_bug.cgi?id=86888
+
+Reviewed by Antonio Gomes.
+
+PR 128393.
+
+Cached FatFingersResults must be validatible against
+the desired request to ensure the result is both for
+the same point and of the same type.
+
+* WebKitSupport/FatFingers.h:
+(WebKit):
+(FatFingersResult):
+(BlackBerry::WebKit::FatFingersResult::FatFingersResult):
+(BlackBerry::WebKit::FatFingersResult::reset):
+(BlackBerry::WebKit::FatFingersResult::resultMatches):
+(BlackBerry::WebKit::FatFingersResult::originPosition):
+(BlackBerry::WebKit::FatFingersResult::adjustedPosition):
+(BlackBerry::WebKit::FatFingersResult::positionWasAdjusted):
+(BlackBerry::WebKit::FatFingersResult::isTextInput):
+(BlackBerry::WebKit::FatFingersResult::isValid):
+(BlackBerry::WebKit::FatFingersResult::node):
+(BlackBerry::WebKit::FatFingersResult::nodeAsElementIfApplicable):
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::selectAtPoint):
+
 2012-05-18  MORITA Hajime  morr...@google.com
 
 https://bugs.webkit.org/show_bug.cgi?id=85515


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h (117637 => 117638)

--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h	2012-05-18 21:49:37 UTC (rev 117637)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h	2012-05-18 21:50:47 UTC (rev 117638)
@@ -45,15 +45,84 @@
 namespace WebKit {
 
 class WebPagePrivate;
-class FatFingers;
+class FatFingersResult;
 class TouchEventHandler;
 
+
+class FatFingers {
+public:
+enum TargetType { ClickableElement, Text };
+
+FatFingers(WebPagePrivate* webpage, const WebCore::IntPoint contentPos, TargetType);
+~FatFingers();
+
+const FatFingersResult findBestPoint();
+
+#if DEBUG_FAT_FINGERS
+// These debug vars are all in content coordinates. They are public so
+// they can be read from BackingStore, which will draw a visible rect
+// around the fat fingers area.
+static WebCore::IntRect m_debugFatFingerRect;
+static WebCore::IntPoint m_debugFatFingerClickPosition;
+static WebCore::IntPoint m_debugFatFingerAdjustedPosition;
+#endif
+
+private:
+enum MatchingApproachForClickable { ClickableByDefault = 0, MadeClickableByTheWebpage, Done };
+
+typedef std::pairWebCore::Node*, Platform::IntRectRegion IntersectingRegion;
+
+enum CachedResultsStrategy { GetFromRenderTree = 0, GetFromCache };
+CachedResultsStrategy cachingStrategy() const;
+typedef HashMapRefPtrWebCore::Document, ListHashSetRefPtrWebCore::Node   CachedRectHitTestResults;
+
+bool checkFingerIntersection(const Platform::IntRectRegion,
+ const Platform::IntRectRegion remainingFingerRegion,
+ WebCore::Node*,
+ VectorIntersectingRegion intersectingRegions);
+
+bool findIntersectingRegions(WebCore::Document*,
+ VectorIntersectingRegion intersectingRegions,
+ Platform::IntRectRegion remainingFingerRegion);
+
+bool

[webkit-changes] [117458] trunk/Source/WebKit/blackberry

2012-05-17 Thread mifenton

Title: [117458] trunk/Source/WebKit/blackberry








Revision 117458
Author mifen...@rim.com
Date 2012-05-17 10:20:07 -0700 (Thu, 17 May 2012)


Log Message
[BlackBerry] Build fix, SelectionHandler extra debug logs
https://bugs.webkit.org/show_bug.cgi?id=86743

Reviewed by Antonio Gomes.

Add include for BlackBerryPlatformLog to SelectionHandler.cpp

* WebKitSupport/SelectionHandler.cpp:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (117457 => 117458)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 17:05:36 UTC (rev 117457)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 17:20:07 UTC (rev 117458)
@@ -1,3 +1,15 @@
+2012-05-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Build fix, SelectionHandler extra debug logs
+https://bugs.webkit.org/show_bug.cgi?id=86743
+
+Reviewed by Antonio Gomes.
+
+Add include for BlackBerryPlatformLog to SelectionHandler.cpp
+
+
+* WebKitSupport/SelectionHandler.cpp:
+
 2012-05-16  Yongxin Dai  yo...@rim.com
 
 [BlackBerry] The FCC shows up on an empty input field


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (117457 => 117458)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 17:05:36 UTC (rev 117457)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 17:20:07 UTC (rev 117458)
@@ -45,6 +45,7 @@
 #include visible_units.h
 
 #include BlackBerryPlatformKeyboardEvent.h
+#include BlackBerryPlatformLog.h
 
 #include sys/keycodes.h
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [117483] trunk/Source/WebKit/blackberry

2012-05-17 Thread mifenton

Title: [117483] trunk/Source/WebKit/blackberry








Revision 117483
Author mifen...@rim.com
Date 2012-05-17 12:58:35 -0700 (Thu, 17 May 2012)


Log Message
[BlackBerry] expandSelectionToGranularity should only use VisibleSelection and not range.
https://bugs.webkit.org/show_bug.cgi?id=86759

Reviewed by Antonio Gomes.

expandSelectionToGranularity unnecesarily converted the
selection to range and back. Using the selection
directly is preferred.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::expandSelectionToGranularity):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (117482 => 117483)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 19:43:26 UTC (rev 117482)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 19:58:35 UTC (rev 117483)
@@ -1,3 +1,17 @@
+2012-05-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] expandSelectionToGranularity should only use VisibleSelection and not range.
+https://bugs.webkit.org/show_bug.cgi?id=86759
+
+Reviewed by Antonio Gomes.
+
+expandSelectionToGranularity unnecesarily converted the
+selection to range and back. Using the selection
+directly is preferred.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::expandSelectionToGranularity):
+
 2012-05-17  Hironori Bono  hb...@chromium.org
 
 [Refactoring] Move platform-specific code in Editor::respondToChangedSelection to the WebKit layer


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (117482 => 117483)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 19:43:26 UTC (rev 117482)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 19:58:35 UTC (rev 117483)
@@ -598,14 +598,13 @@
 selection = DOMSupport::visibleSelectionForClosestActualWordStart(selection);
 
 selection.expandUsingGranularity(granularity);
-RefPtrRange newRange = selection.toNormalizedRange();
-RefPtrRange oldRange = frame-selection()-selection().toNormalizedRange();
-EAffinity affinity = frame-selection()-affinity();
+selection.setAffinity(frame-selection()-affinity());
 
-if (isInputMode  !frame-editor()-client()-shouldChangeSelectedRange(oldRange.get(), newRange.get(), affinity, false))
+if (isInputMode  !frame-selection()-shouldChangeSelection(selection))
 return false;
 
-return frame-selection()-setSelectedRange(newRange.get(), affinity, true);
+frame-selection()-setSelection(selection);
+return true;
 }
 
 void SelectionHandler::selectObject(const WebCore::IntPoint location, TextGranularity granularity)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [117487] trunk/Source/WebKit/blackberry

2012-05-17 Thread mifenton

Title: [117487] trunk/Source/WebKit/blackberry








Revision 117487
Author mifen...@rim.com
Date 2012-05-17 13:10:35 -0700 (Thu, 17 May 2012)


Log Message
[BlackBerry] Cleanup headers in SelectionHandler.cpp
https://bugs.webkit.org/show_bug.cgi?id=86760

Reviewed by Antonio Gomes.

Clean up includes in SelectionHandler.cpp.

* WebKitSupport/SelectionHandler.cpp:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (117486 => 117487)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 20:08:23 UTC (rev 117486)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-17 20:10:35 UTC (rev 117487)
@@ -1,5 +1,16 @@
 2012-05-17  Mike Fenton  mifen...@rim.com
 
+[BlackBerry] Cleanup headers in SelectionHandler.cpp
+https://bugs.webkit.org/show_bug.cgi?id=86760
+
+Reviewed by Antonio Gomes.
+
+Clean up includes in SelectionHandler.cpp.
+
+* WebKitSupport/SelectionHandler.cpp:
+
+2012-05-17  Mike Fenton  mifen...@rim.com
+
 [BlackBerry] expandSelectionToGranularity should only use VisibleSelection and not range.
 https://bugs.webkit.org/show_bug.cgi?id=86759
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (117486 => 117487)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 20:08:23 UTC (rev 117486)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-17 20:10:35 UTC (rev 117487)
@@ -21,23 +21,15 @@
 
 #include DOMSupport.h
 #include Document.h
-#include Editor.h
-#include EditorClient.h
 #include FatFingers.h
 #include FloatQuad.h
 #include Frame.h
 #include FrameSelection.h
 #include FrameView.h
-#include HTMLAnchorElement.h
-#include HTMLAreaElement.h
 #include HitTestResult.h
 #include InputHandler.h
 #include IntRect.h
-#include Page.h
-#include RenderPart.h
-#include TextGranularity.h
 #include TouchEventHandler.h
-#include WebPage.h
 #include WebPageClient.h
 #include WebPage_p.h
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [116684] trunk/Source/WebKit/blackberry

2012-05-10 Thread mifenton

Title: [116684] trunk/Source/WebKit/blackberry








Revision 116684
Author mifen...@rim.com
Date 2012-05-10 14:01:07 -0700 (Thu, 10 May 2012)


Log Message
Caret node boundary should be adjusted to account for the visible region.
https://bugs.webkit.org/show_bug.cgi?id=86116

Reviewed by Antonio Gomes.

PR 138988.

Update the node bounding box to be clipped and adjusted
for the visible region of the frame.

Reviewed Internally by Gen Mak.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (116683 => 116684)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-10 20:50:43 UTC (rev 116683)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-10 21:01:07 UTC (rev 116684)
@@ -1,3 +1,20 @@
+2012-05-10  Mike Fenton  mifen...@rim.com
+
+Caret node boundary should be adjusted to account for the visible region.
+https://bugs.webkit.org/show_bug.cgi?id=86116
+
+Reviewed by Antonio Gomes.
+
+PR 138988.
+
+Update the node bounding box to be clipped and adjusted
+for the visible region of the frame.
+
+Reviewed Internally by Gen Mak.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):
+
 2012-05-10  Antonio Gomes  ago...@rim.com
 
 [BlackBerry] Assertions and assumptions in BackingStoreClient around m_frame and m_frame-view() are invalid


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (116683 => 116684)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-10 20:50:43 UTC (rev 116683)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-10 21:01:07 UTC (rev 116684)
@@ -955,14 +955,14 @@
 // This function should only reach this point if input mode is active.
 ASSERT(m_webPage-m_inputHandler-isInputMode());
 
+WebCore::IntPoint frameOffset(m_webPage-frameOffset(m_webPage-focusedOrMainFrame()));
+WebCore::IntRect clippingRectForContent(clippingRectForVisibleContent());
 if (m_webPage-focusedOrMainFrame()-selection()-selectionType() == VisibleSelection::CaretSelection) {
-WebCore::IntPoint frameOffset = m_webPage-frameOffset(m_webPage-focusedOrMainFrame());
-
 caretLocation = m_webPage-focusedOrMainFrame()-selection()-selection().visibleStart().absoluteCaretBounds();
 caretLocation.move(frameOffset.x(), frameOffset.y());
 
 // Clip against the containing frame and node boundaries.
-caretLocation.intersect(clippingRectForVisibleContent());
+caretLocation.intersect(clippingRectForContent);
 }
 
 m_caretActive = !caretLocation.isEmpty();
@@ -976,6 +976,19 @@
 bool singleLineInput = !m_webPage-m_inputHandler-isMultilineInputMode();
 WebCore::IntRect nodeBoundingBox = singleLineInput ? m_webPage-m_inputHandler-boundingBoxForInputField() : WebCore::IntRect();
 
+if (!nodeBoundingBox.isEmpty()) {
+nodeBoundingBox.move(frameOffset.x(), frameOffset.y());
+
+// Clip against the containing frame and node boundaries.
+nodeBoundingBox.intersect(clippingRectForContent);
+
+nodeBoundingBox = m_webPage-mapToTransformed(nodeBoundingBox);
+m_webPage-clipToTransformedContentsRect(nodeBoundingBox);
+}
+
+DEBUG_SELECTION(LogLevelInfo, SelectionHandler::single line %s single line bounding box %d, %d, %dx%d,
+singleLineInput ? true : false, nodeBoundingBox.x(), nodeBoundingBox.y(), nodeBoundingBox.width(), nodeBoundingBox.height());
+
 m_webPage-m_client-notifyCaretChanged(caretLocation, m_webPage-m_touchEventHandler-lastFatFingersResult().isTextInput() /* userTouchTriggered */, singleLineInput, nodeBoundingBox);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [115974] trunk

2012-05-03 Thread mifenton

Title: [115974] trunk








Revision 115974
Author mifen...@rim.com
Date 2012-05-03 08:40:35 -0700 (Thu, 03 May 2012)


Log Message
.: Rename attribute.

[BlackBerry] Add special attribute for alternate selection touch handling.
https://bugs.webkit.org/show_bug.cgi?id=85284

Reviewed by Rob Buis.

* ManualTests/blackberry/selection-touch-override.html:

Source/WebKit/blackberry: [BlackBerry] Add special attribute for alternate selection touch handling.
https://bugs.webkit.org/show_bug.cgi?id=85284

Reviewed by Rob Buis.

Rename the custom attribute and make it a data- attribute.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::inputNodeOverridesTouch):

Modified Paths

trunk/ChangeLog
trunk/ManualTests/blackberry/selection-touch-override.html
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp




Diff

Modified: trunk/ChangeLog (115973 => 115974)

--- trunk/ChangeLog	2012-05-03 15:15:40 UTC (rev 115973)
+++ trunk/ChangeLog	2012-05-03 15:40:35 UTC (rev 115974)
@@ -1,3 +1,14 @@
+2012-05-03  Mike Fenton  mifen...@rim.com
+
+Rename attribute.
+
+[BlackBerry] Add special attribute for alternate selection touch handling.
+https://bugs.webkit.org/show_bug.cgi?id=85284
+
+Reviewed by Rob Buis.
+
+* ManualTests/blackberry/selection-touch-override.html:
+
 2012-05-03  Gyuyoung Kim  gyuyoung@samsung.com
 
 [CMAKE] Remove unneeded keyword in WebKitFeatures.cmake


Modified: trunk/ManualTests/blackberry/selection-touch-override.html (115973 => 115974)

--- trunk/ManualTests/blackberry/selection-touch-override.html	2012-05-03 15:15:40 UTC (rev 115973)
+++ trunk/ManualTests/blackberry/selection-touch-override.html	2012-05-03 15:40:35 UTC (rev 115974)
@@ -1,2 +1,2 @@
 brtextarea cols=45 rows=5Text Area without override attribute select all this text and tap on the selection, context menu should be shown!/textarea
-brtextarea cols=45 rows=5 -bb-selection-touchoverride=onText Area with override attribute select all this text and tap on the selection, caret should be placed!/textarea
+brtextarea cols=45 rows=5 data-blackberry-end-selection-on-touch=onText Area with override attribute select all this text and tap on the selection, caret should be placed!/textarea


Modified: trunk/Source/WebKit/blackberry/ChangeLog (115973 => 115974)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-03 15:15:40 UTC (rev 115973)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-03 15:40:35 UTC (rev 115974)
@@ -1,3 +1,15 @@
+2012-05-03  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add special attribute for alternate selection touch handling.
+https://bugs.webkit.org/show_bug.cgi?id=85284
+
+Reviewed by Rob Buis.
+
+Rename the custom attribute and make it a data- attribute.
+
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::inputNodeOverridesTouch):
+
 2012-04-18  Jon Honeycutt  jhoneyc...@apple.com
 
 FrameLoaderClient::dispatchWillSendSubmitEvent() should be given more


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (115973 => 115974)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-03 15:15:40 UTC (rev 115973)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-03 15:40:35 UTC (rev 115974)
@@ -827,7 +827,7 @@
 return false;
 
 // TODO consider caching this in InputHandler so it is only calculated once per focus.
-DEFINE_STATIC_LOCAL(QualifiedName, selectionTouchOverrideAttr, (nullAtom, -bb-selection-touchoverride, nullAtom));
+DEFINE_STATIC_LOCAL(QualifiedName, selectionTouchOverrideAttr, (nullAtom, data-blackberry-end-selection-on-touch, nullAtom));
 Element* element = static_castElement*(focusedNode);
 return DOMSupport::elementAttributeState(element, selectionTouchOverrideAttr) == DOMSupport::On;
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [115728] trunk

2012-05-01 Thread mifenton

Title: [115728] trunk








Revision 115728
Author mifen...@rim.com
Date 2012-05-01 08:32:53 -0700 (Tue, 01 May 2012)


Log Message
Add special attribute for alternate selection touch handling.
https://bugs.webkit.org/show_bug.cgi?id=85284

Reviewed by Antonio Gomes.

PR 152975.

.:

Add manual test for -bb-selection-touchoverride.

Reviewed Internally by Gen Mak.

* ManualTests/blackberry/selection-touch-override.html: Added.

Source/WebKit/blackberry:

Add attribute -bb-selection-touchoverride to override
touch handling on selection overlay.

Reviewed Internally by Gen Mak.

* Api/WebPageClient.h:
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::inputNodeOverridesTouch):
(WebKit):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
* WebKitSupport/SelectionHandler.h:
(SelectionHandler):

Modified Paths

trunk/ChangeLog
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h


Added Paths

trunk/ManualTests/blackberry/selection-touch-override.html




Diff

Modified: trunk/ChangeLog (115727 => 115728)

--- trunk/ChangeLog	2012-05-01 15:30:30 UTC (rev 115727)
+++ trunk/ChangeLog	2012-05-01 15:32:53 UTC (rev 115728)
@@ -1,3 +1,18 @@
+2012-05-01  Mike Fenton  mifen...@rim.com
+
+Add special attribute for alternate selection touch handling.
+https://bugs.webkit.org/show_bug.cgi?id=85284
+
+Reviewed by Antonio Gomes.
+
+PR 152975.
+
+Add manual test for -bb-selection-touchoverride.
+
+Reviewed Internally by Gen Mak.
+
+* ManualTests/blackberry/selection-touch-override.html: Added.
+
 2012-04-25  Raphael Kubo da Costa  rak...@webkit.org
 
 [CMake] Add a proper license to FindSqlite.cmake.


Added: trunk/ManualTests/blackberry/selection-touch-override.html (0 => 115728)

--- trunk/ManualTests/blackberry/selection-touch-override.html	(rev 0)
+++ trunk/ManualTests/blackberry/selection-touch-override.html	2012-05-01 15:32:53 UTC (rev 115728)
@@ -0,0 +1,2 @@
+brtextarea cols=45 rows=5Text Area without override attribute select all this text and tap on the selection, context menu should be shown!/textarea
+brtextarea cols=45 rows=5 -bb-selection-touchoverride=onText Area with override attribute select all this text and tap on the selection, caret should be placed!/textarea


Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (115727 => 115728)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-05-01 15:30:30 UTC (rev 115727)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-05-01 15:32:53 UTC (rev 115728)
@@ -146,7 +146,7 @@
 virtual void checkSpellingOfString(const unsigned short* text, int length, int misspellingLocation, int misspellingLength) = 0;
 virtual void requestSpellingSuggestionsForString(unsigned start, unsigned end) = 0;
 
-virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion) = 0;
+virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion, bool overrideTouchHandling = false) = 0;
 virtual void cancelSelectionVisuals() = 0;
 virtual void notifySelectionHandlesReversed() = 0;
 virtual void notifyCaretChanged(const Platform::IntRect caret, bool userTouchTriggered, bool singleLineInput = false, const Platform::IntRect singleLineBoundingBox = Platform::IntRect()) = 0;


Modified: trunk/Source/WebKit/blackberry/ChangeLog (115727 => 115728)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-05-01 15:30:30 UTC (rev 115727)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-05-01 15:32:53 UTC (rev 115728)
@@ -1,3 +1,25 @@
+2012-05-01  Mike Fenton  mifen...@rim.com
+
+Add special attribute for alternate selection touch handling.
+https://bugs.webkit.org/show_bug.cgi?id=85284
+
+Reviewed by Antonio Gomes.
+
+PR 152975.
+
+Add attribute -bb-selection-touchoverride to override
+touch handling on selection overlay.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPageClient.h:
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::inputNodeOverridesTouch):
+(WebKit):
+(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+* WebKitSupport/SelectionHandler.h:
+(SelectionHandler):
+
 2012-04-30  Benjamin Poulain  benja...@webkit.org
 
 Add String::startsWith() and endsWith() for string literals


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (115727 => 115728)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-05-01 15:30:30 UTC (rev 115727)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

[webkit-changes] [115066] trunk/Source/WebKit/blackberry

2012-04-24 Thread mifenton

Title: [115066] trunk/Source/WebKit/blackberry








Revision 115066
Author mifen...@rim.com
Date 2012-04-24 09:05:28 -0700 (Tue, 24 Apr 2012)


Log Message
[BlackBerry] Add additional details including the bounds of the box for caretPositionChanged.
https://bugs.webkit.org/show_bug.cgi?id=84728

Reviewed by Antonio Gomes.

PR 138988.

Update caretPositionChanged to include the limit of the input field
for single line inputs.

Reviewed Internally by Gen Mak.

* Api/WebPageClient.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::boundingBoxForInputField):
(WebKit):
* WebKitSupport/InputHandler.h:
(InputHandler):
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::clippingRectForVisibleContent):
(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):

Modified Paths

trunk/Source/WebKit/blackberry/Api/WebPageClient.h
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (115065 => 115066)

--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-04-24 15:57:24 UTC (rev 115065)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h	2012-04-24 16:05:28 UTC (rev 115066)
@@ -149,7 +149,7 @@
 virtual void notifySelectionDetailsChanged(const Platform::IntRect start, const Platform::IntRect end, const Platform::IntRectRegion) = 0;
 virtual void cancelSelectionVisuals() = 0;
 virtual void notifySelectionHandlesReversed() = 0;
-virtual void notifyCaretChanged(const Platform::IntRect caret, bool userTouchTriggered) = 0;
+virtual void notifyCaretChanged(const Platform::IntRect caret, bool userTouchTriggered, bool singleLineInput = false, const Platform::IntRect singleLineBoundingBox = Platform::IntRect()) = 0;
 
 virtual void cursorChanged(Platform::CursorType, const char* url, int x, int y) = 0;
 


Modified: trunk/Source/WebKit/blackberry/ChangeLog (115065 => 115066)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-04-24 15:57:24 UTC (rev 115065)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-04-24 16:05:28 UTC (rev 115066)
@@ -1,3 +1,27 @@
+2012-04-24  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Add additional details including the bounds of the box for caretPositionChanged.
+https://bugs.webkit.org/show_bug.cgi?id=84728
+
+Reviewed by Antonio Gomes.
+
+PR 138988.
+
+Update caretPositionChanged to include the limit of the input field
+for single line inputs.
+
+Reviewed Internally by Gen Mak.
+
+* Api/WebPageClient.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::InputHandler::boundingBoxForInputField):
+(WebKit):
+* WebKitSupport/InputHandler.h:
+(InputHandler):
+* WebKitSupport/SelectionHandler.cpp:
+(BlackBerry::WebKit::SelectionHandler::clippingRectForVisibleContent):
+(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):
+
 2012-04-24  Charles Wei  charles@torchmobile.com.cn
 
 [BlackBerry] Input Range element expects mouse events


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (115065 => 115066)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-04-24 15:57:24 UTC (rev 115065)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2012-04-24 16:05:28 UTC (rev 115066)
@@ -537,6 +537,17 @@
 removeAttributedTextMarker();
 }
 
+WebCore::IntRect InputHandler::boundingBoxForInputField()
+{
+if (!isActiveTextEdit())
+return WebCore::IntRect();
+
+if (!m_currentFocusElement-renderer())
+return WebCore::IntRect();
+
+return m_currentFocusElement-renderer()-absoluteBoundingBoxRect();
+}
+
 void InputHandler::ensureFocusTextElementVisible(CaretScrollType scrollType)
 {
 if (!m_inputModeEnabled || !m_currentFocusElement || !m_currentFocusElement-document())


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (115065 => 115066)

--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-04-24 15:57:24 UTC (rev 115065)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2012-04-24 16:05:28 UTC (rev 115066)
@@ -102,6 +102,8 @@
 
 WTF::String elementText();
 
+WebCore::IntRect boundingBoxForInputField();
+
 // IMF driven calls.
 bool setBatchEditingActive(bool);
 bool setSelection(int start, int end, bool changeIsPartOfComposition = false);


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (115065 => 115066)

--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-04-24 15:57:24 UTC (rev 115065)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-04-24 16:05:28 UTC (rev 115066)
@@ -98,20 +98,18 @@
 {
 // Get the

[webkit-changes] [114380] trunk/Source/WebKit/blackberry

2012-04-17 Thread mifenton

Title: [114380] trunk/Source/WebKit/blackberry








Revision 114380
Author mifen...@rim.com
Date 2012-04-17 08:20:29 -0700 (Tue, 17 Apr 2012)


Log Message
[BlackBerry] Pattern matching should be applied to numbers
https://bugs.webkit.org/show_bug.cgi?id=84152

Reviewed by Antonio Gomes.

PR 148906.

Add pattern matching for number based on [0-9] to trigger
input help matching number fields.

* WebKitSupport/DOMSupport.cpp:
(BlackBerry::WebKit::DOMSupport::elementPatternIndicatesNumber):
(DOMSupport):
(BlackBerry::WebKit::DOMSupport::elementPatternIndicatesHexadecimal):
(BlackBerry::WebKit::DOMSupport::elementPatternMatches):
* WebKitSupport/DOMSupport.h:
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::convertInputType):

Modified Paths

trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp
trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h
trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp




Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (114379 => 114380)

--- trunk/Source/WebKit/blackberry/ChangeLog	2012-04-17 15:20:01 UTC (rev 114379)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-04-17 15:20:29 UTC (rev 114380)
@@ -1,3 +1,24 @@
+2012-04-17  Mike Fenton  mifen...@rim.com
+
+[BlackBerry] Pattern matching should be applied to numbers
+https://bugs.webkit.org/show_bug.cgi?id=84152
+
+Reviewed by Antonio Gomes.
+
+PR 148906.
+
+Add pattern matching for number based on [0-9] to trigger
+input help matching number fields.
+
+* WebKitSupport/DOMSupport.cpp:
+(BlackBerry::WebKit::DOMSupport::elementPatternIndicatesNumber):
+(DOMSupport):
+(BlackBerry::WebKit::DOMSupport::elementPatternIndicatesHexadecimal):
+(BlackBerry::WebKit::DOMSupport::elementPatternMatches):
+* WebKitSupport/DOMSupport.h:
+* WebKitSupport/InputHandler.cpp:
+(BlackBerry::WebKit::convertInputType):
+
 2012-04-17  George Staikos  stai...@webkit.org
 
 Export the initialization function so it can be called earlier.


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp (114379 => 114380)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-04-17 15:20:01 UTC (rev 114379)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp	2012-04-17 15:20:29 UTC (rev 114380)
@@ -394,35 +394,45 @@
 return false;
 }
 
+bool elementPatternIndicatesNumber(const HTMLInputElement* inputElement)
+{
+return elementPatternMatches([0-9], inputElement);
+}
+
 bool elementPatternIndicatesHexadecimal(const HTMLInputElement* inputElement)
 {
-if (!inputElement)
+return elementPatternMatches([0-9a-fA-F], inputElement);
+}
+
+bool elementPatternMatches(const char* pattern, const HTMLInputElement* inputElement)
+{
+WTF::String patternString(pattern);
+if (!inputElement || patternString.isEmpty())
 return false;
 
 if (inputElement-fastHasAttribute(HTMLNames::patternAttr)) {
-AtomicString patternAttribute = inputElement-fastGetAttribute(HTMLNames::patternAttr);
-if (patternAttribute.startsWith([0-9a-fA-F])) {
+WTF::String patternAttribute = inputElement-fastGetAttribute(HTMLNames::patternAttr);
+if (patternAttribute.startsWith(patternString)) {
 // The pattern is for hexadecimal, make sure nothing else is permitted.
 
 // Check if it was an exact match.
-if (patternAttribute.length() == 11)
+if (patternAttribute.length() == patternString.length())
 return true;
 
 // Check for *
-if (patternAttribute.length() == 12  patternAttribute[11] == '*')
+if (patternAttribute.length() == patternString.length() + 1  patternAttribute[patternString.length()] == '*')
 return true;
 
 // Is the regex specifying a character count?
-if (patternAttribute[11] != '{' || !patternAttribute.endsWith(}))
+if (patternAttribute[patternString.length()] != '{' || !patternAttribute.endsWith(}))
 return false;
 
-int count = 0;
 // Make sure the number in the regex is actually a number.
-if ((sscanf(patternAttribute.string().latin1().data(), [0-9a-fA-F]{%d}\0, count) == 1)  count  0)
-return true;
+unsigned count = 0;
+patternString = patternString + {%d};
+return (sscanf(patternAttribute.latin1().data(), patternString.latin1().data() + '\0', count) == 1)  count  0;
 }
 }
-
 return false;
 }
 


Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h (114379 => 114380)

--- trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-04-17 15:20:01 UTC (rev 114379)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.h	2012-04-17 15:20:29 UTC (rev 114380)
@@ -78,6 +78,8 @@
 bool

1 2 >

1 - 100 of 107 matches

Mail list logo