[haiku-webkit-commits] r385 - webkit/trunk/WebKit/haiku/HaikuLauncher

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Mon, 05 Apr 2010 14:00:47 +0000

Author: stippi
Date: Mon Apr  5 14:00:47 2010
New Revision: 385
URL: http://mmlr.dyndns.org/changeset/385

Log:
Fixed HaikuLauncher build.

Modified:
   webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.cpp
   webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.h

Modified: webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.cpp  Sun Apr  4 
12:06:23 2010        (r384)
+++ webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.cpp  Mon Apr  5 
14:00:47 2010        (r385)
@@ -166,13 +166,13 @@
     }
 
     case TEXT_SIZE_INCREASE:
-        CurrentWebView()->IncreaseTextSize();
+        CurrentWebView()->IncreaseZoomFactor(true);
         break;
     case TEXT_SIZE_DECREASE:
-        CurrentWebView()->DecreaseTextSize();
+        CurrentWebView()->DecreaseZoomFactor(true);
         break;
     case TEXT_SIZE_RESET:
-        CurrentWebView()->ResetTextSize();
+        CurrentWebView()->ResetZoomFactor();
         break;
 
     default:
@@ -207,10 +207,12 @@
     be_app->PostMessage(&message);
 }
 
-void LauncherWindow::NewPageCreated(BWebView* view)
+void LauncherWindow::NewPageCreated(BWebView* view, BRect windowFrame,
+       bool modalDialog, bool resizable)
 {
-       LauncherWindow* window = new LauncherWindow(Frame().OffsetByCopy(10, 
10),
-           view, HaveToolbar);
+       if (!windowFrame.IsValid())
+               windowFrame = Frame().OffsetByCopy(10, 10);
+       LauncherWindow* window = new LauncherWindow(windowFrame, view, 
HaveToolbar);
        window->Show();
 }
 
@@ -395,7 +397,7 @@
     }
 
     AddShortcut('R', B_COMMAND_KEY, new BMessage(RELOAD));
-       
+
     be_app->PostMessage(WINDOW_OPENED);
 }
 

Modified: webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.h
==============================================================================
--- webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.h    Sun Apr  4 
12:06:23 2010        (r384)
+++ webkit/trunk/WebKit/haiku/HaikuLauncher/LauncherWindow.h    Mon Apr  5 
14:00:47 2010        (r385)
@@ -68,7 +68,8 @@
     // WebPage notification API implementations
     virtual void NavigationRequested(const BString& url, BWebView* view);
     virtual void NewWindowRequested(const BString& url, bool primaryAction);
-       virtual void NewPageCreated(BWebView* view);
+       virtual void NewPageCreated(BWebView* view, BRect windowFrame,
+               bool modalDialog, bool resizable);
     virtual void LoadNegotiating(const BString& url, BWebView* view);
     virtual void LoadCommitted(const BString& url, BWebView* view);
     virtual void LoadProgress(float progress, BWebView* view);

Other related posts:

  • » [haiku-webkit-commits] r385 - webkit/trunk/WebKit/haiku/HaikuLauncher - webkit