Changeset 28564 in webkit


Ignore:
Timestamp:
Dec 8, 2007 6:39:02 AM (16 years ago)
Author:
alp@webkit.org
Message:

2007-12-08 Luca Bruno <​lethalman88@gmail.com>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=16346
[GTK] Some webview parts must use the focused frame.

Also update some old code.

  • WebView/webkitprivate.cpp: (getFrameFromView): removed
  • WebView/webkitprivate.h: (getFrameFromView): removed


  • WebView/webkitwebview.cpp: (webkit_web_view_expose_event): (webkit_web_view_key_press_event): use focused frame (webkit_web_view_key_release_event): use focused frame (webkit_web_view_button_press_event): (webkit_web_view_button_release_event): (webkit_web_view_motion_event): (webkit_web_view_scroll_event): (webkit_web_view_size_allocate): (webkit_web_view_set_scroll_adjustments): (webkit_web_view_execute_script): (webkit_web_view_stop_loading): (webkit_web_view_load_string): (webkit_web_view_reload): (webkit_web_view_open): (webkit_web_view_can_go_forward): (webkit_web_view_can_go_backward): (webkit_web_view_go_forward): (webkit_web_view_go_backward):
  • WebCoreSupport/EditorClientGtk.cpp: (WebKit::EditorClient::handleKeypress): fix for page up and page down keys for editable contents
