third_party/WebKit/WebCore/bindings/js/ScriptControllerQt.cpp - Issue 21165: Revert the merge. Mac build is mysteriously broken.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/WebKit/WebCore/bindings/js/ScriptControllerQt.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « third_party/WebKit/WebCore/bindings/js/JSStyleSheetCustom.cpp ('k') | third_party/WebKit/WebCore/bindings/scripts/CodeGenerator.pm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>	2 * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>

3 * Copyright (C) 2006 Zack Rusin <zack@kde.org>	3 * Copyright (C) 2006 Zack Rusin <zack@kde.org>

4 * Copyright (C) 2006 George Staikos <staikos@kde.org>	4 * Copyright (C) 2006 George Staikos <staikos@kde.org>

5 * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>	5 * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>

6 * Copyright (C) 2006 Rob Buis <buis@kde.org>	6 * Copyright (C) 2006 Rob Buis <buis@kde.org>

7 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>	7 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>

8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)	8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)

9 * Copyright (C) 2008 Collabora Ltd. All rights reserved.	9 * Copyright (C) 2008 Collabora Ltd. All rights reserved.

10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>	10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 if (widget->isPluginView()) {	51 if (widget->isPluginView()) {

52 PluginView* pluginView = static_cast<PluginView*>(widget);	52 PluginView* pluginView = static_cast<PluginView*>(widget);

53 if (pluginView->isNPAPIPlugin())	53 if (pluginView->isNPAPIPlugin())

54 return pluginView->bindingInstance();	54 return pluginView->bindingInstance();

55 return 0;	55 return 0;

56 }	56 }

57	57

58 QWidget* platformWidget = widget->platformWidget();	58 QWidget* platformWidget = widget->platformWidget();

59 if (!platformWidget)	59 if (!platformWidget)

60 return 0;	60 return 0;

61 return JSC::Bindings::QtInstance::getQtInstance(platformWidget, bindingRootO bject(), QScriptEngine::QtOwnership);	61 return JSC::Bindings::QtInstance::getQtInstance(platformWidget, bindingRootO bject());

62 }	62 }

63	63

64 }	64 }

65 // vim: ts=4 sw=4 et	65 // vim: ts=4 sw=4 et

OLD	NEW