Changeset 149815 in webkit


Ignore:
Timestamp:
May 9, 2013, 9:02:27 AM (12 years ago)
Author:
mifenton@rim.com
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):

Location:
trunk/Source/WebKit/blackberry
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/blackberry/ChangeLog

    r149814 r149815  
     12013-05-09  Mike Fenton  <mifenton@rim.com>
     2
     3        [BlackBerry] Style updates required based on new check-webkit-style
     4        https://bugs.webkit.org/show_bug.cgi?id=115857
     5
     6        Reviewed by Rob Buis.
     7
     8        Update ColorPickerClient and PagePopupBlackBerry
     9        to match check-webkit-style updates.
     10
     11        * WebCoreSupport/ColorPickerClient.cpp:
     12        (WebCore::ColorPickerClient::generateHTML):
     13        * WebCoreSupport/PagePopupBlackBerry.cpp:
     14        (WebCore::setValueAndClosePopupCallback):
     15        (WebCore::PagePopupBlackBerry::installDOMFunction):
     16
    1172013-05-09  Alberto Garcia  <agarcia@igalia.com>
    218

  • trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp

    r149814 r149815  
    5353    source.appendLiteral("<style>\n");
    5454    // Include CSS file.
    55     source.append(popupControlBlackBerryCss,
    56             sizeof(popupControlBlackBerryCss));
     55    source.append(popupControlBlackBerryCss, sizeof(popupControlBlackBerryCss));
    5756    source.appendLiteral("</style>\n<style>");
    58     source.append(colorControlBlackBerryCss,
    59             sizeof(colorControlBlackBerryCss));
     57    source.append(colorControlBlackBerryCss, sizeof(colorControlBlackBerryCss));
    6058    source.appendLiteral("</style></head><body>\n");
    6159    source.appendLiteral("<script>\n");

  • trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp

    r140849 r149815  
    9999}
    100100
    101 static JSValueRef setValueAndClosePopupCallback(JSContextRef context,
    102         JSObjectRef, JSObjectRef, size_t argumentCount,
    103         const JSValueRef arguments[], JSValueRef*)
     101static JSValueRef setValueAndClosePopupCallback(JSContextRef context, JSObjectRef, JSObjectRef, size_t argumentCount, const JSValueRef arguments[], JSValueRef*)
    104102{
    105103    JSValueRef jsRetVal = JSValueMakeUndefined(context);
    … …  
    113111    JSStringGetUTF8CString(string, strArgs.data(), sizeUTF8);
    114112    JSStringRelease(string);
    115     JSObjectRef popUpObject = JSValueToObject(context,
    116             arguments[argumentCount - 1], 0);
     113    JSObjectRef popUpObject = JSValueToObject(context, arguments[argumentCount - 1], 0);
    117114    PagePopupBlackBerry::SharedClientPointer* client = reinterpret_cast<PagePopupBlackBerry::SharedClientPointer*>(JSObjectGetPrivate(popUpObject));
    118115
    … …  
    159156    JSContextRef context = ::toRef(exec);
    160157    JSObjectRef globalObject = JSContextGetGlobalObject(context);
    161     JSStringRef functionName = JSStringCreateWithUTF8CString(
    162             "setValueAndClosePopup");
    163     JSObjectRef function = JSObjectMakeFunctionWithCallback(context,
    164             functionName, setValueAndClosePopupCallback);
    165     JSObjectSetProperty(context, globalObject, functionName, function,
    166             kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly, 0);
     158    JSStringRef functionName = JSStringCreateWithUTF8CString("setValueAndClosePopup");
     159    JSObjectRef function = JSObjectMakeFunctionWithCallback(context, functionName, setValueAndClosePopupCallback);
     160    JSObjectSetProperty(context, globalObject, functionName, function, kJSPropertyAttributeDontDelete | kJSPropertyAttributeReadOnly, 0);
    167161
    168162    // Register client into DOM
    … …  
    183177
    184178    JSC::PutPropertySlot slot;
    185     window->put(window, exec, JSC::Identifier(exec, name),
    186             toJS(clientClassObject), slot);
     179    window->put(window, exec, JSC::Identifier(exec, name), toJS(clientClassObject), slot);
    187180
    188181    JSClassRelease(clientClass);
Note: See TracChangeset for help on using the changeset viewer.