Location:
trunk/WebKit/gtk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/gtk/ChangeLog

    r28516 r28564  
     12007-12-08  Luca Bruno  <lethalman88@gmail.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16346
     6        [GTK] Some webview parts must use the focused frame.
     7
     8        Also update some old code.
     9
     10        * WebView/webkitprivate.cpp:
     11        (getFrameFromView): removed
     12
     13        * WebView/webkitprivate.h:
     14        (getFrameFromView): removed
     15       
     16        * WebView/webkitwebview.cpp:
     17        (webkit_web_view_expose_event):
     18        (webkit_web_view_key_press_event): use focused frame
     19        (webkit_web_view_key_release_event): use focused frame
     20        (webkit_web_view_button_press_event):
     21        (webkit_web_view_button_release_event):
     22        (webkit_web_view_motion_event):
     23        (webkit_web_view_scroll_event):
     24        (webkit_web_view_size_allocate):
     25        (webkit_web_view_set_scroll_adjustments):
     26        (webkit_web_view_execute_script):
     27        (webkit_web_view_stop_loading):
     28        (webkit_web_view_load_string):
     29        (webkit_web_view_reload):
     30        (webkit_web_view_open):
     31        (webkit_web_view_can_go_forward):
     32        (webkit_web_view_can_go_backward):
     33        (webkit_web_view_go_forward):
     34        (webkit_web_view_go_backward):
     35
     36        * WebCoreSupport/EditorClientGtk.cpp:
     37        (WebKit::EditorClient::handleKeypress): fix for page up and page down keys for editable contents
     38
    1392007-12-07  Luca Bruno  <lethalman88@gmail.com>
    240

  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

    r28438 r28564  
    271271                break;
    272272            case VK_HOME:
    273                 if (kevent->ctrlKey())
     273                if (kevent->ctrlKey() && kevent->shiftKey())
     274                    frame->editor()->execCommand("MoveToBeginningOfDocumentAndModifySelection");
     275                else if (kevent->ctrlKey())
    274276                    frame->editor()->execCommand("MoveToBeginningOfDocument");
    275277                else if (kevent->shiftKey())
    … …  
    279281                break;
    280282            case VK_END:
    281                 if (kevent->ctrlKey())
     283                if (kevent->ctrlKey() && kevent->shiftKey())
     284                    frame->editor()->execCommand("MoveToEndOfDocumentAndModifySelection");
     285                else if (kevent->ctrlKey())
    282286                    frame->editor()->execCommand("MoveToEndOfDocument");
    283287                else if (kevent->shiftKey())

  • trunk/WebKit/gtk/WebView/webkitprivate.cpp

    r28490 r28564  
    3838    notImplemented();
    3939    return 0;
    40 }
    41 
    42 WebKitWebFrame* getFrameFromView(WebKitWebView* webView)
    43 {
    44     return webkit_web_view_get_main_frame(webView);
    4540}
    4641

  • trunk/WebKit/gtk/WebView/webkitprivate.h

    r28484 r28564  
    4141    void apply(WebKitSettings*,WebCore::Settings*);
    4242    WebKitSettings* create(WebCore::Settings*);
    43     WebKitWebFrame*  getFrameFromView(WebKitWebView*);
    4443    WebKitWebView* getViewFromFrame(WebKitWebFrame*);
    4544

  • trunk/WebKit/gtk/WebView/webkitwebview.cpp

    r28516 r28564  
    9090static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
    9191{
    92     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     92    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    9393    GdkRectangle clip;
    9494    gdk_region_get_clipbox(event->region, &clip);
    … …  
    107107static gboolean webkit_web_view_key_press_event(GtkWidget* widget, GdkEventKey* event)
    108108{
    109     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     109    Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame();
    110110    PlatformKeyboardEvent keyboardEvent(event);
    111111
    … …  
    149149static gboolean webkit_web_view_key_release_event(GtkWidget* widget, GdkEventKey* event)
    150150{
    151     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     151    Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame();
    152152    PlatformKeyboardEvent keyboardEvent(event);
    153153
    … …  
    161161static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event)
    162162{
    163     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     163    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    164164
    165165    // FIXME: need to keep track of subframe focus for key events
    … …  
    170170static gboolean webkit_web_view_button_release_event(GtkWidget* widget, GdkEventButton* event)
    171171{
    172     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     172    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    173173
    174174    return frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
    … …  
    177177static gboolean webkit_web_view_motion_event(GtkWidget* widget, GdkEventMotion* event)
    178178{
    179     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     179    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    180180    return frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
    181181}
    … …  
    183183static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll* event)
    184184{
    185     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     185    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    186186    PlatformWheelEvent wheelEvent(event);
    187187    return frame->eventHandler()->handleWheelEvent(wheelEvent);
    … …  
    192192    GTK_WIDGET_CLASS(webkit_web_view_parent_class)->size_allocate(widget,allocation);
    193193
    194     Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
     194    Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
    195195    frame->view()->resize(allocation->width, allocation->height);
    196196    frame->forceLayout();
    … …  
    230230static void webkit_web_view_set_scroll_adjustments(WebKitWebView* webView, GtkAdjustment* hadj, GtkAdjustment* vadj)
    231231{
    232     FrameView* view = core(getFrameFromView(webView))->view();
     232    FrameView* view = core(webkit_web_view_get_main_frame(webView))->view();
    233233    view->setGtkAdjustments(hadj, vadj);
    234234}
    … …  
    836836    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    837837
    838     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    839     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    840     frameData->frame->loader()->goBackOrForward(-1);
     838    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     839    frame->loader()->goBackOrForward(-1);
    841840}
    842841
    … …  
    845844    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    846845
    847     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    848     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    849     frameData->frame->loader()->goBackOrForward(1);
     846    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     847    frame->loader()->goBackOrForward(1);
    850848}
    851849
    … …  
    854852    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    855853
    856     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    857     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    858     return frameData->frame->loader()->canGoBackOrForward(-1);
     854    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     855    return frame->loader()->canGoBackOrForward(-1);
    859856}
    860857
    … …  
    863860    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    864861
    865     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    866     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    867     return frameData->frame->loader()->canGoBackOrForward(1);
     862    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     863    return frame->loader()->canGoBackOrForward(1);
    868864}
    869865
    … …  
    872868    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    873869
    874     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    875     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    876 
     870    Frame* frame = core(webkit_web_view_get_main_frame(webView));
    877871    DeprecatedString string = DeprecatedString::fromUtf8(uri);
    878     frameData->frame->loader()->load(ResourceRequest(KURL(string)));
     872    frame->loader()->load(ResourceRequest(KURL(string)));
    879873}
    880874
    … …  
    883877    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    884878
    885     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    886     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    887     frameData->frame->loader()->reload();
     879    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     880    frame->loader()->reload();
    888881}
    889882
    … …  
    892885    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    893886
    894     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    895     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
     887    Frame* frame = core(webkit_web_view_get_main_frame(webView));
    896888
    897889    KURL url(DeprecatedString::fromUtf8(baseUri));
    … …  
    899891    SubstituteData substituteData(sharedBuffer.release(), String(contentMimeType), String(contentEncoding), KURL("about:blank"), url);
    900892
    901     frameData->frame->loader()->load(ResourceRequest(url), substituteData);
     893    frame->loader()->load(ResourceRequest(url), substituteData);
    902894}
    903895
    … …  
    913905    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    914906
    915     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    916     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    917 
    918     if (FrameLoader* loader = frameData->frame->loader())
     907    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     908
     909    if (FrameLoader* loader = frame->loader())
    919910        loader->stopAllLoaders();
    920911}
    … …  
    933924    g_return_if_fail(script);
    934925
    935     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    936     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
    937 
    938     if (FrameLoader* loader = frameData->frame->loader())
     926    Frame* frame = core(webkit_web_view_get_main_frame(webView));
     927    if (FrameLoader* loader = frame->loader())
    939928        loader->executeScript(String::fromUTF8(script), true);
    940929}
Note: See TracChangeset for help on using the changeset viewer.