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

Thu, 09 May 2013 09:00:44 -0700

Title: [149815] trunk/Source/WebKit/blackberry
Revision
149815
Author
[email protected]
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

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  <[email protected]>
+
+        [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  <[email protected]>
 
         [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>\n<style>");
-    source.append(colorControlBlackBerryCss,
-            sizeof(colorControlBlackBerryCss));
+    source.append(colorControlBlackBerryCss, sizeof(colorControlBlackBerryCss));
     source.appendLiteral("</style></head><body>\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_cast<PagePopupBlackBerry::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
     JSClassDefinition definition = kJSClassDefinitionEmpty;
@@ -182,8 +176,7 @@
     String name("popUp");
 
     JSC::PutPropertySlot slot;
-    window->put(window, exec, JSC::Identifier(exec, name),
-            toJS(clientClassObject), slot);
+    window->put(window, exec, JSC::Identifier(exec, name), toJS(clientClassObject), slot);
 
     JSClassRelease(clientClass);
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to