Changeset 126338 in webkit


Ignore:
Timestamp:
Aug 22, 2012 12:38:45 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Make all pickers non-zoomable
​https://bugs.webkit.org/show_bug.cgi?id=94729

Patch by Crystal Zhang <​haizhang@rim.com> on 2012-08-22
Reviewed by Antonio Gomes.

Move HTML header initialization to PagePopupBlackBerry as that part are all the same, and make all pickers non-zoomable.

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::screenSize):
(WebKit):

  • Api/WebPage_p.h:

(WebPagePrivate):

  • WebCoreSupport/DatePickerClient.cpp:

(WebCore::DatePickerClient::generateHTML):
(WebCore::DatePickerClient::writeDocument):

  • WebCoreSupport/PagePopupBlackBerry.cpp:

(WebCore::PagePopupBlackBerry::init):
(WebCore::PagePopupBlackBerry::generateHTML):
(WebCore):

  • WebCoreSupport/PagePopupBlackBerry.h:

(PagePopupBlackBerry):

  • WebCoreSupport/SelectPopupClient.cpp:

(WebCore::SelectPopupClient::generateHTML):
(WebCore::SelectPopupClient::writeDocument):

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

Legend:

Unmodified
Added
Removed

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

    r126232 r126338  
    64466446}
    64476447
    6448 }
    6449 }
     6448IntSize WebPagePrivate::screenSize() const
     6449{
     6450    return Platform::Graphics::Screen::primaryScreen()->size();
     6451}
     6452
     6453}
     6454}

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

    r126232 r126338  
    463463    void setTextZoomFactor(float);
    464464
     465    WebCore::IntSize screenSize() const;
     466
    465467    WebPage* m_webPage;
    466468    WebPageClient* m_client;

  • trunk/Source/WebKit/blackberry/ChangeLog

    r126232 r126338  
     12012-08-22  Crystal Zhang  <haizhang@rim.com>
     2
     3        [BlackBerry] Make all pickers non-zoomable
     4        https://bugs.webkit.org/show_bug.cgi?id=94729
     5
     6        Reviewed by Antonio Gomes.
     7
     8        Move HTML header initialization to PagePopupBlackBerry as that part are all the same, and make all pickers non-zoomable.
     9
     10        * Api/WebPage.cpp:
     11        (BlackBerry::WebKit::WebPagePrivate::screenSize):
     12        (WebKit):
     13        * Api/WebPage_p.h:
     14        (WebPagePrivate):
     15        * WebCoreSupport/DatePickerClient.cpp:
     16        (WebCore::DatePickerClient::generateHTML):
     17        (WebCore::DatePickerClient::writeDocument):
     18        * WebCoreSupport/PagePopupBlackBerry.cpp:
     19        (WebCore::PagePopupBlackBerry::init):
     20        (WebCore::PagePopupBlackBerry::generateHTML):
     21        (WebCore):
     22        * WebCoreSupport/PagePopupBlackBerry.h:
     23        (PagePopupBlackBerry):
     24        * WebCoreSupport/SelectPopupClient.cpp:
     25        (WebCore::SelectPopupClient::generateHTML):
     26        (WebCore::SelectPopupClient::writeDocument):
     27
    1282012-08-21  Benjamin C Meyer  <bmeyer@rim.com>
    229

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

    r122364 r126338  
    5151{
    5252    StringBuilder source;
    53     source.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/><style>\n");
     53    source.append("<style>\n");
    5454    // Include CSS file.
    5555    source.append(popupControlBlackBerryCss,
    … …  
    135135void DatePickerClient::writeDocument(DocumentWriter& writer)
    136136{
    137     writer.setMIMEType("text/html");
    138     writer.begin(KURL());
    139137    writer.addData(m_source.utf8().data(), m_source.utf8().length());
    140     writer.end();
    141138}
    142139}

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

    r122162 r126338  
    4141// Fixme: should get the height from runtime.
    4242#define URL_BAR_HEIGHT 70
     43#define PADDING 80
    4344
    4445using namespace BlackBerry::Platform::Graphics;
    … …  
    6465bool PagePopupBlackBerry::init(WebPage* webpage)
    6566{
    66     DocumentWriter* writer = webpage->d->mainFrame()->loader()->activeDocumentLoader()->writer();
    67     m_client->writeDocument(*writer);
     67    generateHTML(webpage);
    6868
    6969    installDomFunction(webpage->d->mainFrame());
    7070
    7171    return true;
     72}
     73
     74void PagePopupBlackBerry::generateHTML(WebPage* webpage)
     75{
     76    DocumentWriter* writer = webpage->d->mainFrame()->loader()->activeDocumentLoader()->writer();
     77    writer->setMIMEType("text/html");
     78    writer->begin(KURL());
     79
     80    // All the popups have the same html head and the page content should be non-zoomable.
     81    StringBuilder source;
     82    // FIXME: the hardcoding padding will be removed soon.
     83    int screenWidth = webpage->d->screenSize().width() - PADDING;
     84    source.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>\n");
     85    source.append("<meta name=\"viewport\" content=\"width=" + String::number(screenWidth));
     86    source.append("; user-scalable=no\" />\n");
     87    writer->addData(source.toString().utf8().data(), source.toString().utf8().length());
     88
     89    m_client->writeDocument(*writer);
     90    writer->end();
    7291}
    7392

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

    r121158 r126338  
    4747    void installDomFunction(Frame*);
    4848    void setRect();
     49    void generateHTML(BlackBerry::WebKit::WebPage*);
    4950
    5051private:

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

    r126128 r126338  
    6767{
    6868    StringBuilder source;
    69     source.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/><style>\n");
     69    source.append("<style>\n");
    7070    // Include CSS file.
    7171    source.append(popupControlBlackBerryCss,
    … …  
    189189void SelectPopupClient::writeDocument(DocumentWriter& writer)
    190190{
    191     writer.setMIMEType("text/html");
    192     writer.begin(KURL());
    193191    writer.addData(m_source.utf8().data(), m_source.utf8().length());
    194     writer.end();
    195192}
    196193
Note: See TracChangeset for help on using the changeset viewer.